[Libreoffice-commits] core.git: 2 commits - sd/source

[Jan Holesovsky]

 sd/source/ui/view/DocumentRenderer.cxx |    6 +++---
 sd/source/ui/view/DocumentRenderer.src |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ac2f6018e01cbd24f394911e8bcd3ee3c217eb51
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Aug 12 16:58:07 2015 +0200

    tdf#80866, bnc#835985: Better solution to the original bnc# bug.
    
    The behavior was confusing from the user point of view - the "Default" meant
    the handout layout (that by default is 6 slides per page), not any kind of
    default.  And it looked like the orientation does not work.
    
    Let's provide better wording instead of "Default" at least.
    
    The ideal would be also to disable the "Order" when "According to layout" is
    chosen.   Unfortunately it is not easily possible, as the enabling/disabling
    is controlled by the UIControlOptions's mnDependsOnEntry, and that allows only
    one value; and we'd need "everything but the 0" there.
    
    Change-Id: Ife98c421bf8f52506a7dc32caea6af6c24ef17c6

diff --git a/sd/source/ui/view/DocumentRenderer.src b/sd/source/ui/view/DocumentRenderer.src
index f5fc4ff..2594124 100644
--- a/sd/source/ui/view/DocumentRenderer.src
+++ b/sd/source/ui/view/DocumentRenderer.src
@@ -56,7 +56,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS
     {
         ItemList [ en-US ] =
         {
-            < "Default" ; > ;
+            < "According to layout" ; > ;
             < "1" ; > ;
             < "2" ; > ;
             < "3" ; > ;
commit 7f34c3b8932f51fdbb552c43aa84fe9f1a55c826
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Aug 12 14:36:10 2015 +0200

    tdf#80866: Revert "bnc#835985: When printing ... 'Order' did not count."
    
    This reverts commit a6a04658fb46d9e5ec40438955b777e2eb76b8d2.

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