resync to DEV300_m70

14 files changed, 578 insertions, 336 deletions

diff --git a/sw/inc/IDocumentDeviceAccess.hxx b/sw/inc/IDocumentDeviceAccess.hxx
index 30e698e74d70..fbfdd82d001b 100755
--- a/sw/inc/IDocumentDeviceAccess.hxx
+++ b/sw/inc/IDocumentDeviceAccess.hxx
@@ -33,7 +33,7 @@
 
  class SfxPrinter;
  class JobSetup;
- struct SwPrintData;
+ class SwPrintData;
  class VirtualDevice;
  class OutputDevice;
 
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 05ff8add5dd8..e040191ded98 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -323,7 +323,6 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_GLOBAL_OPEN          (FN_VIEW + 47)  /* oeffnen */
 #define FN_GLOBAL_SAVE_CONTENT  (FN_VIEW + 48)  /* Inhalt der Verknuepfung mitspeichern */
 #define FN_CREATE_NAVIGATION    (FN_VIEW + 49)  /* Navigations-Controller erzeugen */
-#define FN_PREVIEW_PRINT_OPTIONS (FN_VIEW + 50)  /* Optionsdialog Preview drucken */
 #define FN_PREVIEW_ZOOM          (FN_VIEW + 51)  /* der Tabellencontroller fuer den Zoom */
 
 #define FN_SET_MODOPT_TBLNUMFMT  (FN_VIEW + 52) /* Zahlenerkennung in Tabellen */
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 9b61f001ed12..9adb2eb688a5 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -52,6 +52,7 @@ class SW_DLLPUBLIC SwDBFieldType : public SwValueFieldType
 public:
 
     SwDBFieldType(SwDoc* pDocPtr, const String& rColumnName, const SwDBData& rDBData);
+    ~SwDBFieldType();
 
     virtual const String& GetName() const;
     virtual SwFieldType*  Copy() const;
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index dfb67a7025f9..cf49361ee8a4 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -184,7 +184,7 @@ struct SwMergeDescriptor
         rDescriptor(rDesc),
         bSendAsHTML( sal_True ),
         bSendAsAttachment( sal_False ),
-        bPrintAsync( sal_True ),
+        bPrintAsync( sal_False ),
         bCreateSingleFile( sal_False ),
         pMailMergeConfigItem(0)
         {}
@@ -252,12 +252,6 @@ public:
     // Mischen von Datensaetzen in Felder
     BOOL            MergeNew( const SwMergeDescriptor& rMergeDesc );
     BOOL            Merge(SwWrtShell* pSh);
-    // Mischen von Datensaetzen in Felder, dann drucken
-    BOOL            MergePrint( SwView& rView,
-                                SwPrtOptions& rOpt, SfxProgress& rProgress, BOOL bIsAPI );
-    // printing parts of a merge result document
-    BOOL            MergePrintDocuments( SwView& rView,
-                                SwPrtOptions& rOpt, SfxProgress& rProgress, BOOL bIsAPI );
 
     // Datenbankfelder mit fehlendem Datenbankname initialisieren
     inline BOOL     IsInitDBFields() const  { return bInitDBFields; }
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 7079c353c498..d89af767f10b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -88,6 +88,8 @@ class SwList;
 
 #include <svtools/embedhlp.hxx>
 #include <vector>
+#include <set>
+#include <map>
 #include <memory>
 
 #include <boost/scoped_ptr.hpp>
@@ -206,7 +208,8 @@ struct SwDocStat;
 struct SwHash;
 struct SwSortOptions;
 struct SwDefTOXBase_Impl;
-struct SwPrintData;
+class SwPrintData;
+class SwPrintUIOptions;
 class SdrPageView;
 struct SwConversionArgs;
 class SwRewriter;
@@ -214,6 +217,10 @@ class SwMsgPoolItem;
 class SwChartDataProvider;
 class SwChartLockController_Helper;
 class IGrammarContact;
