CWS-TOOLING: integrate CWS impress191

sd/inc/sdabstdlg.hxx

@@ -153,12 +153,6 @@ public:
     virtual void    GetAttr( SfxItemSet& rOutAttrs ) = 0;
 };
 
-class AbstractSdPrintDlg : public VclAbstractDialog  //add for SdPrintDlg
-{
-public:
-    virtual USHORT  GetAttr() = 0;
-};
-
 class AbstractSdPresLayoutDlg : public VclAbstractDialog  //add for SdPresLayoutDlg
 {
 public:
@@ -206,7 +200,6 @@ public:
     virtual SfxAbstractTabDialog*       CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) = 0;
     virtual SfxAbstractTabDialog*       CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ) = 0;
     virtual AbstractSdStartPresDlg*     CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, List& rPageNames, List* pCSList ) = 0;
-    virtual AbstractSdPrintDlg*         CreateSdPrintDlg( ::Window* pWindow ) = 0; //add for SdPrintDlg
     virtual SfxAbstractTabDialog*       CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0;
     virtual AbstractSdPresLayoutDlg*    CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs) = 0;
     virtual SfxAbstractTabDialog*       CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) = 0;

sd/source/ui/dlg/makefile.mk

@@ -63,7 +63,6 @@ SRC1FILES =\
     navigatr.src\
     sdpreslt.src\
     morphdlg.src\
-    printdlg.src\
     dlgfield.src\
     custsdlg.src\
     brkdlg.src\
@@ -71,8 +70,7 @@ SRC1FILES =\
     dlgolbul.src \
     LayerDialog.src			\
     PaneDockingWindow.src \
-    layeroptionsdlg.src \
-    printdialog.src
+    layeroptionsdlg.src
 
 SLOFILES =  \
         $(SLO)$/inspagob.obj \
@@ -102,7 +100,6 @@ SLOFILES =  \
         $(SLO)$/navigatr.obj \
         $(SLO)$/sdpreslt.obj \
         $(SLO)$/morphdlg.obj	\
-        $(SLO)$/printdlg.obj	\
         $(SLO)$/dlgfield.obj	\
         $(SLO)$/custsdlg.obj	\
         $(SLO)$/brkdlg.obj      \
@@ -120,8 +117,7 @@ SLOFILES =  \
         $(SLO)$/sdabstdlg.obj \
         $(SLO)$/PaneChildWindows.obj			\
         $(SLO)$/PaneDockingWindow.obj			\
-        $(SLO)$/PaneShells.obj \
-        $(SLO)$/printdialog.obj
+        $(SLO)$/PaneShells.obj
 
 LIB1TARGET= $(SLB)$/$(TARGET).lib
 
@@ -147,8 +143,7 @@ LIB1OBJFILES= \
         $(SLO)$/sdabstdlg.obj \
         $(SLO)$/PaneChildWindows.obj		\
         $(SLO)$/PaneDockingWindow.obj		\
-        $(SLO)$/PaneShells.obj \
-        $(SLO)$/printdialog.obj
+        $(SLO)$/PaneShells.obj
 
 
 LIB2TARGET= $(SLB)$/sdui.lib
@@ -173,7 +168,6 @@ LIB2OBJFILES= \
         $(SLO)$/dlgolbul.obj \
         $(SLO)$/paragr.obj \
         $(SLO)$/present.obj \
-        $(SLO)$/printdlg.obj \
         $(SLO)$/prltempl.obj \
         $(SLO)$/sdpreslt.obj \
         $(SLO)$/tabtempl.obj \

sd/source/ui/dlg/printdialog.hrc

-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define DLG_PRINTDIALOG 1847
-#define FL_PRINTCONTENT 1
-#define FT_CONTENT 2
-#define CB_CONTENT 3
-#define FT_SLIDESPERPAGE 4
-#define CB_SLIDESPERPAGE 5
-#define FT_ORDER 6
-#define RBT_HORIZONTAL 7
-#define RBT_VERTICAL 8
-#define IMG_PREVIEW 9
-#define PRINTDLG_CONTROLCOUNT 9

sd/source/ui/dlg/printdialog.src

