autorecovery: commit resolved merge (after rebase to m71)

6 files changed, 17 insertions, 22 deletions

diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx
index 3adfa962b9d7..913191ea7c3b 100644
--- a/sw/source/ui/inc/cfgitems.hxx
+++ b/sw/source/ui/inc/cfgitems.hxx
@@ -155,15 +155,15 @@ public:
 
 
     BOOL   IsPrintProspect() const      { return bPrintProspect; }
-    BOOL   IsPrintProspect_RTL() const      { return bPrintProspect_RTL; }
+    BOOL   IsPrintProspectRTL() const      { return bPrintProspectRTL; }
     void   SetPrintProspect(BOOL bFlag ){ bPrintProspect = bFlag; }
-    void   SetPrintProspect_RTL(BOOL bFlag ){ bPrintProspect_RTL = bFlag; }
+    void   SetPrintProspectRTL(BOOL bFlag ){ bPrintProspectRTL = bFlag; }
     BOOL IsPrintGraphic () const { return bPrintGraphic; }
     BOOL IsPrintTable () const { return bPrintTable; }
     BOOL IsPrintDraw () const { return bPrintDraw; }
     BOOL IsPrintControl () const { return bPrintControl; }
-    BOOL IsPrintLeftPage () const { return bPrintLeftPage; }
-    BOOL IsPrintRightPage() const { return bPrintRightPage; }
+    BOOL IsPrintLeftPage () const { return bPrintLeftPages; }
+    BOOL IsPrintRightPage() const { return bPrintRightPages; }
     BOOL IsPrintReverse  () const { return bPrintReverse; }
     BOOL IsPaperFromSetup() const { return bPaperFromSetup; }
     BOOL IsPrintEmptyPages() const { return bPrintEmptyPages; }
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx
index 959c4dc4fdd6..52611a703447 100644
--- a/sw/source/ui/inc/optpage.hxx
+++ b/sw/source/ui/inc/optpage.hxx
@@ -119,8 +119,8 @@ class SwAddPrinterTabPage : public SfxTabPage
 {
     FixedLine       aFL1;
     CheckBox        aGrfCB;
-    CheckBox        aTabCB;
-    CheckBox        aDrawCB;
+//  CheckBox        aTabCB;
+//  CheckBox        aDrawCB;
     CheckBox        aCtrlFldCB;
     CheckBox        aBackgroundCB;
     CheckBox        aBlackFontCB;
@@ -132,7 +132,7 @@ class SwAddPrinterTabPage : public SfxTabPage
     FixedLine       aFL2;
     CheckBox        aLeftPageCB;
     CheckBox        aRightPageCB;
-    CheckBox        aReverseCB;
+//  CheckBox        aReverseCB;
     CheckBox        aProspectCB;
     CheckBox        aProspectCB_RTL;
 
@@ -145,7 +145,7 @@ class SwAddPrinterTabPage : public SfxTabPage
     FixedLine        aFL3;
     FixedLine        aFL4;
     CheckBox        aPrintEmptyPagesCB;
-    CheckBox        aSingleJobsCB;
+//    CheckBox        aSingleJobsCB;
     CheckBox        aPaperFromSetupCB;
     FixedText       aFaxFT;
     ListBox         aFaxLB;
diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx
index bcb96a26cb3d..9fe9e61e2d6f 100644
--- a/sw/source/ui/inc/pview.hxx
+++ b/sw/source/ui/inc/pview.hxx
@@ -222,8 +222,6 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell
     SW_DLLPRIVATE int             ChgPage( int eMvMode, int bUpdateScrollbar = TRUE );
 
 
-    SW_DLLPRIVATE virtual USHORT          Print( SfxProgress &rProgress, BOOL bIsAPI,
-                                   PrintDialog *pPrintDialog = 0 );
     SW_DLLPRIVATE virtual SfxPrinter*     GetPrinter( BOOL bCreate = FALSE );
     SW_DLLPRIVATE virtual USHORT          SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
     SW_DLLPRIVATE virtual SfxTabPage*     CreatePrintOptionsPage( Window *pParent,
diff --git a/sw/source/ui/inc/srcview.hxx b/sw/source/ui/inc/srcview.hxx
index 996aab82b446..687015759243 100644..100755
--- a/sw/source/ui/inc/srcview.hxx
+++ b/sw/source/ui/inc/srcview.hxx
@@ -28,10 +28,12 @@
  *
  ************************************************************************/
 #ifndef _SRCVIEW_HXX
-#define _SRCIEW_HXX
+#define _SRCVIEW_HXX
 
 #include <sfx2/viewfac.hxx>
 #include <sfx2/viewsh.hxx>
+#include <vcl/outdev.hxx>
+
 #include "srcedtw.hxx"
 #include "shellid.hxx"
 
@@ -92,11 +94,11 @@ public:
 
     void            Load(SwDocShell* pDocShell);
 
-    virtual USHORT  SetPrinter( SfxPrinter* pNew,
-                                        USHORT nDiff = SFX_PRINTER_ALL, bool bIsAPI=false );
-    virtual ErrCode DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI );
+    virtual USHORT  SetPrinter( SfxPrinter* pNew, USHORT nDiff = SFX_PRINTER_ALL, bool bIsAPI=false );
     virtual         SfxPrinter*     GetPrinter( BOOL bCreate = FALSE );
 
+    sal_Int32       PrintSource( OutputDevice *pOutDev, sal_Int32 nPage, bool bCalcNumPagesOnly );
+
     void            SourceSaved() {bSourceSaved = TRUE;}
     BOOL            HasSourceSaved() const {return bSourceSaved;}
 
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 43dc420915ef..2793c625dfe3 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -109,7 +109,7 @@ public:
     virtual void SAL_CALL removeSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException );
 
     // XFormLayerAccess
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Bool SAL_CALL isFormDesignMode(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setFormDesignMode( ::sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 7ddfc2775299..b181c85fa5ae 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -88,7 +88,7 @@ class SwPrtOptions;
 class SwTransferable;
 class SwMailMergeConfigItem;
 class SwTxtNode; // #i23726#
-struct SwPrintData;
+class SwPrintData;
 class SwFormatClipboard;
 struct SwConversionArgs;
 class Graphic;
@@ -424,8 +424,6 @@ public:
 
     virtual USHORT          SetPrinter( SfxPrinter* pNew,
                                         USHORT nDiff = SFX_PRINTER_ALL, bool bIsAPI=false);
-    virtual ErrCode         DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog,
-                                     BOOL bSilent, BOOL bIsAPI );
     ShellModes              GetShellMode();
 
     com::sun::star::view::XSelectionSupplier*       GetUNOObject();
@@ -632,10 +630,6 @@ public:
     //apply Accessiblity options
     void ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions);
 
-    // get print options (SwPrtOptions)
-    static void MakeOptions( PrintDialog* pDlg, SwPrtOptions& rOpts,
-            BOOL* pPrtProspect, BOOL* pPrtProspect_RTL, BOOL bWeb, SfxPrinter* pPrt, SwPrintData* pData );
-
     SwView(SfxViewFrame* pFrame, SfxViewShell*);
     ~SwView();
 
@@ -692,3 +686,4 @@ SfxTabPage* CreatePrintOptionsPage( Window *pParent,
                                     BOOL bPreview);
 
 #endif
+