[libreoffice] tweak patch to apply
Caolan McNamara
caolanm at fedoraproject.org
Mon Jan 31 11:37:26 UTC 2011
commit 2a57023cfebd43a241006a45321a945676bc7d7d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 31 11:37:16 2011 +0000
tweak patch to apply
...bz-673819-crash-on-changing-position-of-d.patch | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch b/0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch
index ec072ee..30f0f8a 100644
--- a/0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch
+++ b/0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch
@@ -15,7 +15,7 @@ diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpo
index ee3add0..9955420 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
-@@ -1876,7 +1876,10 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView )
+@@ -1930,7 +1930,10 @@
}
// this should happen via SID_ATTR_TRANSFORM_AUTOSIZE
@@ -27,16 +27,13 @@ index ee3add0..9955420 100644
{
const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier();
-@@ -1887,8 +1890,7 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView )
+@@ -1941,8 +1944,7 @@
DBG_ERROR("AutoWidth/AutoHeight should be enabled");
}
}
- else
- m_bIsMultiSelection = true;
+#endif
- }
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
---
-1.7.3.5
-
+ // use page offset and recalculate
+ Point aPt( m_pSdrView->GetSdrPageView()->GetPageOrigin() );
More information about the scm-commits
mailing list