diff options
| author | Winfried Donkers <W.Donkers@dci-electronics.nl> | 2011-12-09 17:44:20 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-01-03 10:11:59 +0100 |
| commit | 7f978af6476d73246d7cf6c29b48e88a7465f44e (patch) | |
| tree | c0c5f5cbe3cb939eb9bb71082e8fd1ca636b05a3 | |
| parent | 2e183bde347bff8f617a275beff12eb257aac719 (diff) | |
fdo#36874: Label PRINTING misplaced on paper sheet
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Signed-off-by: Lubos Lunak <l.lunak@suse.cz>
| -rw-r--r-- | sw/source/ui/app/applab.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index 00809fe954..f1f8536a31 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -266,10 +266,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; |