-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "app.hrc"
-#include "printdialog.hrc"
-
-ModalDialog DLG_PRINTDIALOG
-{
-    Size = MAP_APPFONT ( 260, 77 ) ;
-
-    FixedLine FL_PRINTCONTENT
-    {
-        Pos = MAP_APPFONT ( 6 , 0 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Print content" ;
-    };
-    FixedText FT_CONTENT
-    {
-        Pos = MAP_APPFONT ( 12 , 12 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
-        Text [ en-US ] = "Content" ;
-    };
-    ListBox CB_CONTENT
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 10 ) ;
-        Size = MAP_APPFONT ( 108 , 80 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Slides" ; > ;
-            < "Handouts" ; > ;
-            < "Notes" ; > ;
-            < "Outline" ; > ;
-        };
-    };
-    FixedText FT_SLIDESPERPAGE
-    {
-        Pos = MAP_APPFONT ( 12 , 30 ) ;
-        Size = MAP_APPFONT ( 45 , 8 ) ;
-        Text [ en-US ] = "Slides per page" ;
-    };
-    ListBox CB_SLIDESPERPAGE
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 28 ) ;
-        Size = MAP_APPFONT ( 24 , 80 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "1" ; > ;
-            < "2" ; > ;
-            < "3" ; > ;
-            < "4" ; > ;
-            < "6" ; > ;
-            < "9" ; > ;
-        };
-    };
-    FixedText FT_ORDER
-    {
-        Pos = MAP_APPFONT ( 12 , 47 ) ;
-        Size = MAP_APPFONT ( 45 , 8 ) ;
-        Text [ en-US ] = "Order" ;
-    };
-    RadioButton RBT_HORIZONTAL
-    {
-        Pos = MAP_APPFONT ( 60 , 45 ) ;
-        Size = MAP_APPFONT ( 60 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Horizontal" ;
-    };
-    RadioButton RBT_VERTICAL
-    {
-        Pos = MAP_APPFONT ( 60 , 58 ) ;
-        Size = MAP_APPFONT ( 60 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Vertical" ;
-    };
-    FixedImage IMG_PREVIEW
-    {
-        Pos = MAP_APPFONT ( 168 , 28 ) ;
-    };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

sd/source/ui/dlg/printdlg.cxx

-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-
-#ifdef SD_DLLIMPLEMENTATION
-#undef SD_DLLIMPLEMENTATION
-#endif
-
-
-#include "sdresid.hxx"
-#include "printdlg.hxx"
-#include "printdlg.hrc"
-
-/*************************************************************************
-|*
-|*    SdPrintDlg::SdPrintDlg()
-|*
-|*    Beschreibung  Dialog zum Einstellen von Printoptionen
-|*
-*************************************************************************/
-
-SdPrintDlg::SdPrintDlg( Window* pWindow ) :
-    ModalDialog     ( pWindow, SdResId( DLG_PRINT_WARNINGS ) ),
-    aFtInfo         ( this, SdResId( FI_INFO ) ),
-    aRbtScale       ( this, SdResId( RBT_SCALE ) ),
-    aRbtPoster      ( this, SdResId( RBT_POSTER ) ),
-    aRbtCut         ( this, SdResId( RBT_CUT ) ),
-    aGrpOptions     ( this, SdResId( GRP_OPTIONS ) ),
-    aBtnOK          ( this, SdResId( BTN_OK ) ),
-    aBtnCancel      ( this, SdResId( BTN_CANCEL ) ),
-    aBtnHelp        ( this, SdResId( BTN_HELP ) )
-{
-    FreeResource();
-
-    aRbtScale.Check();
-}
-
-/*************************************************************************
-|*
-|*    SdPrintDlg::GetAttr()
-|*
-|*    Beschreibung  Liefert eingestellte Option zurueck
-|*
-*************************************************************************/
-
-USHORT SdPrintDlg::GetAttr()
-{
-    USHORT nOption = 0;
-
-    if( aRbtScale.IsChecked() )
-        nOption = 1;
-    else if( aRbtPoster.IsChecked() )
-        nOption = 2;
-    else if( aRbtCut.IsChecked() )
-        nOption = 3;
-
-    return( nOption );
-}
-
-
-
-

sd/source/ui/dlg/printdlg.src

-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "printdlg.hrc"
-ModalDialog DLG_PRINT_WARNINGS
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 212 , 87 ) ;
-    Moveable = TRUE ;
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 156 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 156 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 156 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    FixedLine GRP_OPTIONS
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 144 , 8 ) ;
-        Text [ en-US ] = "Print options" ;
-    };
-    RadioButton RBT_SCALE
-    {
-        Pos = MAP_APPFONT ( 12 , 42 ) ;
-        Size = MAP_APPFONT ( 129 , 12 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Fit page to print range" ;
-    };
-    RadioButton RBT_POSTER
-    {
-        Pos = MAP_APPFONT ( 12 , 54 ) ;
-        Size = MAP_APPFONT ( 130 , 12 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Print on multiple pages" ;
-    };
-    RadioButton RBT_CUT
-    {
-        Pos = MAP_APPFONT ( 12 , 66 ) ;
-        Size = MAP_APPFONT ( 127 , 12 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Trim" ;
-    };
-    FixedText FI_INFO
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 134 , 25 ) ;
-        /* ### ACHTUNG: Neuer Text in Resource? Die Seiteneinstellungen stimmen nicht mit dem Druckbereich berein.\nSie knnen folgende Optionen whlen : Die Seiteneinstellungen stimmen nicht mit dem Druckbereich berein.\nSie knnen folgende Optionen whlen */
-        Text [ en-US ] = "The page settings do not match the print range.\nChoose one of the following options" ;
-        WordBreak = TRUE ;
-    };
-    Text [ en-US ] = "Warning Print Options" ;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

sd/source/ui/dlg/sddlgfact.cxx

@@ -51,7 +51,6 @@
 #include "OutlineBulletDlg.hxx"
 #include "paragr.hxx"
 #include "present.hxx"
-#include "printdlg.hxx"
 #include "prltempl.hxx"
 #include "sdpreslt.hxx"
 #include "tabtempl.hxx"
@@ -76,7 +75,6 @@ IMPL_ABSTDLG_BASE(AbstractSdInsertPasteDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractMorphDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractSdStartPresDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractSdPrintDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractSdPresLayoutDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractSfxDialog_Impl);
 IMPL_ABSTDLG_BASE(AbstractSdVectorizeDlg_Impl);
@@ -326,13 +324,6 @@ void AbstractSdStartPresDlg_Impl::GetAttr( SfxItemSet& rOutAttrs )
 }
 // AbstractSdStartPresDlg_Impl end
 
