[Libreoffice-commits] .: sd/source

[Caolán McNamara]

 sd/source/ui/view/DocumentRenderer.cxx |   35 +++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

New commits:
commit e758f6fa4bfc28fed1751b27ab0915ae875657f7
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Tue Oct 4 17:16:34 2011 +0400

    fix doubling of one page when range is empty and incorrect selection page

diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 1439b65..9966f6c 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -210,18 +210,29 @@ namespace {
         OUString GetPrinterSelection (sal_Int32 nPageCount, sal_Int32 nCurrentPageIndex) const
         {
             sal_Int32 nContent = static_cast<sal_Int32>(mrProperties.getIntValue( "PrintContent", 0 ));
-            OUString sValue = ::rtl::OUStringBuffer(4)
-                .append(static_cast<sal_Int32>(1))
-                .append(static_cast<sal_Unicode>('-'))
-                .append(nPageCount).makeStringAndClear();
-
-            if( nContent == 1 )
-                sValue = mrProperties.getStringValue( "PageRange", sValue );
-            else if ( nContent == 2 )
-                sValue = nCurrentPageIndex < 0
-                    ? OUString() : OUString::valueOf(nCurrentPageIndex);
-
-            return sValue;
+            OUString sFullRange = ::rtl::OUStringBuffer()
+                 .append(static_cast<sal_Int32>(1))
+                 .append(static_cast<sal_Unicode>('-'))
+                 .append(nPageCount).makeStringAndClear();
+
+            if (nContent == 0) // all pages/slides
+            {
+                return sFullRange;
+            }
+
+            if (nContent == 1) // range
+            {
+                OUString sValue = mrProperties.getStringValue("PageRange");
+                return sValue.getLength() ? sValue : sFullRange;
+            }
+
+            if (nContent == 2 && // selection
+                nCurrentPageIndex >= 0)
+            {
+                return OUString::valueOf(nCurrentPageIndex + 1);
+            }
+
+            return OUString();
         }
 
     private: