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

[Caolán McNamara]

 sd/source/ui/view/DocumentRenderer.cxx |   44 +++++++++------------------------
 1 file changed, 13 insertions(+), 31 deletions(-)

New commits:
commit b186e6f1ad9dfd1c6534f047bdd3e22ee993a7c8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 6 12:21:11 2015 +0100

    impress and draw want to disable the size category with brochure printing
    
    Change-Id: I08e814a2895490faebd79ca9e340d6bd8a0b5bfd

diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 8f00559..0fae5ca 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -506,37 +506,19 @@ namespace {
             aWidgetIds[1] = "fittoprintable";
             aWidgetIds[2] = "distributeonmultiple";
             aWidgetIds[3] = "tilesheet";
-            if( mbImpress )
-            {
-                // FIXME: additional dependency on PrintProspect = false
-                vcl::PrinterOptionsHelper::UIControlOptions aPageOptionsOpt( "PageContentType" , 0 );
-                AddDialogControl( vcl::PrinterOptionsHelper::setChoiceRadiosControlOpt(
-                                    aWidgetIds,
-                                    "",
-                                    aHelpIds,
-                                    "PageOptions" ,
-                                    CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES),
-                                    0,
-                                    Sequence< sal_Bool >(),
-                                    aPageOptionsOpt
-                                    )
-                                );
-            }
-            else
-            {
-                vcl::PrinterOptionsHelper::UIControlOptions aPageOptionsOpt( "PrintProspect" , sal_False );
-                AddDialogControl( vcl::PrinterOptionsHelper::setChoiceRadiosControlOpt(
-                                    aWidgetIds,
-                                    "",
-                                    aHelpIds,
-                                    "PageOptions" ,
-                                    CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW),
-                                    0,
-                                    Sequence< sal_Bool >(),
-                                    aPageOptionsOpt
-                                    )
-                                );
-            }
+
+            vcl::PrinterOptionsHelper::UIControlOptions aPageOptionsOpt("PrintProspect", 0);
+            AddDialogControl( vcl::PrinterOptionsHelper::setChoiceRadiosControlOpt(
+                                aWidgetIds,
+                                "",
+                                aHelpIds,
+                                "PageOptions" ,
+                                CreateChoice(mbImpress ? _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES : _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW),
+                                0,
+                                Sequence< sal_Bool >(),
+                                aPageOptionsOpt
+                                )
+                            );
 
             vcl::PrinterOptionsHelper::UIControlOptions aBrochureOpt;
             aBrochureOpt.maGroupHint = "LayoutPage" ;