-//AbstractSdPrintDlg_Impl begin
-USHORT AbstractSdPrintDlg_Impl::GetAttr()
-{
-    return pDlg->GetAttr();
-}
-// AbstractSdPrintDlg_Impl end
-
 //AbstractSdPresLayoutDlg_Impl begin
 void AbstractSdPresLayoutDlg_Impl::GetAttr( SfxItemSet& rOutAttrs )
 {
@@ -498,13 +489,6 @@ AbstractSdStartPresDlg *  SdAbstractDialogFactory_Impl::CreateSdStartPresentatio
 }
 // add for SdStartPresentationDlg end
 
-// add for SdPrintDlg begin
-AbstractSdPrintDlg *  SdAbstractDialogFactory_Impl::CreateSdPrintDlg( ::Window* pWindow )
-{
-    return new AbstractSdPrintDlg_Impl( new SdPrintDlg( pWindow ) );
-}
-// add for SdPrintDlg end
-
 // add for SdPresLayoutTemplateDlg begin
 SfxAbstractTabDialog *  SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool )
 {

sd/source/ui/dlg/sddlgfact.hxx

@@ -209,14 +209,6 @@ class AbstractSdStartPresDlg_Impl : public AbstractSdStartPresDlg
     virtual void    GetAttr( SfxItemSet& rOutAttrs );
 };
 
-// add for SdPrintDlg
-class SdPrintDlg;
-class AbstractSdPrintDlg_Impl : public AbstractSdPrintDlg
-{
-    DECL_ABSTDLG_BASE(AbstractSdPrintDlg_Impl,SdPrintDlg)
-    virtual USHORT  GetAttr();
-};
-
 // add for SdPresLayoutDlg
 class SdPresLayoutDlg;
 class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg
@@ -281,7 +273,6 @@ public:
     virtual SfxAbstractTabDialog*       CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL );
     virtual SfxAbstractTabDialog*       CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr );
     virtual AbstractSdStartPresDlg*     CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, List& rPageNames, List* pCSList );
-    virtual AbstractSdPrintDlg*         CreateSdPrintDlg( ::Window* pWindow ); //add for SdPrintDlg
     virtual SfxAbstractTabDialog*       CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool );
     virtual AbstractSdPresLayoutDlg*    CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs);
     virtual SfxAbstractTabDialog*       CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView );

sd/source/ui/inc/printdialog.hxx

