~libreoffice/+junk/3.3

« back to all changes in this revision

Viewing changes to patches/reportdesign-fix-left-right-page-margin.diff

  • Committer: Matthias Klose
  • Date: 2011-01-21 00:26:56 UTC
  • Revision ID: doko@canonical.com-20110121002656-euw3heb2o5l6nlua
  * Merge 3.3.0~rc4 changes.
  * Merged Debian packaging up to r2336.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
--- /dev/null   2011-01-13 22:06:04.284591374 +0100
2
 
+++ libreoffice-3.3.0/libreoffice-build/patches/dev300/reportdesign-fix-left-right-page-margin.diff
3
 
@@ -0,0 +1,27 @@
4
 
+>From b3cf61a58d5a3cf32e1372a102d3ef5d2c477fb5 Mon Sep 17 00:00:00 2001
5
 
+From: Lionel Elie Mamane <lionel@mamane.lu>
6
 
+Date: Sat, 15 Jan 2011 05:39:40 +0100
7
 
+Subject: [PATCH] i#116187: report left/right page margin setting ignored on Unix 64 bit
8
 
+
9
 
+---
10
 
+ reportdesign/source/ui/report/ReportController.cxx |    4 ++--
11
 
+ 1 files changed, 2 insertions(+), 2 deletions(-)
12
 
+
13
 
+diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
14
 
+index 1af728c..9beed73 100644
15
 
+--- reportdesign/source/ui/report/ReportController.cxx
16
 
++++ reportdesign/source/ui/report/ReportController.cxx
17
 
+@@ -2500,8 +2500,8 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
18
 
19
 
+                     if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_LRSPACE,sal_True,&pItem))
20
 
+                     {
21
 
+-                        xProp->setPropertyValue(PROPERTY_LEFTMARGIN,uno::makeAny(static_cast<const SvxLRSpaceItem*>(pItem)->GetLeft()));
22
 
+-                        xProp->setPropertyValue(PROPERTY_RIGHTMARGIN,uno::makeAny(static_cast<const SvxLRSpaceItem*>(pItem)->GetRight()));
23
 
++                        xProp->setPropertyValue(PROPERTY_LEFTMARGIN,uno::makeAny((sal_Int32)static_cast<const SvxLRSpaceItem*>(pItem)->GetLeft()));
24
 
++                        xProp->setPropertyValue(PROPERTY_RIGHTMARGIN,uno::makeAny((sal_Int32)static_cast<const SvxLRSpaceItem*>(pItem)->GetRight()));
25
 
+                     }
26
 
+                     if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_ULSPACE,sal_True,&pItem))
27
 
+                     {
28
 
+-- 
29
 
+1.7.2.3
30
 
+
31
 
diff --git a/patches/dev300/apply b/patches/dev300/apply
32
 
index 70f28fd..7f1ef5d 100755
33
 
--- libreoffice-3.3.0/libreoffice-build/patches/dev300/apply
34
 
+++ libreoffice-3.3.0/libreoffice-build/patches/dev300/apply
35
 
@@ -12,7 +12,7 @@ OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1
36
 
 # -------- Functional sub-sets --------
37
 
 Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
38
 
         Fixes, DefaultSettings, Features, VCL, Misc, HelpContent, \
39
 
-        Icons, CalcFixes, WriterFixes, EasterEgg, \
40
 
+        Icons, CalcFixes, WriterFixes, EasterEgg, ExtensionFixes \
41
 
         CWSBackports, Cleanups, WMF, GnomeVFS, WebDAV, \
42
 
         Layout, VBABits, VBAObjects, CalcErrors, GCJ, \
43
 
         OOXML, OOXMLExportDevel, OOXMLExport, UnitTesting, \
44
 
@@ -297,6 +297,9 @@ build-ant-1.6-swext.diff, i#90830, pmladek
45
 
 solven-extensions-noarch-identifier.diff, pmladek
46
 
 sdext-noarch-identifier.diff, pmladek
47
 
 
48
 
+[ ExtensionFixes ]
49
 
+reportdesign-fix-left-right-page-margin.diff
50
 
+
51
 
 [ NovellOnly ]
52
 
 # allow build with ant-1.6
53
 
 # IMPORTANT: the second part of the patch is build-ant-1.6-swext.diff