./packages/libreoffice/3.3.0/experimental r2327: add patch for #607715
------------------------------------------------------------
revno: 2327
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2011-01-15 21:17:52 +0100
message:
add patch for #607715
added:
patches/reportdesign-fix-left-right-page-margin.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2011-01-14 00:32:38 +0000
+++ b/changelog 2011-01-15 20:17:52 +0000
@@ -1,3 +1,11 @@
+libreoffice (1:3.3.0~rc3-3) UNRELEASED; urgency=low
+
+ * debian/patches/reportdesign-fix-left-right-page-margin.diff: fix
+ right/left margin settings in report builder on 64bit archs
+ (closes: #607715), thanks Lionel Elie Mamane
+
+ -- Rene Engelhard <rene@debian.org> Sat, 15 Jan 2011 21:15:29 +0100
+
libreoffice (1:3.3.0~rc3-2) experimental; urgency=low
* debian/patches/fix-mesa-headers-check.diff: readd, still needed;
=== added file 'patches/reportdesign-fix-left-right-page-margin.diff'
--- a/patches/reportdesign-fix-left-right-page-margin.diff 1970-01-01 00:00:00 +0000
+++ b/patches/reportdesign-fix-left-right-page-margin.diff 2011-01-15 20:17:52 +0000
@@ -0,0 +1,44 @@
+--- /dev/null 2011-01-13 22:06:04.284591374 +0100
++++ libreoffice-3.3.0/libreoffice-build/patches/dev300/reportdesign-fix-left-right-page-margin.diff
+@@ -0,0 +1,27 @@
++>From b3cf61a58d5a3cf32e1372a102d3ef5d2c477fb5 Mon Sep 17 00:00:00 2001
++From: Lionel Elie Mamane <lionel@mamane.lu>
++Date: Sat, 15 Jan 2011 05:39:40 +0100
++Subject: [PATCH] i#116187: report left/right page margin setting ignored on Unix 64 bit
++
++---
++ reportdesign/source/ui/report/ReportController.cxx | 4 ++--
++ 1 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
++index 1af728c..9beed73 100644
++--- reportdesign/source/ui/report/ReportController.cxx
+++++ reportdesign/source/ui/report/ReportController.cxx
++@@ -2500,8 +2500,8 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
++
++ if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_LRSPACE,sal_True,&pItem))
++ {
++- xProp->setPropertyValue(PROPERTY_LEFTMARGIN,uno::makeAny(static_cast<const SvxLRSpaceItem*>(pItem)->GetLeft()));
++- xProp->setPropertyValue(PROPERTY_RIGHTMARGIN,uno::makeAny(static_cast<const SvxLRSpaceItem*>(pItem)->GetRight()));
+++ xProp->setPropertyValue(PROPERTY_LEFTMARGIN,uno::makeAny((sal_Int32)static_cast<const SvxLRSpaceItem*>(pItem)->GetLeft()));
+++ xProp->setPropertyValue(PROPERTY_RIGHTMARGIN,uno::makeAny((sal_Int32)static_cast<const SvxLRSpaceItem*>(pItem)->GetRight()));
++ }
++ if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_ULSPACE,sal_True,&pItem))
++ {
++--
++1.7.2.3
++
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index 70f28fd..7f1ef5d 100755
+--- libreoffice-3.3.0/libreoffice-build/patches/dev300/apply
++++ libreoffice-3.3.0/libreoffice-build/patches/dev300/apply
+@@ -297,6 +297,9 @@ build-ant-1.6-swext.diff, i#90830, pmladek
+ solven-extensions-noarch-identifier.diff, pmladek
+ sdext-noarch-identifier.diff, pmladek
+
++[ ExtensionFixes ]
++reportdesign-fix-left-right-page-margin.diff
++
+ [ NovellOnly ]
+ # allow build with ant-1.6
+ # IMPORTANT: the second part of the patch is build-ant-1.6-swext.diff
=== modified file 'patches/series'
--- a/patches/series 2011-01-14 00:32:38 +0000
+++ b/patches/series 2011-01-15 20:17:52 +0000
@@ -8,3 +8,4 @@
java-common-message-LibreOffice.diff
fix-hr-and-te-translations.diff
presenter-screen-fix-description.diff
+reportdesign-fix-left-right-page-margin.diff
Reply to: