1 files changed, 28 insertions, 16 deletions

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index de82d9056ff9..ff3d91add396 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: doc.hxx,v $
- * $Revision: 1.157 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,7 +57,7 @@ class SwList;
 // <--
 #include <IDocumentExternalData.hxx>
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <vcl/timer.hxx>
@@ -77,8 +74,8 @@ class SwList;
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 #include <vos/ref.hxx>
 #include <svx/svdtypes.hxx>
-#include <svtools/style.hxx>
-#include <svx/numitem.hxx>
+#include <svl/style.hxx>
+#include <editeng/numitem.hxx>
 #include "comphelper/implementationreference.hxx"
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
@@ -88,6 +85,8 @@ class SwList;
 
 #include <svtools/embedhlp.hxx>
 #include <vector>
+#include <set>
+#include <map>
 #include <memory>
 
 #include <boost/scoped_ptr.hpp>
@@ -114,7 +113,6 @@ class SvNumberFormatter;
 class SvStringsSort;
 class SvUShorts;
 class SvUShortsSort;
-class SvxLinkManager;
 class SvxMacro;
 class SvxMacroTableDtor;
 class SvxBorderLine;
@@ -199,7 +197,6 @@ class SwLayouter;
 class SdrView;
 class SdrMarkList;
 class SwAuthEntry;
-class SwUnoCallBack;
 class SwLayoutCache;
 class IStyleAccess;
 struct SwCallMouseEvent;
@@ -207,7 +204,8 @@ struct SwDocStat;
 struct SwHash;
 struct SwSortOptions;
 struct SwDefTOXBase_Impl;
-struct SwPrintData;
+class SwPrintData;
+class SwPrintUIOptions;
 class SdrPageView;
 struct SwConversionArgs;
 class SwRewriter;
@@ -215,6 +213,10 @@ class SwMsgPoolItem;
 class SwChartDataProvider;
 class SwChartLockController_Helper;
 class IGrammarContact;
+class SwPrintData;
+class SwRenderData;
+class SwPageFrm;
+class SwViewOption;
 
 namespace sw { namespace mark {
     class MarkManager;
@@ -238,6 +240,7 @@ namespace container {
 namespace sfx2 {
     class SvLinkSource;
     class IXmlIdRegistry;
+    class LinkManager;
 }
 
 //PageDescriptor-Schnittstelle, Array hier wegen inlines.
@@ -354,7 +357,7 @@ class SW_DLLPUBLIC SwDoc :
     SfxObjectShellRef* pDocShRef;     // fuers Kopieren von OLE-Nodes (wenn keine
                                         // DocShell gesetzt ist, muss dieser
                                         // Ref-Pointer gesetzt sein!!!!)
-    SvxLinkManager  *pLinkMgr;          // Liste von Verknuepften (Grafiken/DDE/OLE)
+    sfx2::LinkManager   *pLinkMgr;          // Liste von Verknuepften (Grafiken/DDE/OLE)
 
     SwAutoCorrExceptWord *pACEWord;     // fuer die automatische Uebernahme von
                                         // autokorrigierten Woertern, die "zurueck"
@@ -391,7 +394,7 @@ class SW_DLLPUBLIC SwDoc :
     SwLayoutCache   *pLayoutCache;  // Layout cache to read and save with the
                                     // document for a faster formatting
 
-    SwUnoCallBack   *pUnoCallBack;
+    SwModify *pUnoCallBack;
     IGrammarContact *mpGrammarContact;   // for grammar checking in paragraphs during editing
 
     mutable  comphelper::ImplementationReference< SwChartDataProvider
@@ -492,7 +495,7 @@ private:
     bool mbColumnSelection       : 1;    // true: this content has bee created by a column selection
                                          //       (clipboard docs only)
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bool mbXMLExport : 1;                // TRUE: during XML export
 #endif
 
@@ -837,8 +840,8 @@ public:
     */
     virtual bool IsVisibleLinks() const;
     virtual void SetVisibleLinks(bool bFlag);
-    virtual SvxLinkManager& GetLinkManager();
-    virtual const SvxLinkManager& GetLinkManager() const;
+    virtual sfx2::LinkManager& GetLinkManager();
+    virtual const sfx2::LinkManager& GetLinkManager() const;
     virtual void UpdateLinks(BOOL bUI);
     virtual bool GetData(const String& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const;
     virtual bool SetData(const String& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue);
@@ -1066,7 +1069,7 @@ public:
     inline void SetOLEPrtNotifyPending( bool bSet = true );
     void PrtOLENotify( sal_Bool bAll ); //Alle oder nur Markierte
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bool InXMLExport() const            { return mbXMLExport; }
     void SetXMLExport( bool bFlag )     { mbXMLExport = bFlag; }
 #endif
@@ -1361,6 +1364,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;