-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SD_PRINTDIALOG_HXX_
-#define _SD_PRINTDIALOG_HXX_
-
-#include <vcl/image.hxx>
-#include <svtools/printdlg.hxx>
-#include <boost/shared_ptr.hpp>
-#include <vector>
-
-class SdOptionsPrintItem;
-
-class SdPrintDialog : public PrintDialog
-{
- public:
-    static SdPrintDialog* Create( Window* pWindow, bool bImpress );
-    virtual ~SdPrintDialog();
-
-    void Init( const SdOptionsPrintItem* pPrintOpts );
-    bool Fill( SdOptionsPrintItem* pPrintOpts );
-
-private:
-    SdPrintDialog( Window* pWindow, bool bImpress );
-
-    void UpdateStates();
-    void LoadPreviewImages();
-
-    DECL_LINK( UpdateStatesHdl, void* );
-
-    std::vector< boost::shared_ptr< Control > > mpControls;
-    std::vector< boost::shared_ptr< Image > > mpPreviews;
-    std::vector< boost::shared_ptr< Image > > mpPreviewsHC;
-    bool mbImpress;
-};
-
-#endif // _SD_PRINTDIALOG_HXX_
-

sd/source/ui/inc/printdlg.hrc

-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#define DLG_PRINT_WARNINGS 828
-#define FI_INFO 1
-#define RBT_SCALE 1
-#define RBT_POSTER 2
-#define RBT_CUT 3
-#define GRP_OPTIONS 1
-#define BTN_OK 1
-#define BTN_CANCEL 1
-#define BTN_HELP 1
-

sd/source/ui/inc/printdlg.hxx

-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#ifndef _SD_PRINTDLG_HXX_
-#define _SD_PRINTDLG_HXX_
-
-
-#include <vcl/group.hxx>
-#include <vcl/dialog.hxx>
-
-#ifndef _SV_BUTTON_HXX //autogen
-#include <vcl/button.hxx>
-#endif
-#include <svtools/stdctrl.hxx>
-
-
-/*************************************************************************
-|*
-|*    SdPrintDlg::SdPrintDlg()
-|*
-|*    Beschreibung  Dialog zum Einstellen von Printoptionen
-|*
-*************************************************************************/
-
-class SdPrintDlg : public ModalDialog
-{
-private:
-    FixedInfo           aFtInfo;
-    RadioButton         aRbtScale;
-    RadioButton         aRbtPoster;
-    RadioButton         aRbtCut;
-    FixedLine           aGrpOptions;
-    OKButton            aBtnOK;
-    CancelButton        aBtnCancel;
-    HelpButton          aBtnHelp;
-
-public:
-
-            SdPrintDlg( Window* pWindow );
-
-    USHORT  GetAttr();
-};
-
-#endif // _SD_PRINTDLG_HXX_
-

sd/source/ui/view/DocumentRenderer.cxx

@@ -122,7 +122,7 @@ namespace {
 
         sal_Int32 GetHandoutPageCount (void) const
         {
-            sal_uInt32 nIndex = static_cast<sal_Int32>(mrProperties.getIntValue("SlidesPerPage", sal_Int32(4)));
+            sal_uInt32 nIndex = static_cast<sal_Int32>(mrProperties.getIntValue("SlidesPerPage", sal_Int32(0)));
             if (nIndex<maSlidesPerPage.size())
                 return maSlidesPerPage[nIndex];
             else if ( ! maSlidesPerPage.empty())
@@ -464,7 +464,7 @@ namespace {
                                     CreateChoice(_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES_HELP),
                                     OUString( RTL_CONSTASCII_USTRINGPARAM( "SlidesPerPage" ) ),
                                     GetSlidesPerPageSequence(),
-                                    4,
+                                    0,
                                     OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) ),
                                     aContentOpt
                                     )
@@ -672,7 +672,8 @@ namespace {
             const Sequence<rtl::OUString> aChoice (
                 CreateChoice(_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES));
             maSlidesPerPage.clear();
-            for (sal_Int32 nIndex=0,nCount=aChoice.getLength(); nIndex<nCount; ++nIndex)
+            maSlidesPerPage.push_back(0); // first is using the default
+            for (sal_Int32 nIndex=1,nCount=aChoice.getLength(); nIndex<nCount; ++nIndex)
                 maSlidesPerPage.push_back(aChoice[nIndex].toInt32());
             return aChoice;
         }
@@ -1528,6 +1529,7 @@ 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;

sd/source/ui/view/DocumentRenderer.src

@@ -72,6 +72,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS
     {
         ItemList [ en-US ] =
         {
+            < "Default" ; > ;
             < "1" ; > ;
             < "2" ; > ;
             < "3" ; > ;