[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - solenv/gbuild sw/source

[Bjoern Michaelsen]

 solenv/gbuild/extensions/post_BuildplTargets.mk |    3 +++
 sw/source/ui/app/applab.cxx                     |   10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 044d1d6a9586f02c1137ee8f654f89008bd12e39
Author: Winfried Donkers <W.Donkers at dci-electronics.nl>
Date:   Fri Dec 9 17:44:20 2011 +0100

    fdo#36874: Label PRINTING misplaced on paper sheet

diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index f6784f5..e913db7 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -264,10 +264,14 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
 
             aDesc.SetUseOn(nsUseOnPage::PD_ALL);                // Site numbering
 
+            // fix (fdo36874) revised page size calculation
             // Set page size
-            rFmt.SetFmtAttr(SwFmtFrmSize(ATT_FIX_SIZE,
-                                        rItem.lLeft  + rItem.nCols * rItem.lHDist + MINLAY,
-                                        rItem.lUpper + rItem.nRows * rItem.lVDist + MINLAY));
+	    long lPgWidth, lPgHeight;
+	    lPgWidth = (((rItem.lLeft  + (rItem.nCols - 1) * rItem.lHDist + rItem.lWidth + rItem.lLeft) > MINLAY) ?
+		    (rItem.lLeft  + (rItem.nCols - 1) * rItem.lHDist + rItem.lWidth + rItem.lLeft) : MINLAY);
+	    lPgHeight = (((rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + rItem.lHeight + rItem.lUpper) > MINLAY) ?
+		    (rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + rItem.lHeight + rItem.lUpper) : MINLAY);
+            rFmt.SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE, lPgWidth, lPgHeight ));
 
             // Numbering type
             SvxNumberType aType;
commit f5ac85575ad7066c9490c423cdfeba72df3d78fc
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Dec 9 20:46:02 2011 +0100

    do nothing in buildpl stage for debugrun

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 66bb98a..cd98688 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -146,6 +146,9 @@ check: subsequentcheck
 unitcheck: build
 	@true
 
+debugrun:
+	@true
+
 endif # gb_SourceEnvAndRecurse_STAGE=buildpl
     
 ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild)