sd/source/ui/view/DocumentRenderer.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 6e87f5ca825599c496918c6a890b7a3bac0fbbc2 Author: Jan Holesovsky <ke...@collabora.com> Date: Wed Aug 12 14:36:10 2015 +0200 tdf#80866: Revert "bnc#835985: When printing ... 'Order' did not count." There is a follow-up commit in master that improves the UX, but it unfortunately changes the string, and we are past the UI freeze, so cherry-picking only the revert. This reverts commit a6a04658fb46d9e5ec40438955b777e2eb76b8d2. Change-Id: If2732ca1c847cd1502e07a6416134fe3669de35e Reviewed-on: https://gerrit.libreoffice.org/17681 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> 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() )
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits