Commits

Anonymous committed 541dc7b

swbookmarkfixes01: removing superfluous includes in sw/inc/doc.hxx

  • Participants
  • Parent commits 5a07b2e

Comments (0)

Files changed (46)

File sw/inc/IDocumentPageDescAccess.hxx

 #ifndef IDOCUMENTPAGEDESCACCESS_HXX_INCLUDED
 #define IDOCUMENTPAGEDESCACCESS_HXX_INCLUDED
 
-#include <tools/solar.h>
 #include <sal/types.h>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 class SwFrmFmt;
 class String;
 class SfxListener;
+namespace rtl
+{
+    class OUString;
+}
 
 namespace sw { namespace pagedesc
 {
         public:
             typedef sal_Int32 difference_type;
             typedef SwPageDesc* element_type;
+            typedef ::rtl::OUString index_type;
             typedef ::boost::function<void (element_type)> foreach_functor_type;
             typedef void (*foreach_funcptr_type)(element_type);
             // Getters
             virtual difference_type GetPageDescCnt() const =0;
             virtual SwPageDesc* GetDefaultPageDesc() =0;
             virtual const SwPageDesc* GetDefaultPageDesc() const =0;
-            virtual SwPageDesc* GetPageDescByName(const String& rName) =0;
-            virtual const SwPageDesc* GetPageDescByName(const String& rName) const =0;
-            virtual SwPageDesc* GetPageDescByPoolFmtId(USHORT nId) =0;
-            virtual const SwPageDesc* GetPageDescByPoolFmtId(USHORT nId) const =0;
+            virtual SwPageDesc* GetPageDescByName(const index_type& rName) =0;
+            virtual const SwPageDesc* GetPageDescByName(const index_type& rName) const =0;
+            virtual SwPageDesc* GetPageDescByPoolFmtId(sal_uInt16 nId) =0;
+            virtual const SwPageDesc* GetPageDescByPoolFmtId(sal_uInt16 nId) const =0;
 
             // Creators
-            virtual SwPageDesc* MakePageDesc(const String &rName, const SwPageDesc* pCpy=NULL, bool bRegardLanguage=true, bool bBroadcast=false) =0;
+            virtual SwPageDesc* MakePageDesc(const index_type &rName, const SwPageDesc* pCpy=NULL, bool bRegardLanguage=true, bool bBroadcast=false) =0;
 
             // Deleters
-            virtual void DelPageDesc(const String& rName, bool bBroadcast=false) =0;
+            virtual void DelPageDesc(const index_type& rName, bool bBroadcast=false) =0;
             virtual void DelAllPageDescs(bool bBroadcast=false) =0;
 
             // Checks and Fixes

File sw/inc/doc.hxx

 
 /** SwDoc interfaces */
 
-#include <IInterface.hxx>
-#include <IDocumentSettingAccess.hxx>
-#include <IDocumentDeviceAccess.hxx>
-#include <IDocumentMarkAccess.hxx>
-#include <IDocumentRedlineAccess.hxx>
-#include <IDocumentUndoRedo.hxx>
-#include <IDocumentLinksAdministration.hxx>
-#include <IDocumentFieldsAccess.hxx>
-#include <IDocumentContentOperations.hxx>
-#include <IDocumentStylePoolAccess.hxx>
-#include <IDocumentLineNumberAccess.hxx>
-#include <IDocumentStatistics.hxx>
-#include <IDocumentState.hxx>
-#include <IDocumentDrawModelAccess.hxx>
-#include <IDocumentLayoutAccess.hxx>
-#include <IDocumentTimerAccess.hxx>
-#include <IDocumentChartDataProviderAccess.hxx>
-#include <IDocumentPageDescAccess.hxx>
-// --> OD 2007-10-26 #i83479#
-#include <IDocumentOutlineNodes.hxx>
-#include <IDocumentListItems.hxx>
-#include <set>
-// <--
-// --> OD 2008-03-12 #refactorlists#
-#include <IDocumentListsAccess.hxx>
-class SwList;
-// <--
-#include <IDocumentFormatAccess.hxx>
-#include <IDocumentExternalData.hxx>
 #define _SVSTDARR_STRINGSDTOR
-#include <svl/svstdarr.hxx>
+#include <boost/scoped_ptr.hpp>
+#include <chcmprse.hxx>
+#include <comphelper/implementationreference.hxx>
+#include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
-#include <vcl/timer.hxx>
-#include "swdllapi.h"
-#include <swtypes.hxx>
-#include <ndarr.hxx>
-#include <swatrset.hxx>
-#include <toxe.hxx>   	  		// enums
+#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
+#include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
+#include <com/sun/star/linguistic2/XSpellChecker1.hpp>
+#include <editeng/numitem.hxx>
 #include <flyenum.hxx>
+#include <hash_map>
+#include <IDocumentChartDataProviderAccess.hxx>
+#include <IDocumentContentOperations.hxx>
+#include <IDocumentDeviceAccess.hxx>
+#include <IDocumentDrawModelAccess.hxx>
+#include <IDocumentExternalData.hxx>
+#include <IDocumentFieldsAccess.hxx>
+#include <IDocumentFormatAccess.hxx>
+#include <IDocumentLayoutAccess.hxx>
+#include <IDocumentLineNumberAccess.hxx>
+#include <IDocumentLinksAdministration.hxx>
+#include <IDocumentListItems.hxx>
+#include <IDocumentListsAccess.hxx>
+#include <IDocumentOutlineNodes.hxx>
+#include <IDocumentRedlineAccess.hxx>
+#include <IDocumentSettingAccess.hxx>
+#include <IDocumentState.hxx>
+#include <IDocumentStatistics.hxx>
+#include <IDocumentStylePoolAccess.hxx>
+#include <IDocumentTimerAccess.hxx>
+#include <IDocumentUndoRedo.hxx>
+#include <IInterface.hxx>
 #include <itabenum.hxx>
-#include <swdbdata.hxx>
-#include <chcmprse.hxx>
-#include <com/sun/star/linguistic2/XSpellChecker1.hpp>
-#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
-#include <vos/ref.hxx>
-#include <svx/svdtypes.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>
-
-#include <hash_map>
-#include <stringhash.hxx>
-
-#include <svtools/embedhlp.hxx>
-#include <vector>
-#include <set>
 #include <map>
 #include <memory>
+#include <ndarr.hxx>
+#include <set>
+#include <stringhash.hxx>
+#include <svl/style.hxx>
+#include <svl/svstdarr.hxx>
+#include <svtools/embedhlp.hxx>
+#include <svx/svdtypes.hxx>
+#include <swatrset.hxx>
+#include <swdbdata.hxx>
+#include <swdllapi.h>
+#include <swtypes.hxx>
+#include <toxe.hxx> 
+#include <vcl/timer.hxx>
+#include <vector>
+#include <vos/ref.hxx>
 
-#include <boost/scoped_ptr.hpp>
-
-class SfxObjectShell;
-class SfxObjectShellRef;
-class SvxForbiddenCharactersTable;
-class SwExtTextInput;
+class Color;
 class DateTime;
 class EditFieldInfo;
+class GraphicObject;
+class IDocumentMarkAccess;
+class IGrammarContact;
+class IStyleAccess;
 class JobSetup;
-class Color;
 class KeyCode;
 class Outliner;
 class OutputDevice;
 class Point;
 class SbxArray;
+class SdrMarkList;
 class SdrModel;
 class SdrObject;
+class SdrPageView;
 class SdrUndoAction;
-class VirtualDevice;
+class SdrView;
+class _SetGetExpFld;
+class SfxBroadcaster;
+class SfxObjectShell;
+class SfxObjectShellRef;
 class SfxPrinter;
 class SvNumberFormatter;
 class SvStringsSort;
 class SvUShorts;
 class SvUShortsSort;
+class SvxBorderLine;
+class SvxForbiddenCharactersTable;
 class SvxMacro;
 class SvxMacroTableDtor;
-class SvxBorderLine;
+class SwAuthEntry;
 class SwAutoCompleteWord;
 class SwAutoCorrExceptWord;
 class SwCalc;
 class SwCellFrm;
 class SwCharFmt;
 class SwCharFmts;
+class SwChartDataProvider;
+class SwChartLockController_Helper;
 class SwConditionTxtFmtColl;
 class SwCrsrShell;
 class SwCursor;
 class SwDBNameInfField;
 class SwDocShell;
 class SwDocUpdtFld;
+class SwDrawContact;
 class SwDrawFrmFmt;
 class SwDrawView;
 class SwEditShell;
+class SwEndNoteInfo;
+class SwExtTextInput;
+class SwField;
 class SwFieldType;
-class SwField;
-class SwTxtFld;
 class SwFldTypes;
 class SwFlyFrmFmt;
 class SwFmt;
 class SwFrmFmts;
 class SwFtnIdxs;
 class SwFtnInfo;
-class SwEndNoteInfo;
-class GraphicObject;
 class SwGrfFmtColl;
 class SwGrfFmtColls;
+class SwLayoutCache;
+class SwLayouter;
 class SwLineNumberInfo;
+class SwList;
+class SwMsgPoolItem;
 class SwNewDBMgr;
-class SwNoTxtNode;
 class SwNodeIndex;
 class SwNodeRange;
+class SwNoTxtNode;
 class SwNumRule;
 class SwNumRuleTbl;
 class SwPageDesc;
+class SwPageFrm;
+class SwPagePreViewPrtData;
 class SwPosFlyFrms;
-class SwPagePreViewPrtData;
+class SwPrintData;
+class SwPrintData;
+class SwPrintUIOptions;
 class SwRedline;
 class SwRedlineTbl;
+class SwRenderData;
+class SwRewriter;
 class SwRootFrm;
 class SwRubyList;
 class SwRubyListEntry;
+class SwSection;
 class SwSectionFmt;
+class SwSectionData;
 class SwSectionFmts;
-class SwSectionData;
 class SwSelBoxes;
 class SwSpzFrmFmts;
-class SwTOXBase;
-class SwTOXBaseSection;
-class SwTOXMark;
-class SwTOXMarks;
-class SwTOXType;
-class SwTOXTypes;
 class SwTabCols;
 class SwTable;
 class SwTableAutoFmt;
 class SwTableLineFmt;
 class SwTableNode;
 class SwTextBlocks;
+class SwTOXBase;
+class SwTOXBaseSection;
+class SwTOXMark;
+class SwTOXMarks;
+class SwTOXType;
+class SwTOXTypes;
+class SwTxtFld;
 class SwTxtFmtColl;
 class SwTxtFmtColls;
-class SwURLStateChanged;
 class SwUndo;
 class SwUndoIds;
 class SwUndoIter;
 class SwUndos;
 class SwUnoCrsr;
 class SwUnoCrsrTbl;
+class SwURLStateChanged;
+class SwViewOption;
 class ViewShell;
-class _SetGetExpFld;
-class SwDrawContact;
-class SwLayouter;
-class SdrView;
-class SdrMarkList;
-class SwAuthEntry;
-class SwLayoutCache;
-class IStyleAccess;
+class VirtualDevice;
 struct SwCallMouseEvent;
+struct SwConversionArgs;
+struct SwDefTOXBase_Impl;
 struct SwDocStat;
 struct SwHash;
 struct SwSortOptions;
-struct SwDefTOXBase_Impl;
-class SwPrintData;
-class SwPrintUIOptions;
-class SdrPageView;
-struct SwConversionArgs;
-class SwRewriter;
-class SwMsgPoolItem;
-class SwChartDataProvider;
-class SwChartLockController_Helper;
-class IGrammarContact;
-class SwPrintData;
-class SwRenderData;
-class SwPageFrm;
-class SwViewOption;
-class SfxBroadcaster;
 
 namespace sw {
     namespace mark {
+        class IMark;
         class MarkManager;
     }
     namespace pagedesc {
+        class IDocumentPageDescAccess;
         class PageDescManager;
     }
     class MetaFieldManager;

File sw/inc/rolbck.hxx

     class MetadatableUndo;
 }
 
+namespace sw
+{
+    namespace mark
+    {
+        class IMark;
+    }
+}
+
 class SwDoc;
 class SwFmt;
 class SwFmtColl;

File sw/source/core/attr/swatrset.cxx

 #include <node.hxx>
 #include <paratr.hxx>		// fuer SetModifyAtAttr
 #include <cellatr.hxx>		// fuer SetModifyAtAttr
-#ifndef _CMDID_H
 #include <cmdid.h>
-#endif
 #include <istyleaccess.hxx>
 #include <numrule.hxx>
-// --> OD 2008-03-19 #refactorlists#
 #include <list.hxx>
-// <--
+#include <IDocumentPageDescAccess.hxx>
 
 
 SwAttrPool::SwAttrPool( SwDoc* pD )

File sw/source/core/crsr/pam.cxx

 #include <swtable.hxx>
 #include <crsskip.hxx>
 
-// --> FME 2004-06-29 #114856# Formular view
 #include <flyfrm.hxx>
 #include <fmteiro.hxx>
 #include <section.hxx>
 #include <sectfrm.hxx>
-// <--
-#include <ndtxt.hxx> // #111827#
+#include <ndtxt.hxx> 
 
 #include <IMark.hxx>
 #include <hints.hxx>
+#include <IDocumentMarkAccess.hxx>
 
 // fuer den dummen ?MSC-? Compiler
 inline xub_StrLen GetSttOrEnd( BOOL bCondition, const SwCntntNode& rNd )

File sw/source/core/doc/PageDescManager.cxx

     { ForEach(lcl_DefaultPageFmtChecker()); }
 
 
-SwPageDesc* PageDescManager::GetPageDescByName(const String& rName)
+SwPageDesc* PageDescManager::GetPageDescByName(const PageDescManager::index_type& rName)
 {
     const container_t::iterator pPageDesc = FindByName(rName);
     if(pPageDesc == m_vPageDescs.end())
     return pPageDesc->get();
 }
 
-SwPageDesc* PageDescManager::GetPageDescByPoolFmtId(USHORT nId)
+SwPageDesc* PageDescManager::GetPageDescByPoolFmtId(sal_uInt16 nId)
 {
     const container_t::iterator pPageDesc = FindByPoolFmtId(nId);
     if(pPageDesc == m_vPageDescs.end())
     return pPageDesc->get();
 }
 
-SwPageDesc* PageDescManager::MakePageDesc(const String &rName, const SwPageDesc *pCpy, bool bRegardLanguage, bool bBroadcast)
+SwPageDesc* PageDescManager::MakePageDesc(const PageDescManager::index_type &rName, const SwPageDesc *pCpy, bool bRegardLanguage, bool bBroadcast)
 {
     shared_ptr<SwPageDesc> pNew;
     if(pCpy)
     {
         pNew = shared_ptr<SwPageDesc>(new SwPageDesc(*pCpy));
         pNew->SetName(rName);
-        if(rName != pCpy->GetName())
+        if(rName != index_type(pCpy->GetName()))
         {
             pNew->SetPoolFmtId(USHRT_MAX);
             pNew->SetPoolHelpId(USHRT_MAX);
     m_pUndoRedo->SetModified();
 }
 
-void PageDescManager::DelPageDesc(const String& rName, bool bBroadcast) // #116530#
+void PageDescManager::DelPageDesc(const PageDescManager::index_type& rName, bool bBroadcast) // #116530#
 {
     const container_t::iterator pPos = FindByName(rName);
     if(pPos != m_vPageDescs.end())
 {
     struct lcl_PageDescNameComparer
     {
-        lcl_PageDescNameComparer(const String& rName) : m_sName(rName) { };
-        String m_sName;
+        lcl_PageDescNameComparer(const PageDescManager::index_type& rName) : m_sName(rName) { };
+        PageDescManager::index_type m_sName;
         bool operator()(shared_ptr<SwPageDesc> pPageDesc)
-            { return pPageDesc->GetName() == m_sName; };
+            { return PageDescManager::index_type(pPageDesc->GetName()) == m_sName; };
     };
     struct lcl_PageDescPoolFmtIdComparer
     {
-        lcl_PageDescPoolFmtIdComparer(USHORT nId) : m_nId(nId) { };
-        USHORT m_nId;
+        lcl_PageDescPoolFmtIdComparer(sal_uInt16 nId) : m_nId(nId) { };
+        sal_uInt16 m_nId;
         bool operator()(shared_ptr<SwPageDesc> pPageDesc)
             { return pPageDesc->GetPoolFmtId() == m_nId; };
     };
 }
 
-PageDescManager::container_t::iterator PageDescManager::FindByName(const String& rName)
+PageDescManager::container_t::iterator PageDescManager::FindByName(const PageDescManager::index_type& rName)
 {
     return ::std::find_if(m_vPageDescs.begin(), m_vPageDescs.end(), lcl_PageDescNameComparer(rName));
 }
 
-PageDescManager::container_t::iterator PageDescManager::FindByPoolFmtId(USHORT nId)
+PageDescManager::container_t::iterator PageDescManager::FindByPoolFmtId(sal_uInt16 nId)
 {
     return ::std::find_if(m_vPageDescs.begin(), m_vPageDescs.end(), lcl_PageDescPoolFmtIdComparer(nId));
 }

File sw/source/core/doc/PageDescManager.hxx

     , public ::sw::pagedesc::IDocumentPageDescAccess
     {
     public:
+        typedef ::sw::pagedesc::IDocumentPageDescAccess::index_type index_type;
         static PageDescManager* Create(IDocumentUndoRedo* io_pUndoRedo, ::sw::format::IDocumentFormatAccess* io_pFormatAccess, SwAttrPool* io_pPool, SfxBroadcaster* io_pStyleOperationBroadcaster, SfxBroadcaster* io_pModelEventBroadcaster)
             { return new PageDescManager(io_pUndoRedo, io_pFormatAccess, io_pPool, io_pStyleOperationBroadcaster, io_pModelEventBroadcaster); };
         virtual difference_type GetPageDescCnt() const
         }
         virtual const SwPageDesc* GetDefaultPageDesc() const
             { return const_cast<PageDescManager*>(this)->GetDefaultPageDesc(); }
-        virtual SwPageDesc* GetPageDescByName(const String& rName);
-        virtual const SwPageDesc* GetPageDescByName(const String& rName) const
+        virtual SwPageDesc* GetPageDescByName(const index_type& rName);
+        virtual const SwPageDesc* GetPageDescByName(const index_type& rName) const
             { return const_cast<PageDescManager*>(this)->GetPageDescByName(rName); }
-        virtual SwPageDesc* GetPageDescByPoolFmtId(USHORT nId);
-        virtual const SwPageDesc* GetPageDescByPoolFmtId(USHORT nId) const
+        virtual SwPageDesc* GetPageDescByPoolFmtId(sal_uInt16 nId);
+        virtual const SwPageDesc* GetPageDescByPoolFmtId(sal_uInt16 nId) const
             { return const_cast<PageDescManager*>(this)->GetPageDescByPoolFmtId(nId); }
-        virtual SwPageDesc* MakePageDesc(const String &rName, const SwPageDesc* pCpy=NULL, bool bRegardLanguage=true, bool bBroadcast=false);
-        virtual void DelPageDesc(const String& rName, bool bBroadcast=false);
+        virtual SwPageDesc* MakePageDesc(const index_type &rName, const SwPageDesc* pCpy=NULL, bool bRegardLanguage=true, bool bBroadcast=false);
+        virtual void DelPageDesc(const index_type& rName, bool bBroadcast=false);
         virtual void DelAllPageDescs(bool bBroadcast);
         virtual void CheckDefaultPageFmt();
         // dispose removes all pagedescs including the default pagedesc
 
         void CopyPageDescHeaderFooter(bool bCpyHeader, const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt);
         void DelPageDesc(container_t::iterator ppPageDesc, bool bBroadcast=false);
-        container_t::iterator FindByName(const String& rName);
-        container_t::iterator FindByPoolFmtId(USHORT nId);
+        container_t::iterator FindByName(const index_type& rName);
+        container_t::iterator FindByPoolFmtId(sal_uInt16 nId);
         virtual void ForEach_Impl(IDocumentPageDescAccess::foreach_functor_type f);
     };
 }}

File sw/source/core/doc/docdde.cxx

 #include <ndtxt.hxx>
 #include <pam.hxx>
 #include <docary.hxx>
+#include <IDocumentMarkAccess.hxx>
 
 using namespace ::com::sun::star;
 

File sw/source/core/doc/docdesc.cxx

 #include <tgrditem.hxx>
 #include <algorithm>
 #include <PageDescManager.hxx>
+#include <IDocumentPageDescAccess.hxx>
 
 using namespace ::com::sun::star;
 using ::boost::shared_ptr;

File sw/source/core/doc/docfmt.cxx

 #include <SwUndoFmt.hxx>
 #include <docsh.hxx>
 #include <StyleOperationHint.hxx>
+#include <IDocumentPageDescAccess.hxx>
 
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::lang;

File sw/source/core/doc/doctxm.cxx

 #include <breakit.hxx>
 #include <editsh.hxx>
 #include <scriptinfo.hxx>
+#include <IDocumentPageDescAccess.hxx>
 
 using namespace ::com::sun::star;
 

File sw/source/core/doc/poolfmt.cxx

 #endif
 #include <GetMetricVal.hxx>
 #include <numrule.hxx>
+#include <IDocumentPageDescAccess.hxx>
 
 
 using namespace ::com::sun::star;

File sw/source/core/docnode/node.cxx

 #include <crsskip.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <scriptinfo.hxx>
-// --> OD 2005-12-05 #i27138#
 #include <rootfrm.hxx>
-// <--
 #include <istyleaccess.hxx>
-// --> OD 2007-10-31 #i83479#
 #include <IDocumentListItems.hxx>
-// <--
+#include <IDocumentPageDescAccess.hxx>
 
 using namespace ::com::sun::star::i18n;
 

File sw/source/core/fields/reffld.cxx

 #endif
 #include <numrule.hxx>
 #include <SwNodeNum.hxx>
+#include <IDocumentMarkAccess.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::text;

File sw/source/core/layout/newfrm.cxx

 #include <PageDescDisposingHint.hxx>
 #include <pagedesc.hxx>
 #include <pagefrm.hxx>
+#include <IDocumentPageDescAccess.hxx>
 
 namespace sw { namespace layout {
 

File sw/source/core/layout/pagedesc.cxx

 #include <poolfmt.hxx>
 #include <rootfrm.hxx>
 #include <swtable.hxx>
-
+#include <IDocumentPageDescAccess.hxx>
 
 SwPageDesc::SwPageDesc( const String& rName, SwFrmFmt* pFmt, SwAttrPool* pPool) :
 	SwModify( 0 ),

File sw/source/core/layout/tabfrm.cxx

 #include "rowfrm.hxx"
 #include "cellfrm.hxx"
 #include "flyfrms.hxx"
-#include "txtfrm.hxx"		//HasFtn()
+#include "txtfrm.hxx"		
 #include "htmltbl.hxx"
-#include "sectfrm.hxx"	//SwSectionFrm
-// OD 30.09.2003 #i18732#
+#include "sectfrm.hxx"	
 #include <fmtfollowtextflow.hxx>
-// --> OD 2004-06-28 #i28701#
 #include <sortedobjs.hxx>
 #include <objectformatter.hxx>
-// <--
-// --> OD 2004-10-05 #i26945#
 #include <layouter.hxx>
-// <--
+#include <IDocumentPageDescAccess.hxx>
 
 extern void AppendObjs( const SwSpzFrmFmts *pTbl, ULONG nIndex,
 						SwFrm *pFrm, SwPageFrm *pPage );

File sw/source/core/layout/trvlfrm.cxx

 #include <crstate.hxx>
 #include <frmtool.hxx>
 #include <ndtxt.hxx>
-// OD 2004-05-24 #i28701#
 #include <sortedobjs.hxx>
-
-// FLT_MAX
 #include <cfloat>
 #include <swselectionlist.hxx>
+#include <IDocumentPageDescAccess.hxx>
 
 //Fuer SwFlyFrm::GetCrsrOfst
 class SwCrsrOszControl

File sw/source/core/text/inftxt.cxx

 #include <pam.hxx>
 #include <SwGrammarMarkUp.hxx>
 #include <cstdio>
-// --> FME 2004-06-08 #i12836# enhanced pdf export
 #include <EnhancedPDFExportHelper.hxx>
-// <--
+#include <IMark.hxx>
+#include <IDocumentMarkAccess.hxx>
 
 #include <unomid.h>
 

File sw/source/core/text/portxt.cxx

 #include <viewopt.hxx>  // SwViewOptions
 
 #include <IMark.hxx>
+#include <IDocumentMarkAccess.hxx>
 #include <pam.hxx>
 #include <doc.hxx>
 #include <xmloff/odffields.hxx>

File sw/source/core/tox/txmsrt.cxx

 #include <comcore.hrc>
 #endif
 #include <numrule.hxx>
+#include <IDocumentMarkAccess.hxx>
 
 extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, xub_StrLen nMySttPos,
 						   const SwTxtNode& rBehindNd, xub_StrLen nSttPos );

File sw/source/core/undo/SwUndoPageDesc.cxx

 #include <comcore.hrc>
 #include <fmtcntnt.hxx>
 #include <fmthdft.hxx>
+#include <IDocumentPageDescAccess.hxx>
 
 #ifdef DEBUG
 #include <ndindex.hxx>

File sw/source/core/unocore/unoobj.cxx

 #include <memory>
 #include <unoparaframeenum.hxx>
 #include <unoparagraph.hxx>
+#include <IDocumentPageDescAccess.hxx>
 
 
 using namespace ::com::sun::star;

File sw/source/core/unocore/unoobj2.cxx

 #include <algorithm>
 #include <iterator>
 #include <boost/bind.hpp>
+#include <IDocumentPageDescAccess.hxx>
+#include <IDocumentMarkAccess.hxx>
 
 
 using namespace ::com::sun::star;

File sw/source/core/unocore/unosett.cxx

 #include <com/sun/star/text/LabelFollow.hpp>
 // <--
 #include <numrule.hxx>
+#include <IDocumentPageDescAccess.hxx>
 
 using ::rtl::OUString;
 using namespace ::com::sun::star;

File sw/source/core/unocore/unosrch.cxx

 #include <com/sun/star/util/SearchFlags.hpp>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <hintids.hxx>
 
 using namespace ::com::sun::star;
 using ::rtl::OUString;

File sw/source/core/unocore/unostyle.cxx

 #include <GetMetricVal.hxx>
 #include <fmtfsize.hxx>
 #include <numrule.hxx>
+#include <IDocumentPageDescAccess.hxx>
 
 #include <boost/shared_ptr.hpp>
 

File sw/source/core/view/vnew.cxx

 #include <ndgrf.hxx>
 #include <ndindex.hxx>
 #include <accessibilityoptions.hxx>
+#include <IDocumentPageDescAccess.hxx>
 
 
 /*************************************************************************

File sw/source/filter/basflt/shellio.cxx

 #include <doc.hxx>
 #include <pam.hxx>
 #include <editsh.hxx>
-#include <undobj.hxx>			// fuer Undo Insert-Dokument
-#include <swundo.hxx>			// fuer Undo Insert-Dokument
+#include <undobj.hxx>
+#include <swundo.hxx>
 #include <swtable.hxx>
 #include <tblsel.hxx>
 #include <pagedesc.hxx>
 #include <docsh.hxx>
 #include <redline.hxx>
 #include <swerror.h>
-
 #include <paratr.hxx>
-
-// --> OD 2007-03-30 #i73788#
 #include <pausethreadstarting.hxx>
-// <--
+#include <IDocumentPageDescAccess.hxx>
 
 
 using namespace ::com::sun::star;

File sw/source/filter/html/htmlcss1.cxx

 #include "htmlnum.hxx"
 #include "swhtml.hxx"
 #include <numrule.hxx>
+#include <IDocumentPageDescAccess.hxx>
 
 using namespace ::com::sun::star;
 

File sw/source/filter/html/htmlgrin.cxx

 #include <swhtml.hxx>
 #include <numrule.hxx>
 #include <boost/shared_ptr.hpp>
+#include <IDocumentMarkAccess.hxx>
 
 using namespace ::com::sun::star;
 

File sw/source/filter/html/htmlsect.cxx

 #include "viewsh.hxx"
 #include "swcss1.hxx"
 #include "swhtml.hxx"
+#include <IDocumentPageDescAccess.hxx>
 
 #define CONTEXT_FLAGS_MULTICOL (HTML_CNTXT_STRIP_PARA |  \
 								HTML_CNTXT_KEEP_NUMRULE | \

File sw/source/filter/html/swhtml.cxx

 #include <linkenum.hxx>
 #include <breakit.hxx>
 #include <SwAppletImpl.hxx>
+#include <IDocumentPageDescAccess.hxx>
 
 #include <sfx2/viewfrm.hxx>
 

File sw/source/filter/html/wrthtml.cxx

 #include <statstr.hrc>		// ResId fuer Statusleiste
 #endif
 #include <swerror.h>
+#include <IDocumentMarkAccess.hxx>
+#include <IDocumentPageDescAccess.hxx>
 
 #define MAX_INDENT_LEVEL 20
 

File sw/source/filter/rtf/rtfatr.cxx

 #include <txtatr.hxx>
 #include <fltini.hxx>
 #include <fmtrowsplt.hxx>
+#include <IDocumentMarkAccess.hxx>
+#include <IDocumentPageDescAccess.hxx>
 
 /*
  * um nicht immer wieder nach einem Update festzustellen, das irgendwelche

File sw/source/filter/rtf/swparrtf.cxx

 #include <vcl/salbtype.hxx>     // FRound
 
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <IDocumentPageDescAccess.hxx>
+#include <IDocumentMarkAccess.hxx>
 
 
 using namespace ::com::sun::star;

File sw/source/filter/rtf/wrtrtf.cxx

 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <IDocumentPageDescAccess.hxx>
+#include <IDocumentMarkAccess.hxx>
 
 
 namespace

File sw/source/filter/writer/writer.cxx

 #include <numrule.hxx>
 #include <swerror.h>
 #include <boost/bind.hpp>
+#include <IDocumentMarkAccess.hxx>
 
 using namespace ::com::sun::star;
 

File sw/source/filter/ww1/fltshell.cxx

 #include <fltshell.hxx>
 #include <viewsh.hxx>
 #include <shellres.hxx>
+#include <IDocumentPageDescAccess.hxx>
+#include <IDocumentMarkAccess.hxx>
 
 
 #define MAX_FIELDLEN 64000

File sw/source/filter/ww8/wrtw8esh.cxx

 #include <fmtsrnd.hxx>
 #include <fmtornt.hxx>
 #include <fmtfsize.hxx>
-// --> OD 2005-01-06 #i30669#
 #include <fmtfollowtextflow.hxx>
-// <--
 #include <dcontact.hxx>
 #include <frmfmt.hxx>
 #include <fmtcntnt.hxx>
 #include "writerwordglue.hxx"
 #include "wrtww8.hxx"
 #include "escher.hxx"
-// --> OD 2007-07-24 #148096#
 #include <ndtxt.hxx>
-// <--
 #include "WW8FFData.hxx"
+#include <IDocumentPageDescAccess.hxx>
 
 using namespace com::sun::star;
 using namespace sw::util;

File sw/source/filter/ww8/wrtw8nds.cxx

 #include <ndgrf.hxx>
 #include <ndole.hxx>
 #include <cstdio>
+#include <IDocumentMarkAccess.hxx>
+#include <IDocumentPageDescAccess.hxx>
+
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::i18n;

File sw/source/filter/ww8/wrtw8sty.cxx

 #include "ww8par.hxx"
 #include "ww8attributeoutput.hxx"
 #include "docxattributeoutput.hxx"
+#include <IDocumentPageDescAccess.hxx>
 
 using namespace sw::util;
 using namespace nsHdFtFlags;

File sw/source/filter/ww8/wrtww8.hxx

 #include <expfld.hxx>
 
 // einige Forward Deklarationen
+namespace sw { namespace mark { class IFieldmark; } }
 class SwAttrIter;
 class AttributeOutputBase;
 class DocxAttributeOutput;

File sw/source/filter/ww8/ww8par.hxx

 #include "../inc/msfilter.hxx"
 #include <xmloff/odffields.hxx>
 #include <IMark.hxx>
+#include <IDocumentPageDescAccess.hxx>
+#include <IDocumentMarkAccess.hxx>
 
 class SwDoc;
 class SwPaM;

File sw/source/filter/xml/xmlfmt.cxx

 #include <xmloff/attrlist.hxx>
 #include <unotxdoc.hxx>
 #include <docsh.hxx>
+#include <IDocumentPageDescAccess.hxx>
 
 
 using namespace ::com::sun::star;

File sw/source/filter/xml/xmlfonte.cxx

 #include <unotext.hxx>
 #include <doc.hxx>
 #include <xmlexp.hxx>
+#include <errhdl.hxx>
 
 
 using namespace ::com::sun::star::uno;