+class SwPrintData;
+class SwRenderData;
+class SwPageFrm;
+class SwViewOption;
 
 namespace sw { namespace mark {
     class MarkManager;
@@ -1361,6 +1368,15 @@ public:
     sal_Bool InsertGlossary( SwTextBlocks& rBlock, const String& rEntry,
                         SwPaM& rPaM, SwCrsrShell* pShell = 0);
 
+    // get the set of printable pages for the XRenderable API by
+    // evaluating the respective settings (see implementation)
+    void CalculatePagesForPrinting( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
+            sal_Int32 nDocPageCount );
+    void UpdatePagesForPrintingWithPostItData( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
+            sal_Int32 nDocPageCount );
+    void CalculatePagePairsForProspectPrinting( SwRenderData &rData, const SwPrintUIOptions &rOptions,
+            sal_Int32 nDocPageCount );
+
     sal_uInt16 GetPageCount() const;
     const Size GetPageSize( sal_uInt16 nPageNum, bool bSkipEmptyPages ) const;
 
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index a0c7635029f0..8f63fe816102 100644..100755
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -183,6 +183,7 @@ public:
 
     // Doc rausreichen aber VORSICHT
     inline SwDoc*                   GetDoc() { return pDoc; }
+    inline const SwDoc*             GetDoc() const { return pDoc; }
     IDocumentDeviceAccess*          getIDocumentDeviceAccess();
     const IDocumentSettingAccess*   getIDocumentSettingAccess() const;
     IDocumentChartDataProviderAccess*       getIDocumentChartDataProviderAccess();
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 0dc7f4e06be0..390b243cde03 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -54,6 +54,7 @@
 #define STR_DOC_STAT                (RC_GLOBALS_BEGIN + 10)
 
 #define STR_PAGE                    (RC_GLOBALS_BEGIN + 14)
+#define STR_PRINTOPTUI              (RC_GLOBALS_BEGIN + 15)
 
 //EventStrings
 
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 03a79281932c..3368418354cf 100644..100755
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -33,15 +33,45 @@
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
+#include <vcl/print.hxx>
 
-struct SwPrintData
+#include <set>
+#include <map>
+#include <vector>
+#include <utility>
+
+class SwPageFrm;
+class SwDoc;
+class SwDocShell;
+class ViewShell;
+class _SetGetExpFlds;
+class SwViewOption;
+class OutputDevice;
+class SwViewOptionAdjust_Impl;
+class SwPrtOptions;
+class SwWrtShell;
+class SfxViewShell;
+
+// forward declarations
+class SwPrintUIOptions;
+class SwRenderData;
+
+////////////////////////////////////////////////////////////
+
+
+class SwPrintData
 {
+    const SwPrintUIOptions *    m_pPrintUIOptions;  // not owner
+    const SwRenderData *        m_pRenderData;      // not owner
+
+public:
+
     sal_Bool bPrintGraphic, bPrintTable, bPrintDraw, bPrintControl, bPrintPageBackground,
              bPrintBlackFont,
              //#i81434# - printing of hidden text
              bPrintHiddenText, bPrintTextPlaceholder,
-             bPrintLeftPage, bPrintRightPage, bPrintReverse, bPrintProspect,
-             bPrintProspect_RTL,
+             bPrintLeftPages, bPrintRightPages, bPrintReverse, bPrintProspect,
+             bPrintProspectRTL,
              bPrintSingleJobs, bPaperFromSetup,
              // --> FME 2005-12-13 #b6354161# Print empty pages
              bPrintEmptyPages,
@@ -55,12 +85,15 @@ struct SwPrintData
 
     SwPrintData()
     {
+        m_pPrintUIOptions       = NULL;
+        m_pRenderData        = NULL;
+
         bPrintGraphic           =
         bPrintTable             =
         bPrintDraw              =
         bPrintControl           =
-        bPrintLeftPage          =
-        bPrintRightPage         =
+        bPrintLeftPages         =
+        bPrintRightPages        =
         bPrintPageBackground    =
         bPrintEmptyPages        =
         bUpdateFieldsInPrinting = sal_True;
@@ -68,11 +101,11 @@ struct SwPrintData
         bPaperFromSetup         =
         bPrintReverse           =
         bPrintProspect          =
-        bPrintProspect_RTL      =
+        bPrintProspectRTL       =
         bPrintSingleJobs        =
         bModified               =
         bPrintBlackFont         =
-        bPrintHiddenText       =
+        bPrintHiddenText        =
         bPrintTextPlaceholder   = sal_False;
 
         nPrintPostIts           = 0;
@@ -83,64 +116,202 @@ struct SwPrintData
     sal_Bool operator==(const SwPrintData& rData)const
     {
         return
-        bPrintGraphic       ==   rData.bPrintGraphic       &&
-        bPrintTable         ==   rData.bPrintTable         &&
-        bPrintDraw          ==   rData.bPrintDraw          &&
-        bPrintControl       ==   rData.bPrintControl       &&
-        bPrintPageBackground==   rData.bPrintPageBackground&&
-        bPrintBlackFont     ==   rData.bPrintBlackFont     &&
-        bPrintLeftPage      ==   rData.bPrintLeftPage      &&
-        bPrintRightPage     ==   rData.bPrintRightPage     &&
-        bPrintReverse       ==   rData.bPrintReverse       &&
-        bPrintProspect      ==   rData.bPrintProspect      &&
-        bPrintProspect_RTL  ==   rData.bPrintProspect_RTL  &&
-        bPrintSingleJobs    ==   rData.bPrintSingleJobs    &&
-        bPaperFromSetup     ==   rData.bPaperFromSetup     &&
-        bPrintEmptyPages    ==   rData.bPrintEmptyPages   &&
+        bPrintGraphic       ==   rData.bPrintGraphic        &&
+        bPrintTable         ==   rData.bPrintTable          &&
+        bPrintDraw          ==   rData.bPrintDraw           &&
+        bPrintControl       ==   rData.bPrintControl        &&
+        bPrintPageBackground==   rData.bPrintPageBackground &&
+        bPrintBlackFont     ==   rData.bPrintBlackFont      &&
+        bPrintLeftPages     ==   rData.bPrintLeftPages      &&
+        bPrintRightPages    ==   rData.bPrintRightPages     &&
+        bPrintReverse       ==   rData.bPrintReverse        &&
+        bPrintProspect      ==   rData.bPrintProspect       &&
+        bPrintProspectRTL   ==   rData.bPrintProspectRTL    &&
+        bPrintSingleJobs    ==   rData.bPrintSingleJobs     &&
+        bPaperFromSetup     ==   rData.bPaperFromSetup      &&
+        bPrintEmptyPages    ==   rData.bPrintEmptyPages     &&
         bUpdateFieldsInPrinting == rData.bUpdateFieldsInPrinting &&
-        nPrintPostIts       ==   rData.nPrintPostIts       &&
-        sFaxName            ==   rData.sFaxName         &&
-        bPrintHiddenText       ==   rData.bPrintHiddenText &&
+        nPrintPostIts       ==   rData.nPrintPostIts        &&
+        sFaxName            ==   rData.sFaxName             &&
+        bPrintHiddenText    ==   rData.bPrintHiddenText     &&
         bPrintTextPlaceholder   ==   rData.bPrintTextPlaceholder;
     }
-    sal_Bool IsPrintGraphic()   const { return bPrintGraphic; }
-    sal_Bool IsPrintTable()     const { return bPrintTable; }
-    sal_Bool IsPrintDraw()      const { return bPrintDraw; }
-    sal_Bool IsPrintControl()   const { return bPrintControl; }
-    sal_Bool IsPrintLeftPage()  const { return bPrintLeftPage; }
-    sal_Bool IsPrintRightPage() const { return bPrintRightPage; }
-    sal_Bool IsPrintReverse()   const { return bPrintReverse; }
-    sal_Bool IsPaperFromSetup() const { return bPaperFromSetup; }
-    sal_Bool IsPrintEmptyPages() const{ return bPrintEmptyPages; }
-    sal_Bool IsPrintProspect()  const { return bPrintProspect; }
-    sal_Bool IsPrintProspect_RTL()  const { return bPrintProspect_RTL; }
-    sal_Bool IsPrintPageBackground() const { return bPrintPageBackground; }
-    sal_Bool IsPrintBlackFont() const { return bPrintBlackFont;}
-    sal_Bool IsPrintSingleJobs() const { return bPrintSingleJobs;}
-    sal_Int16 GetPrintPostIts() const { return nPrintPostIts; }
-    const rtl::OUString     GetFaxName() const{return sFaxName;}
-    sal_Bool IsPrintHiddenText() const {return bPrintHiddenText;}
-    sal_Bool IsPrintTextPlaceholder() const {return bPrintTextPlaceholder;}
-
-    void SetPrintGraphic  ( sal_Bool b ) { doSetModified(); bPrintGraphic = b;}
-    void SetPrintTable    ( sal_Bool b ) { doSetModified(); bPrintTable = b;}
-    void SetPrintDraw     ( sal_Bool b ) { doSetModified(); bPrintDraw = b;}
-    void SetPrintControl  ( sal_Bool b ) { doSetModified(); bPrintControl = b; }
-    void SetPrintLeftPage ( sal_Bool b ) { doSetModified(); bPrintLeftPage = b;}
-    void SetPrintRightPage( sal_Bool b ) { doSetModified(); bPrintRightPage = b;}
-    void SetPrintReverse  ( sal_Bool b ) { doSetModified(); bPrintReverse = b;}
-    void SetPaperFromSetup( sal_Bool b ) { doSetModified(); bPaperFromSetup = b;}
-    void SetPrintEmptyPages(sal_Bool b ) { doSetModified(); bPrintEmptyPages = b;}
-    void SetPrintPostIts    ( sal_Int16 n){ doSetModified(); nPrintPostIts = n; }
-    void SetPrintProspect   ( sal_Bool b ) { doSetModified(); bPrintProspect = b; }
-    void SetPrintProspect_RTL   ( sal_Bool b ) { doSetModified(); bPrintProspect_RTL = b; }
-    void SetPrintPageBackground(sal_Bool b){ doSetModified(); bPrintPageBackground = b;}
-    void SetPrintBlackFont(sal_Bool b){ doSetModified(); bPrintBlackFont = b;}
-    void SetPrintSingleJobs(sal_Bool b){ doSetModified(); bPrintSingleJobs = b;}
-    void SetFaxName(const rtl::OUString& rSet){sFaxName = rSet;}
-    void SetPrintHiddenText(sal_Bool b){ doSetModified(); bPrintHiddenText = b;}
-    void SetPrintTextPlaceholder(sal_Bool b){ doSetModified(); bPrintTextPlaceholder = b;}
+
+    // Note: in the context where this class ist used the pointers should always be valid
+    // during the lifetime of this object
+    const SwPrintUIOptions &    GetPrintUIOptions() const       { return *m_pPrintUIOptions; }
+    const SwRenderData &        GetRenderData() const           { return *m_pRenderData; }
+    void  SetPrintUIOptions( const SwPrintUIOptions *pOpt )     { m_pPrintUIOptions = pOpt; }
+    void  SetRenderData( const SwRenderData *pData )            { m_pRenderData = pData; }
+
+    sal_Bool IsPrintGraphic() const             { return bPrintGraphic; }
+    sal_Bool IsPrintTable() const               { return bPrintTable; }
+    sal_Bool IsPrintDraw() const                { return bPrintDraw; }
+    sal_Bool IsPrintControl() const             { return bPrintControl; }
+    sal_Bool IsPrintLeftPage() const            { return bPrintLeftPages; }
+    sal_Bool IsPrintRightPage() const           { return bPrintRightPages; }
+    sal_Bool IsPrintReverse() const             { return bPrintReverse; }
+    sal_Bool IsPaperFromSetup() const           { return bPaperFromSetup; }
+    sal_Bool IsPrintEmptyPages() const          { return bPrintEmptyPages; }
+    sal_Bool IsPrintProspect() const            { return bPrintProspect; }
+    sal_Bool IsPrintProspectRTL() const         { return bPrintProspectRTL; }
+    sal_Bool IsPrintPageBackground() const      { return bPrintPageBackground; }
+    sal_Bool IsPrintBlackFont() const           { return bPrintBlackFont; }
+    sal_Bool IsPrintSingleJobs() const          { return bPrintSingleJobs; }
+    sal_Int16 GetPrintPostIts() const           { return nPrintPostIts; }
+    const rtl::OUString GetFaxName() const      { return sFaxName; }
+    sal_Bool IsPrintHiddenText() const          { return bPrintHiddenText; }
+    sal_Bool IsPrintTextPlaceholder() const     { return bPrintTextPlaceholder; }
+
+    void SetPrintGraphic( sal_Bool b )              { doSetModified(); bPrintGraphic = b; }
+    void SetPrintTable( sal_Bool b )                { doSetModified(); bPrintTable = b; }
+    void SetPrintDraw( sal_Bool b )                 { doSetModified(); bPrintDraw = b; }
+    void SetPrintControl( sal_Bool b )              { doSetModified(); bPrintControl = b; }
+    void SetPrintLeftPage( sal_Bool b )             { doSetModified(); bPrintLeftPages = b; }
+    void SetPrintRightPage( sal_Bool b )            { doSetModified(); bPrintRightPages = b; }
+    void SetPrintReverse( sal_Bool b )              { doSetModified(); bPrintReverse = b; }
+    void SetPaperFromSetup( sal_Bool b )            { doSetModified(); bPaperFromSetup = b; }
+    void SetPrintEmptyPages( sal_Bool b )           { doSetModified(); bPrintEmptyPages = b; }
+    void SetPrintPostIts( sal_Int16 n )             { doSetModified(); nPrintPostIts = n; }
+    void SetPrintProspect( sal_Bool b )             { doSetModified(); bPrintProspect = b; }
+    void SetPrintProspect_RTL( sal_Bool b )         { doSetModified(); bPrintProspectRTL = b; }
+    void SetPrintPageBackground( sal_Bool b )       { doSetModified(); bPrintPageBackground = b; }
+    void SetPrintBlackFont( sal_Bool b )            { doSetModified(); bPrintBlackFont = b; }
+    void SetPrintSingleJobs( sal_Bool b )           { doSetModified(); bPrintSingleJobs = b; }
+    void SetFaxName( const rtl::OUString& rSet )    { sFaxName = rSet; }
+    void SetPrintHiddenText( sal_Bool b )           { doSetModified(); bPrintHiddenText = b; }
+    void SetPrintTextPlaceholder( sal_Bool b )      { doSetModified(); bPrintTextPlaceholder = b; }
+
     virtual void doSetModified () { bModified = sal_True;}
 };
 
+
+////////////////////////////////////////////////////////////
+
+
+class SwPrintUIOptions : public vcl::PrinterOptionsHelper
+{
+    OutputDevice* m_pLast;
+    const SwPrintData & m_rDefaultPrintData;
+
+public:
+    SwPrintUIOptions( bool bWeb, bool bSwSrcView, bool bHasSelection, bool bHasPostIts, const SwPrintData &rDefaultPrintData );
+    virtual ~SwPrintUIOptions();
+
+    bool processPropertiesAndCheckFormat( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& i_rNewProp );
+
+    bool IsPrintFormControls() const            { return getBoolValue( "PrintControls",        m_rDefaultPrintData.bPrintControl ); }
+    bool IsPrintPageBackground() const          { return getBoolValue( "PrintPageBackground",  m_rDefaultPrintData.bPrintPageBackground ); }
+    bool IsPrintProspect() const                { return getBoolValue( "PrintProspect",        m_rDefaultPrintData.bPrintProspect ); }
+    bool IsPrintProspectRTL() const             { return getIntValue( "PrintProspectRTL",      m_rDefaultPrintData.bPrintProspectRTL ) ? true : false; }
+    bool IsPrintTextPlaceholders() const        { return getBoolValue( "PrintTextPlaceholder", m_rDefaultPrintData.bPrintTextPlaceholder ); }
+    bool IsPrintHiddenText() const              { return getBoolValue( "PrintHiddenText",      m_rDefaultPrintData.bPrintHiddenText ); }
+    bool IsPrintWithBlackTextColor() const      { return getBoolValue( "PrintBlackFonts",      m_rDefaultPrintData.bPrintBlackFont ); }
+    sal_Int16 GetPrintPostItsType() const       { return static_cast< sal_Int16 >(getIntValue( "PrintAnnotationMode", m_rDefaultPrintData.nPrintPostIts )); }
+    bool IsPaperFromSetup() const               { return getBoolValue( "PrintPaperFromSetup",  m_rDefaultPrintData.bPaperFromSetup ); }
+    bool IsPrintReverse() const                 { return false; /*handled by print dialog now*/ /*getBoolValue( "PrintReversed",        m_rDefaultPrintData.bPrintReverse );*/ }
+
+    bool IsPrintLeftPages() const;
+    bool IsPrintRightPages() const;
+    bool IsPrintEmptyPages( bool bIsPDFExport ) const;
+    bool IsPrintTables() const;
+    bool IsPrintGraphics() const;
+    bool IsPrintDrawings() const;
+};
+
+
+////////////////////////////////////////////////////////////
+
+// A class that stores temporary data that is needed for rendering the document.
+// Usually this data is created when 'getRendererCount' is called and
+// and it is used in the 'render' function of that same interface
+class SwRenderData
+{
+    // pages valid for printing (according to the current settings)
+    // and their respective start frames (see getRendererCount in unotxdoc.cxx)
+    // This set of pages does NOT depend on the 'PageRange' that is used as a printing option!
+    std::set< sal_Int32 >                       m_aValidPages;          // the set of possible pages (see StringRangeEnumerator::getRangesFromString )
+    std::map< sal_Int32, const SwPageFrm * >    m_aValidStartFrames;    // the map of start frames for those pages
+
+    // vector of pages and their order to be printed (duplicates and any order allowed!)
+    // (see 'render' in unotxdoc.cxx)
+    std::vector< sal_Int32 >                    m_aPagesToPrint;
+
+    std::vector< const SwPageFrm * >            m_aPostItStartFrames;
+
+    // for prospect printing: the pairs of pages to be printed together on a single prospect page.
+    // -1 indicates a half page to be left empty.
+    std::vector< std::pair< sal_Int32, sal_Int32 > >    m_aPagePairs;
+
+    rtl::OUString               m_aPageRange;
+
+    // the view options to be applied for printing
+    SwViewOptionAdjust_Impl *   m_pViewOptionAdjust;
+
+    SwPrtOptions *              m_pPrtOptions;
+
+public:
+
+    // PostIt relevant data
+    _SetGetExpFlds *    m_pPostItFields;    // an array of "_SetGetExpFld *" sorted by page and line numbers
+    SwDoc *             m_pPostItDoc;
+    ViewShell *         m_pPostItShell;
+
+public:
+    SwRenderData();
+    ~SwRenderData();
+
+
+    bool HasPostItData() const  { return m_pPostItShell != 0 && m_pPostItDoc != 0 && m_pPostItShell != 0; }
+    void CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, OutputDevice *pOutDev );
+    void DeletePostItData();
+
+    bool IsViewOptionAdjust() const  { return m_pViewOptionAdjust != 0; }
+    void ViewOptionAdjustStart( SwWrtShell &rSh, const SwViewOption &rViewOptions );
+    void ViewOptionAdjust( const SwPrtOptions *pPrtOptions );
+    void ViewOptionAdjustStop();
+
+    bool HasSwPrtOptions() const    { return m_pPrtOptions != 0; }
+    void SetSwPrtOptions( SwPrtOptions * pOpt )     { m_pPrtOptions = pOpt; }
+    const SwPrtOptions *    GetSwPrtOptions() const { return m_pPrtOptions; }
+    SwPrtOptions &          GetSwPrtOptionsRef()    { return *m_pPrtOptions; }
+    void MakeSwPrtOptions( SwPrtOptions &rOptions, const SwDocShell *pDocShell,
+            const SwPrintUIOptions *pOpt, const SwRenderData *pData, bool bIsPDFExport );
+
+
+    typedef std::map< sal_Int32, const SwPageFrm * >            ValidStartFramesMap_t;
+    typedef std::vector< std::pair< sal_Int32, sal_Int32 > >    PagePairsVec_t;
+
+    std::set< sal_Int32 > &             GetValidPagesSet()          { return m_aValidPages; }
+    const std::set< sal_Int32 > &       GetValidPagesSet() const    { return m_aValidPages; }
+    ValidStartFramesMap_t &             GetValidStartFrames()       { return m_aValidStartFrames; }
+    const ValidStartFramesMap_t &       GetValidStartFrames() const { return m_aValidStartFrames; }
+
+    // used for 'normal' printing
+    // A page value of 0 as entry indicates that this page is not from the document but
+    // from the post-it document. (See also GetPostItStartFrame below)
+    std::vector< sal_Int32 > &          GetPagesToPrint()           { return m_aPagesToPrint; }
+    const std::vector< sal_Int32 > &    GetPagesToPrint() const     { return m_aPagesToPrint; }
+
+    // used for 'normal' printing with post-its
+    // - if the map entry will be NULL then the respective page to be printed is from
+    // the document. In that case use the value from GetPagesToPrint at the same index to
+    // get the phys. page number to be printed, and then retrieve the start frame to use
+    // from GetValidStartFrms.
+    // - If the entry is not NULL it is the start frame of the page from the post-it document
+    // that is to be printed
+    std::vector< const SwPageFrm * > &          GetPostItStartFrames()          { return m_aPostItStartFrames; }
+    const std::vector< const SwPageFrm * > &    GetPostItStartFrames() const    { return m_aPostItStartFrames; }
+
+    // used for prospect printing only
+    PagePairsVec_t &                    GetPagePairsForProspectPrinting()           { return m_aPagePairs; }
+    const PagePairsVec_t &              GetPagePairsForProspectPrinting() const     { return m_aPagePairs; }
+
+    rtl::OUString   GetPageRange() const                            { return m_aPageRange; }
+    void            SetPageRange( const rtl::OUString &rRange )     { m_aPageRange = rRange; }
+};
+
+
+////////////////////////////////////////////////////////////
+
 #endif  //_SW_PRINTDATA_HXX
diff --git a/sw/inc/rolbck.hxx b/sw/inc/rolbck.hxx
index 1f225aeeb8b0..c8f8561138b8 100644
--- a/sw/inc/rolbck.hxx
+++ b/sw/inc/rolbck.hxx
@@ -163,8 +163,11 @@ public:
 
 class SwHistorySetTxtFld : public SwHistoryHint
 {
+    //!! beware of the order for the declation of thje auto_ptrs.
+    //!! If they get destroyed in the wrong order sw may crash (namely mail-merge as well)
     ::std::auto_ptr<SwFieldType> m_pFldType;
     const ::std::auto_ptr<SwFmtFld> m_pFld;
+
     ULONG m_nNodeIndex;
     xub_StrLen m_nPos;
     USHORT m_nFldWhich;
diff --git a/sw/inc/swprtopt.hxx b/sw/inc/swprtopt.hxx
index 38250fe7f28d..dbf2898c481e 100644
--- a/sw/inc/swprtopt.hxx
+++ b/sw/inc/swprtopt.hxx
@@ -34,11 +34,24 @@
 #include <tools/multisel.hxx>
 #include <printdata.hxx>
 
+#include <set>
+#include <map>
+#include <vector>
+#include <utility>
+
 #define POSTITS_NONE    0
 #define POSTITS_ONLY    1
 #define POSTITS_ENDDOC  2
 #define POSTITS_ENDPAGE 3
 
+
+class PrintDialog;
+class SfxPrinter;
+
+
+////////////////////////////////////////////////////////////
+
+
 class SwPrtOptions : public SwPrintData
 {
     USHORT nJobNo;
@@ -75,27 +88,18 @@ public:
 #endif
 
 
-        SwPrtOptions& operator=(const SwPrintData& rData)
-            {
-                SwPrintData::operator=(rData);
-                return *this;
-            }
-};
-
-
-#endif //_SWPRTOPT_HXX
-
-
-
-
-
-
-
-
-
-
+    SwPrtOptions& operator=(const SwPrintData& rData)
+        {
+            SwPrintData::operator=(rData);
+            return *this;
+        }
 
+    // get print options
+    void MakeOptions( BOOL bWeb );
+};
 
 
+////////////////////////////////////////////////////////////
 
+#endif //_SWPRTOPT_HXX
 
diff --git a/sw/inc/unomod.hxx b/sw/inc/unomod.hxx
index dcb2f9cfcbda..0f46a92f323e 100644
--- a/sw/inc/unomod.hxx
+++ b/sw/inc/unomod.hxx
@@ -45,7 +45,7 @@
 
 class SwView;
 class SwViewOption;
-struct SwPrintData;
+class SwPrintData;
 class SwDoc;
 
 /******************************************************************************
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 3e6b12e5b6bd..cc3200c96143 100644..100755
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -29,9 +29,11 @@
  ************************************************************************/
 #ifndef _UNOTXDOC_HXX
 #define _UNOTXDOC_HXX
+
 #include "swdllapi.h"
 #include <svl/svarray.hxx>
 #include <sfx2/sfxbasemodel.hxx>
+
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/style/XAutoStylesSupplier.hpp>
@@ -61,6 +63,7 @@
 #include <com/sun/star/util/XLinkUpdate.hpp>
 #include <com/sun/star/view/XRenderable.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/i18n/XForbiddenCharacters.hpp>
@@ -78,6 +81,8 @@
 #include <cppuhelper/implbase4.hxx> // helper for implementations
 #include <RefreshListenerContainer.hxx>
 
+#include <viewopt.hxx>
+
 #define __IFC32 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, Ifc14, Ifc15, Ifc16, \
 Ifc17, Ifc18, Ifc19, Ifc20, Ifc21, Ifc22, Ifc23, Ifc24, Ifc25, Ifc26, Ifc27, Ifc28, Ifc29, Ifc30, Ifc31, Ifc32
 
@@ -114,6 +119,8 @@ public Ifc31, public Ifc32
 
 __DEF_IMPLHELPER_EX( 32 )
 
+namespace css = ::com::sun::star;
+
 class SwDoc;
 class SwDocShell;
 class UnoActionContext;
@@ -122,10 +129,17 @@ class SwXDrawPage;
 class SwUnoCrsr;
 class SwXDocumentPropertyHelper;
 class SfxViewFrame;
+class SwPrintUIOptions;
+class SwPrintData;
+class SwRenderData;
+class SwPrtOptions;
+class SwWrtShell;
+
 
 typedef UnoActionContext* UnoActionContextPtr;
 SV_DECL_PTRARR(ActionContextArr, UnoActionContextPtr, 4, 4)
 
+
 /******************************************************************************
  *
  ******************************************************************************/
@@ -133,38 +147,38 @@ SV_DECL_PTRARR(ActionContextArr, UnoActionContextPtr, 4, 4)
 
 typedef cppu::WeakImplHelper32
 <
-    ::com::sun::star::text::XTextDocument,
-    ::com::sun::star::text::XLineNumberingProperties,
-    ::com::sun::star::text::XChapterNumberingSupplier,
-    ::com::sun::star::text::XNumberingRulesSupplier,
-    ::com::sun::star::text::XFootnotesSupplier,
-    ::com::sun::star::text::XEndnotesSupplier,
-    ::com::sun::star::util::XReplaceable,
-    ::com::sun::star::text::XPagePrintable,
-    ::com::sun::star::text::XReferenceMarksSupplier,
-    ::com::sun::star::text::XTextTablesSupplier,
-    ::com::sun::star::text::XTextFramesSupplier,
-    ::com::sun::star::text::XBookmarksSupplier,
-    ::com::sun::star::text::XTextSectionsSupplier,
-    ::com::sun::star::text::XTextGraphicObjectsSupplier,
-    ::com::sun::star::text::XTextEmbeddedObjectsSupplier,
-    ::com::sun::star::text::XTextFieldsSupplier,
-    ::com::sun::star::style::XStyleFamiliesSupplier,
-    ::com::sun::star::style::XAutoStylesSupplier,
-    ::com::sun::star::lang::XServiceInfo,
-    ::com::sun::star::drawing::XDrawPageSupplier,
-    ::com::sun::star::text::XDocumentIndexesSupplier,
-    ::com::sun::star::beans::XPropertySet,
-    ::com::sun::star::beans::XPropertyState,
-    ::com::sun::star::document::XLinkTargetSupplier,
-    ::com::sun::star::document::XRedlinesSupplier,
-    ::com::sun::star::util::XRefreshable,
-    ::com::sun::star::util::XLinkUpdate,
-    ::com::sun::star::view::XRenderable,
-    ::com::sun::star::xforms::XFormsSupplier,
-    ::com::sun::star::text::XFlatParagraphIteratorProvider,
-    ::com::sun::star::document::XDocumentLanguages,
-    ::com::sun::star::util::XCloneable
+    css::text::XTextDocument,
+    css::text::XLineNumberingProperties,
+    css::text::XChapterNumberingSupplier,
+    css::text::XNumberingRulesSupplier,
+    css::text::XFootnotesSupplier,
+    css::text::XEndnotesSupplier,
+    css::util::XReplaceable,
+    css::text::XPagePrintable,
+    css::text::XReferenceMarksSupplier,
+    css::text::XTextTablesSupplier,
+    css::text::XTextFramesSupplier,
+    css::text::XBookmarksSupplier,
+    css::text::XTextSectionsSupplier,
+    css::text::XTextGraphicObjectsSupplier,
+    css::text::XTextEmbeddedObjectsSupplier,
+    css::text::XTextFieldsSupplier,
+    css::style::XStyleFamiliesSupplier,
+    css::style::XAutoStylesSupplier,
+    css::lang::XServiceInfo,
+    css::drawing::XDrawPageSupplier,
+    css::text::XDocumentIndexesSupplier,
+    css::beans::XPropertySet,
+    css::beans::XPropertyState,
+    css::document::XLinkTargetSupplier,
+    css::document::XRedlinesSupplier,
+    css::util::XRefreshable,
+    css::util::XLinkUpdate,
+    css::view::XRenderable,
+    css::xforms::XFormsSupplier,
+    css::text::XFlatParagraphIteratorProvider,
+    css::document::XDocumentLanguages,
+    css::util::XCloneable
 >
 SwXTextDocumentBaseClass;
 
@@ -181,47 +195,51 @@ class SW_DLLPUBLIC SwXTextDocument : public SwXTextDocumentBaseClass,
     sal_Bool                    bObjectValid;
 
     SwXDrawPage*            pDrawPage;
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > *          pxXDrawPage;
+    css::uno::Reference< css::drawing::XDrawPage > *            pxXDrawPage;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >               xBodyText;
+    css::uno::Reference< css::text::XText >                 xBodyText;
     SwXBodyText*            pBodyText;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >             xNumFmtAgg;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > *     pxXNumberingRules;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > *     pxXFootnotes;
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *        pxXFootnoteSettings;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > *     pxXEndnotes;
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *        pxXEndnoteSettings;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXReferenceMarks;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > *   pxXTextFieldTypes;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXTextFieldMasters;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXTextSections;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXBookmarks;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXTextTables;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXTextFrames;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXGraphicObjects;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXEmbeddedObjects;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXStyleFamilies;
-    mutable ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyles > *  pxXAutoStyles;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > *        pxXChapterNumbering;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > *     pxXDocumentIndexes;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *         pxXLineNumberingProperties;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxLinkTargetSupplier;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >*    pxXRedlines;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>      xXFormsContainer;
+    css::uno::Reference< css::uno::XAggregation >           xNumFmtAgg;
+
+    css::uno::Reference< css::container::XIndexAccess > *     pxXNumberingRules;
+    css::uno::Reference< css::container::XIndexAccess > *     pxXFootnotes;
+    css::uno::Reference< css::beans::XPropertySet > *        pxXFootnoteSettings;
+    css::uno::Reference< css::container::XIndexAccess > *       pxXEndnotes;
+    css::uno::Reference< css::beans::XPropertySet > *        pxXEndnoteSettings;
+    css::uno::Reference< css::container::XNameAccess > *            pxXReferenceMarks;
+    css::uno::Reference< css::container::XEnumerationAccess > * pxXTextFieldTypes;
+    css::uno::Reference< css::container::XNameAccess > *            pxXTextFieldMasters;
+    css::uno::Reference< css::container::XNameAccess > *            pxXTextSections;
+    css::uno::Reference< css::container::XNameAccess > *            pxXBookmarks;
+    css::uno::Reference< css::container::XNameAccess > *            pxXTextTables;
+    css::uno::Reference< css::container::XNameAccess > *            pxXTextFrames;
+    css::uno::Reference< css::container::XNameAccess > *            pxXGraphicObjects;
+    css::uno::Reference< css::container::XNameAccess > *            pxXEmbeddedObjects;
+    css::uno::Reference< css::container::XNameAccess > *            pxXStyleFamilies;
+    mutable css::uno::Reference< css::style::XAutoStyles > *  pxXAutoStyles;
+    css::uno::Reference< css::container::XIndexReplace > *        pxXChapterNumbering;
+    css::uno::Reference< css::container::XIndexAccess > *       pxXDocumentIndexes;
+
+    css::uno::Reference< css::beans::XPropertySet > *       pxXLineNumberingProperties;
+    css::uno::Reference< css::container::XNameAccess > *            pxLinkTargetSupplier;
+    css::uno::Reference< css::container::XEnumerationAccess >*  pxXRedlines;
+    css::uno::Reference< css::container::XNameContainer>        xXFormsContainer;
 
     //temporary frame to enable PDF export if no valid view is available
-    SfxViewFrame*                                                                       m_pHiddenViewFrame;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>                    xPropertyHelper;
-    SwXDocumentPropertyHelper*                                                              pPropertyHelper;
+    SfxViewFrame*                                   m_pHiddenViewFrame;
+    css::uno::Reference< css::uno::XInterface>      xPropertyHelper;
+    SwXDocumentPropertyHelper*                      pPropertyHelper;
+
+    SwPrintUIOptions *                              m_pPrintUIOptions;
+    SwRenderData *                               m_pRenderData;
 
     void                    GetBodyText();
     void                    GetNumberFormatter();
 
     // used for XRenderable implementation
-    SfxViewShell *  GuessViewShell();
-    SwDoc *         GetRenderDoc( SfxViewShell *&rpView, const ::com::sun::star::uno::Any& rSelection );
+    SfxViewShell *  GuessViewShell( /* out */ bool &rbIsSwSrcView, const css::uno::Reference< css::frame::XController > xController = css::uno::Reference< css::frame::XController >() );
+    SwDoc *         GetRenderDoc( SfxViewShell *&rpView, const css::uno::Any& rSelection, bool bIsPDFExport );
+    SfxViewShell *  GetRenderView( bool &rbIsSwSrcView, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions, bool bIsPDFExport );
 
     rtl::OUString           maBuildId;
 
@@ -234,173 +252,173 @@ public:
     SwXTextDocument(SwDocShell* pShell);
 
     inline void notifyRefreshListeners() { aRefreshCont.Refreshed(); }
-    virtual     ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
+    virtual     css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException);
     virtual void SAL_CALL acquire(  ) throw();
     virtual void SAL_CALL release(  ) throw();
 
     //XWeak
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter > SAL_CALL queryAdapter(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Reference< css::uno::XAdapter > SAL_CALL queryAdapter(  ) throw(css::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException);
 
-    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+    static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException);
 
     //XTextDocument
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >  SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL reformat(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::text::XText >  SAL_CALL getText(void) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL reformat(void) throw( css::uno::RuntimeException );
 
     //XModel
-    virtual sal_Bool SAL_CALL attachResource( const ::rtl::OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getURL(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL lockControllers(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL unlockControllers(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasControllersLocked(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SAL_CALL getCurrentController(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setCurrentController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getCurrentSelection(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL attachResource( const ::rtl::OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw(css::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getURL(  ) throw(css::uno::RuntimeException);
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs(  ) throw(css::uno::RuntimeException);
+    virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::uno::RuntimeException);
+    virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::uno::RuntimeException);
+    virtual void SAL_CALL lockControllers(  ) throw(css::uno::RuntimeException);
+    virtual void SAL_CALL unlockControllers(  ) throw(css::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasControllersLocked(  ) throw(css::uno::RuntimeException);
+    virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController(  ) throw(css::uno::RuntimeException);
+    virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::container::NoSuchElementException, css::uno::RuntimeException);
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection(  ) throw(css::uno::RuntimeException);
 
     //XComponent
-    virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL dispose(void) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException );
 
     //XCloseable
-    virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException);
 
     //XLineNumberingProperties
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getLineNumberingProperties(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getLineNumberingProperties(void) throw( css::uno::RuntimeException );
 
     //XChapterNumberingSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace >  SAL_CALL getChapterNumberingRules(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XIndexReplace >  SAL_CALL getChapterNumberingRules(void) throw( css::uno::RuntimeException );
 
     //XNumberingRulesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getNumberingRules() throw (::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getNumberingRules() throw (css::uno::RuntimeException);
 
     //XFootnotesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >  SAL_CALL getFootnotes(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  SAL_CALL getFootnoteSettings(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XIndexAccess >  SAL_CALL getFootnotes(void) throw( css::uno::RuntimeException );
+    virtual css::uno::Reference< css::beans::XPropertySet >  SAL_CALL getFootnoteSettings(void) throw( css::uno::RuntimeException );
 
     //XEndnotesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >  SAL_CALL getEndnotes(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  SAL_CALL getEndnoteSettings(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XIndexAccess >  SAL_CALL getEndnotes(void) throw( css::uno::RuntimeException );
+    virtual css::uno::Reference< css::beans::XPropertySet >  SAL_CALL getEndnoteSettings(void) throw( css::uno::RuntimeException );
 
     //XReplaceable
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceDescriptor >  SAL_CALL createReplaceDescriptor(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Int32 SAL_CALL replaceAll(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & xDesc) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::util::XReplaceDescriptor >  SAL_CALL createReplaceDescriptor(void) throw( css::uno::RuntimeException );
+    virtual sal_Int32 SAL_CALL replaceAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException );
 
     //XSearchable
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >  SAL_CALL createSearchDescriptor(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >  SAL_CALL findAll(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & xDesc) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL findFirst(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & xDesc) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL findNext(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xStartAt, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & xDesc) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::util::XSearchDescriptor >  SAL_CALL createSearchDescriptor(void) throw( css::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XIndexAccess >  SAL_CALL findAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException );
+    virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL findFirst(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException );
+    virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL findNext(const css::uno::Reference< css::uno::XInterface > & xStartAt, const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException );
 
     //XPagePrintable
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPagePrintSettings(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setPagePrintSettings(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aSettings) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL printPages(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPagePrintSettings(void) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL setPagePrintSettings(const css::uno::Sequence< css::beans::PropertyValue >& aSettings) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL printPages(const css::uno::Sequence< css::beans::PropertyValue >& xOptions) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
 
     //XReferenceMarksSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getReferenceMarks(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getReferenceMarks(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::text::XTextFieldsSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >  SAL_CALL getTextFields(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getTextFieldMasters(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::text::XTextFieldsSupplier
+    virtual css::uno::Reference< css::container::XEnumerationAccess >  SAL_CALL getTextFields(void) throw( css::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getTextFieldMasters(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::text::XTextEmbeddedObjectsSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getEmbeddedObjects(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::text::XTextEmbeddedObjectsSupplier
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getEmbeddedObjects(void) throw( css::uno::RuntimeException );
 
-//  // ::com::sun::star::text::XTextShapesSupplier
-//    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >  getShapes(void) throw( ::com::sun::star::uno::RuntimeException );
+//  // css::text::XTextShapesSupplier
+//    virtual css::uno::Reference< css::container::XIndexAccess >  getShapes(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::text::XBookmarksSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getBookmarks(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::text::XBookmarksSupplier
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getBookmarks(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::text::XTextSectionsSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getTextSections(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::text::XTextSectionsSupplier
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getTextSections(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::text::XTextTablesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getTextTables(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::text::XTextTablesSupplier
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getTextTables(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::text::XTextGraphicObjectsSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getGraphicObjects(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::text::XTextGraphicObjectsSupplier
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getGraphicObjects(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::text::XTextFramesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getTextFrames(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::text::XTextFramesSupplier
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getTextFrames(void) throw( css::uno::RuntimeException );
 
     //XStyleFamiliesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getStyleFamilies(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getStyleFamilies(void) throw( css::uno::RuntimeException );
 
     //XAutoStylesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyles > SAL_CALL getAutoStyles(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Reference< css::style::XAutoStyles > SAL_CALL getAutoStyles(  ) throw (css::uno::RuntimeException);
 
     //XMultiServiceFactory
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL createInstance(const rtl::OUString& ServiceSpecifier)
-                throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL createInstanceWithArguments(const rtl::OUString& ServiceSpecifier,
-                const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments)
-                throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getAvailableServiceNames(void)
-                throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL createInstance(const rtl::OUString& ServiceSpecifier)
+                throw( css::uno::Exception, css::uno::RuntimeException );
+    virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL createInstanceWithArguments(const rtl::OUString& ServiceSpecifier,
+                const css::uno::Sequence< css::uno::Any >& Arguments)
+                throw( css::uno::Exception, css::uno::RuntimeException );
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getAvailableServiceNames(void)
+                throw( css::uno::RuntimeException );
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual rtl::OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException );
+    virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException );
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::drawing::XDrawPageSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >  SAL_CALL getDrawPage(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::drawing::XDrawPageSupplier
+    virtual css::uno::Reference< css::drawing::XDrawPage >  SAL_CALL getDrawPage(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::text::XDocumentIndexesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >  SAL_CALL getDocumentIndexes(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::text::XDocumentIndexesSupplier
+    virtual css::uno::Reference< css::container::XIndexAccess >  SAL_CALL getDocumentIndexes(void) throw( css::uno::RuntimeException );
 
     //XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
 
     //XPropertyState
-    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< ::rtl::OUString >& rPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
 
     //XLinkTargetSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getLinks(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getLinks(void) throw( css::uno::RuntimeException );
 
     //XRedlinesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > SAL_CALL getRedlines(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL getRedlines(  ) throw(css::uno::RuntimeException);
 
-    // ::com::sun::star::util::XRefreshable
-    virtual void SAL_CALL refresh(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL addRefreshListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener > & l) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeRefreshListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener > & l) throw( ::com::sun::star::uno::RuntimeException );
+    // css::util::XRefreshable
+    virtual void SAL_CALL refresh(void) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::util::XLinkUpdate,
-    virtual void SAL_CALL updateLinks(  ) throw(::com::sun::star::uno::RuntimeException);
+    // css::util::XLinkUpdate,
+    virtual void SAL_CALL updateLinks(  ) throw(css::uno::RuntimeException);
 
-    // ::com::sun::star::view::XRenderable
-    virtual sal_Int32 SAL_CALL getRendererCount( const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    // css::view::XRenderable
+    virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
-    // ::com::sun::star::xforms::XFormsSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getXForms(  ) throw (::com::sun::star::uno::RuntimeException);
+    // css::xforms::XFormsSupplier
+    virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getXForms(  ) throw (css::uno::RuntimeException);
 
-    // ::com::sun::star::document::XDocumentLanguages
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getDocumentLanguages( ::sal_Int16 nScriptTypes, ::sal_Int16 nCount ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    // css::document::XDocumentLanguages
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getDocumentLanguages( ::sal_Int16 nScriptTypes, ::sal_Int16 nCount ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
-    // ::com::sun::star::text::XFlatParagraphIteratorProvider:
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraphIterator > SAL_CALL getFlatParagraphIterator(::sal_Int32 nTextMarkupType, sal_Bool bAutomatic ) throw (::com::sun::star::uno::RuntimeException);
+    // css::text::XFlatParagraphIteratorProvider:
+    virtual css::uno::Reference< css::text::XFlatParagraphIterator > SAL_CALL getFlatParagraphIterator(::sal_Int32 nTextMarkupType, sal_Bool bAutomatic ) throw (css::uno::RuntimeException);
 
     // ::com::sun::star::util::XCloneable
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone(  ) throw (::com::sun::star::uno::RuntimeException);
@@ -414,15 +432,16 @@ public:
 
     void                        InitNewDoc();
 
-    SwUnoCrsr*                  CreateCursorForSearch(::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > & xCrsr);
-    SwUnoCrsr*                  FindAny(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & xDesc,
-                                            ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > & xCrsr, sal_Bool bAll,
+    SwUnoCrsr*                  CreateCursorForSearch(css::uno::Reference< css::text::XTextCursor > & xCrsr);
+    SwUnoCrsr*                  FindAny(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc,
+                                            css::uno::Reference< css::text::XTextCursor > & xCrsr, sal_Bool bAll,
                                             sal_Int32& nResult,
-                                            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  xLastResult);
+                                            css::uno::Reference< css::uno::XInterface >  xLastResult);
 
     SwXDrawPage*                GetDrawPage();
     SwDocShell*                 GetDocShell() {return pDocShell;}
 
+
     void * SAL_CALL operator new( size_t ) throw();
     void SAL_CALL operator delete( void * ) throw();
 
@@ -432,8 +451,8 @@ public:
  --------------------------------------------------*/
 class SwXLinkTargetSupplier : public cppu::WeakImplHelper2
 <
-    ::com::sun::star::container::XNameAccess,
-    ::com::sun::star::lang::XServiceInfo
+    css::container::XNameAccess,
+    css::lang::XServiceInfo
 >
 {
     SwXTextDocument* pxDoc;
@@ -450,18 +469,18 @@ public:
     ~SwXLinkTargetSupplier();
 
     //XNameAccess
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name)  throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Any SAL_CALL getByName(const rtl::OUString& Name)  throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException );
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( css::uno::RuntimeException );
 
     //XElementAccess
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual rtl::OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException );
+    virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException );
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException );
 
     //
     void    Invalidate() {pxDoc = 0;}
@@ -471,52 +490,52 @@ public:
  --------------------------------------------------*/
 class SwXLinkNameAccessWrapper : public cppu::WeakImplHelper4
 <
-    ::com::sun::star::beans::XPropertySet,
-    ::com::sun::star::container::XNameAccess,
-    ::com::sun::star::lang::XServiceInfo,
-    ::com::sun::star::document::XLinkTargetSupplier
+    css::beans::XPropertySet,
+    css::container::XNameAccess,
+    css::lang::XServiceInfo,
+    css::document::XLinkTargetSupplier
 >
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >    xRealAccess;
+    css::uno::Reference< css::container::XNameAccess >    xRealAccess;
     const SfxItemPropertySet*                                                       pPropSet;
     const String                                                                    sLinkSuffix;
     const String                                                                    sLinkDisplayName;
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument >       xDoc;
+    css::uno::Reference< css::text::XTextDocument >         xDoc;
     SwXTextDocument*                                                                pxDoc;
 
 
 public:
-    SwXLinkNameAccessWrapper(::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  xAccess,
+    SwXLinkNameAccessWrapper(css::uno::Reference< css::container::XNameAccess >  xAccess,
             const String& rLinkDisplayName, String sSuffix);
     SwXLinkNameAccessWrapper(SwXTextDocument& rxDoc,
             const String& rLinkDisplayName, String sSuffix);
     ~SwXLinkNameAccessWrapper();
 
     //XNameAccess
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name)  throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Any SAL_CALL getByName(const rtl::OUString& Name)  throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException );
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( css::uno::RuntimeException );
 
     //XElementAccess
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException);
 
     //XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
 
     //XLinkTargetSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getLinks(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getLinks(void) throw( css::uno::RuntimeException );
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual rtl::OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException );
+    virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException );
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException );
 
 };
 /* -----------------26.10.99 15:46-------------------
@@ -524,8 +543,8 @@ public:
  --------------------------------------------------*/
 class SwXOutlineTarget : public cppu::WeakImplHelper2
 <
-    ::com::sun::star::beans::XPropertySet,
-    ::com::sun::star::lang::XServiceInfo
+    css::beans::XPropertySet,
+    css::lang::XServiceInfo
 >
 {
     const SfxItemPropertySet*   pPropSet;
@@ -536,37 +555,61 @@ public:
     ~SwXOutlineTarget();
 
     //XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual rtl::OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException );
+    virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException );
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException );
 };
 #endif
 
 class SwXDocumentPropertyHelper : public SvxUnoForbiddenCharsTable
 {
-    com::sun::star::uno::Reference < com::sun::star::uno::XInterface > xDashTable;
-    com::sun::star::uno::Reference < com::sun::star::uno::XInterface > xGradientTable;
-    com::sun::star::uno::Reference < com::sun::star::uno::XInterface > xHatchTable;
-    com::sun::star::uno::Reference < com::sun::star::uno::XInterface > xBitmapTable;
-    com::sun::star::uno::Reference < com::sun::star::uno::XInterface > xTransGradientTable;
-    com::sun::star::uno::Reference < com::sun::star::uno::XInterface > xMarkerTable;
-    com::sun::star::uno::Reference < com::sun::star::uno::XInterface > xDrawDefaults;
+    css::uno::Reference < css::uno::XInterface > xDashTable;
+    css::uno::Reference < css::uno::XInterface > xGradientTable;
+    css::uno::Reference < css::uno::XInterface > xHatchTable;
+    css::uno::Reference < css::uno::XInterface > xBitmapTable;
+    css::uno::Reference < css::uno::XInterface > xTransGradientTable;
+    css::uno::Reference < css::uno::XInterface > xMarkerTable;
+    css::uno::Reference < css::uno::XInterface > xDrawDefaults;
 
     SwDoc*  m_pDoc;
 public:
     SwXDocumentPropertyHelper(SwDoc& rDoc);
     ~SwXDocumentPropertyHelper();
-    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetDrawTable(short nWhich);
+    css::uno::Reference<css::uno::XInterface> GetDrawTable(short nWhich);
     void Invalidate();
 
     virtual void onChange();
 };
+
+
+/*-- 06.01.2004 15:08:34---------------------------------------------------
+    The class SwViewOptionAdjust_Impl is used to adjust the SwViewOption of
+    the current ViewShell so that fields are not printed as commands and
+    hidden characters are always invisible. Hidden text and place holders
+    should be printed according to the current print options.
+    After printing the view options are restored
+  -----------------------------------------------------------------------*/
+class SwViewOptionAdjust_Impl
+{
+    SwWrtShell &    m_rShell;
+    SwViewOption    m_aOldViewOptions;
+//    SwViewOption    m_aRenderViewOptions;   // view options to use when rendering for PDF export or printing
+//    bool            m_bRestoreViewOptions;
+
+public:
+    SwViewOptionAdjust_Impl( SwWrtShell& rSh, const SwViewOption &rViewOptions );
+    ~SwViewOptionAdjust_Impl();
+
+    void AdjustViewOptions( const SwPrtOptions *pPrtOptions );
+};
+
+
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index b3feded02ea1..5631ba3cdd2e 100644..100755
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -82,8 +82,7 @@ namespace svtools{ class ColorConfig;}
 #define VIEWOPT_CORE2_SMOOTHSCROLL      0x00000004L
 #define VIEWOPT_CORE2_CRSR_IN_PROT      0x00000008L
 #define VIEWOPT_CORE2_PDF_EXPORT        0x00000010L
-
-
+#define VIEWOPT_CORE2_PRINTING          0x00000020L
 #define VIEWOPT_CORE2_BIGMARKHDL        0x00000040L
 
 #define VIEWOPT_2_UNUSED1           0x00000100L
@@ -381,6 +380,12 @@ public:
     inline void SetPDFExport(BOOL b)
         { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_PDF_EXPORT) : (nCore2Options &= ~VIEWOPT_CORE2_PDF_EXPORT);}
 
+    inline BOOL IsPrinting() const
+        {return nCore2Options & VIEWOPT_CORE2_PRINTING ? TRUE : FALSE;}
+
+    inline void SetPrinting(BOOL b)
+        { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_PRINTING) : (nCore2Options &= ~VIEWOPT_CORE2_PRINTING);}
+
 /*---------------------------------------------------------------------------
 
 ----------------------------------------------------------------------------*/
@@ -450,7 +455,8 @@ public:
     SwViewOption& operator=( const SwViewOption &rOpt );
     // Vergleichsmethoden
     BOOL IsEqualFlags ( const SwViewOption &rOpt ) const;
-    inline BOOL operator==( const SwViewOption &rOpt ) const;
+    inline BOOL operator == ( const SwViewOption &rOpt ) const;
+    inline BOOL operator != ( const SwViewOption &rOpt ) const  { return !(*this == rOpt); }
 
 
 /*---------------------------------------------------------------------------
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index f12b3ecbe9bc..8de10dfce94d 100644..100755
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -39,6 +39,7 @@
 #include <swrect.hxx>
 #include <errhdl.hxx>
 #include <vcl/mapmod.hxx>
+#include <vcl/print.hxx>
 
 namespace com { namespace sun { namespace star { namespace accessibility {
            class XAccessible; } } } }
@@ -70,6 +71,7 @@ class SfxViewShell;
 class SwViewOption;
 class SwViewImp;
 class SwPrtOptions;
+class SwPrintData;
 class SwPagePreViewPrtData;
 class Window;
 class OutputDevice;
@@ -92,12 +94,19 @@ class SwPostItMgr;
 // #i74769#
 class SdrPaintWindow;
 
+namespace vcl
+{
+    class OldStylePrintAdaptor;
+}
+
+
 //JP 19.07.98: - Bug 52312
 // define fuer Flags, die im CTOR oder den darunter liegenden Schichten
 // benoetigt werden.
 // Zur Zeit wird fuer die DrawPage das PreView Flag benoetigt
 #define VSHELLFLAG_ISPREVIEW            ((long)0x1)
 
+
 class SW_DLLPUBLIC ViewShell : public Ring
 {
     friend void SetOutDev( ViewShell *pSh, OutputDevice *pOut );
@@ -186,7 +195,7 @@ class SW_DLLPUBLIC ViewShell : public Ring
     SW_DLLPRIVATE void Scroll();    //Scrollen wenn sich aus der LayAction Scrollmoeglichkeiten
                     //ergaben.
 
-    SW_DLLPRIVATE void PrepareForPrint( const SwPrtOptions &rOptions );
+    SW_DLLPRIVATE void PrepareForPrint( const SwPrintData &rOptions );
 
     SW_DLLPRIVATE void ImplApplyViewOptions( const SwViewOption &rOpt );
 
@@ -209,8 +218,7 @@ public:
     const SwNodes& GetNodes() const;
 
     //Nach Druckerwechsel, vom Doc
-    //pPDFOut != NULL is used for PDF export.
-    void            InitPrt( SfxPrinter * , OutputDevice *pPDFOut = NULL );
+    void            InitPrt( OutputDevice *pOutDev );
 
     //Klammerung von zusammengehoerenden Aktionen.
     inline void StartAction();
@@ -361,22 +369,25 @@ public:
     void   ChgAllPageOrientation( sal_uInt16 eOri );
     void   ChgAllPageSize( Size &rSz );
 
-    //Druckauftrag abwickeln.
-    // pPDFOut != Null is: do PDF Export (no printing!)
-    sal_Bool Prt( SwPrtOptions& rOptions, SfxProgress* pProgress,
-                  OutputDevice* pPDFOut = NULL );
+    // printing of one page.
+    // bIsPDFExport == true is: do PDF Export (no printing!)
+    sal_Bool PrintOrPDFExport( OutputDevice *pOutDev, const SwPrtOptions &rPrintData,
+            sal_Int32 nRenderer /* offset in vector of pages to print */ );
+
+    // printing of one brochure page
+    void PrintProspect( OutputDevice *pOutDev, const SwPrintData &rPrintData,
+            sal_Int32 nRenderer /* offset in vector of page pairs for prospect printing */ );
 
-    //"Drucken" fuer OLE 2.0
-    static void PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, SwPrtOptions& rOptions,
+    // printing for OLE 2.0
+    static void PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintData& rOptions,
                          OutputDevice* pOleOut, const Rectangle& rRect );
 
     // creates temporary doc with selected text for PDF export
-    SwDoc * CreatePrtDoc( SfxPrinter* pPrt, SfxObjectShellRef& );
+    SwDoc * CreatePrtDoc( SfxObjectShellRef& );
     SwDoc * FillPrtDoc( SwDoc* pPrtDoc, const SfxPrinter* pPrt );
 
     //Wird intern fuer die Shell gerufen die Druckt. Formatiert die Seiten.
-    void CalcPagesForPrint( sal_uInt16 nMax, SfxProgress* pProgress = 0,
-        const String* pStr = NULL, ULONG nMergeAct = 0, ULONG nMergeCnt = 0 );
+    void CalcPagesForPrint( sal_uInt16 nMax );
 
     //All about fields.
     void UpdateFlds(sal_Bool bCloseDB = sal_False);
@@ -475,14 +486,6 @@ public:
     */
     void AdjustOptionsForPagePreview( const SwPrtOptions &_rPrintOptions );
 
-    // print page/print preview
-    void PrintPreViewPage( SwPrtOptions& rOptions, sal_uInt16 nRowCol,
-                           SfxProgress& rProgress,
-                           const SwPagePreViewPrtData* = 0 );
-
-    // Prospekt-Format drucken
-    void PrintProspect( SwPrtOptions&, SfxProgress& , BOOL bRTL);
-
     sal_Bool IsViewLocked() const { return bViewLocked; }
     void LockView( sal_Bool b )   { bViewLocked = b;    }