[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sd/source

Jan Holesovsky kendy at suse.cz
Fri Oct 25 05:18:47 PDT 2013


 sd/source/ui/view/DocumentRenderer.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 892d6fe2a6e5cd21abf9346e0bd40b73c2973d8b
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Aug 22 09:40:22 2013 +0200

    bnc#835985: When printing handouts using the default, 'Order' did not count.
    
    "Left to right, then down" was the same as "Top to bottom, then right"
    when printing handout; set the 6 pages explicitly as the default.
    
    Change-Id: I4a5f58c8fcf2efdc85ad7bb23bde791c5fb87584

diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index a544515..6e9e673 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1557,14 +1557,14 @@ 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;
             case 4: eLayout = AUTOLAYOUT_HANDOUT4; break;
-            default:
-            case 6: eLayout = AUTOLAYOUT_HANDOUT6; break;
             case 9: eLayout = AUTOLAYOUT_HANDOUT9; break;
+            default:
+            case 0:
+            case 6: break; // use the default
         }
 
         if( !mrBase.GetDocument() )


More information about the Libreoffice-commits mailing list