[ooo-build-commit] Branch 'ooo-build-3-1-1' - 2 commits - patches/dev300

[Radek Doulík]

 patches/dev300/apply                        |    3 +++
 patches/dev300/sd-print-fix-pageoffset.diff |   27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

New commits:
commit 574d80c25165da544537704006283660fef75ddd
Author: Radek Doulik <rodo at rychlik.lounovice>
Date:   Thu Sep 17 17:58:16 2009 +0200

    small patch clean
    
    * patches/dev300/sd-print-fix-pageoffset.diff:

diff --git a/patches/dev300/sd-print-fix-pageoffset.diff b/patches/dev300/sd-print-fix-pageoffset.diff
index 910ec5d..52a33d8 100644
--- a/patches/dev300/sd-print-fix-pageoffset.diff
+++ b/patches/dev300/sd-print-fix-pageoffset.diff
@@ -25,4 +25,3 @@ diff -rup sd/source/ui/view-orig//PrintManager.cxx sd/source/ui/view/PrintManage
                                  for (aPageOrigin = aOrigin;
                                       -aPageOrigin.Y()<aPageHeight;
                                           aPageOrigin.Y() -= aPrintHeight)
-Only in sd/source/ui/view: PrintManager.cxx~
commit 64575d74a921c3b1bbda2ec24ba5cce09b9f6553
Author: Radek Doulik <rodo at rychlik.lounovice>
Date:   Thu Sep 17 17:56:29 2009 +0200

    fix slides printing page offset, partialy fixes n#537931
    
    * patches/dev300/apply:
    * patches/dev300/sd-print-fix-pageoffset.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8dfbedb..2c4ea86 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3423,3 +3423,6 @@ debian-mysqlc-build-against-stlport-hack.diff
 
 [ EMFPlus ]
 emf+-driver-string.diff, n#519715, rodo
+
+[ Fixes ]
+sd-print-fix-pageoffset.diff
diff --git a/patches/dev300/sd-print-fix-pageoffset.diff b/patches/dev300/sd-print-fix-pageoffset.diff
new file mode 100644
index 0000000..910ec5d
--- /dev/null
+++ b/patches/dev300/sd-print-fix-pageoffset.diff
@@ -0,0 +1,28 @@
+diff -rup sd/source/ui/view-orig//PrintManager.cxx sd/source/ui/view/PrintManager.cxx
+--- sd/source/ui/view-orig//PrintManager.cxx	2009-09-17 15:45:07.000000000 +0200
++++ sd/source/ui/view/PrintManager.cxx	2009-09-17 17:43:47.000000000 +0200
+@@ -1610,15 +1610,18 @@ void PrintManager::PrintStdOrNotes (
+                             }
+                             else
+                             {
++				Point aOrigin;
++
++				// if the printable area is bigger than page size, center the page
++				if( aPageSize.Width() < aPrintWidth )
++				    aOrigin.X() = ( aPrintWidth - aPageSize.Width() )/2;
++				if( aPageSize.Height() < aPrintHeight )
++				    aOrigin.Y() = ( aPrintHeight - aPageSize.Height() )/2;
++
+                                 // Handle 3.  Print parts of the page in the
+                                 // size of the printable area until the
+                                 // whole page is covered.
+ 
+-                                // keep the page content at its
+-                                // position if it fits, otherwise move
+-                                // it to the printable area
+-                                Point aOrigin (aPageWidth < aPrintWidth ? -aPageOfs.X() : 0, aPageHeight < aPrintHeight ? -aPageOfs.Y() : 0);
+-
+                                 for (aPageOrigin = aOrigin;
+                                      -aPageOrigin.Y()<aPageHeight;
+                                          aPageOrigin.Y() -= aPrintHeight)
+Only in sd/source/ui/view: PrintManager.cxx~