diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-07-07 20:55:51 +0200 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-07-07 20:55:51 +0200 |
| commit | 7b722195533b6fe6a9bc79e221074321cf4963fa (patch) | |
| tree | be7006a2bd78408cc32cb43336f55e470f16fba1 /sd/source/ui/view/DocumentRenderer.cxx | |
| parent | ed4c1a81cfee1ab6293fd918dc50733a40dd0a07 (diff) | |
| parent | 4adb61dc6bb380ff31e145e6a77c92c0b26b42bd (diff) | |
rebase to DEV300_m84
Diffstat (limited to 'sd/source/ui/view/DocumentRenderer.cxx')
| -rwxr-xr-x | sd/source/ui/view/DocumentRenderer.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index d832828a2521..def39e07e6f8 100755 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -122,7 +122,7 @@ namespace { sal_Int32 GetHandoutPageCount (void) const { - sal_uInt32 nIndex = static_cast<sal_Int32>(mrProperties.getIntValue("SlidesPerPage", sal_Int32(4))); + sal_uInt32 nIndex = static_cast<sal_Int32>(mrProperties.getIntValue("SlidesPerPage", sal_Int32(0))); if (nIndex<maSlidesPerPage.size()) return maSlidesPerPage[nIndex]; else if ( ! maSlidesPerPage.empty()) @@ -464,7 +464,7 @@ namespace { CreateChoice(_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES_HELP), OUString( RTL_CONSTASCII_USTRINGPARAM( "SlidesPerPage" ) ), GetSlidesPerPageSequence(), - 4, + 0, OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) ), Sequence< sal_Bool >(), aContentOpt @@ -677,7 +677,8 @@ namespace { const Sequence<rtl::OUString> aChoice ( CreateChoice(_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES)); maSlidesPerPage.clear(); - for (sal_Int32 nIndex=0,nCount=aChoice.getLength(); nIndex<nCount; ++nIndex) + maSlidesPerPage.push_back(0); // first is using the default + for (sal_Int32 nIndex=1,nCount=aChoice.getLength(); nIndex<nCount; ++nIndex) maSlidesPerPage.push_back(aChoice[nIndex].toInt32()); return aChoice; } @@ -1533,6 +1534,7 @@ private: AutoLayout eLayout = AUTOLAYOUT_HANDOUT6; switch (nSlidesPerHandout) { + case 0: eLayout = AUTOLAYOUT_NONE; break; // AUTOLAYOUT_HANDOUT1; break; case 1: eLayout = AUTOLAYOUT_HANDOUT1; break; case 2: eLayout = AUTOLAYOUT_HANDOUT2; break; case 3: eLayout = AUTOLAYOUT_HANDOUT3; break; |