Revert "fdo#63154 Remove unused solar.h reference in sw."

sal_uIntPtr should only be used to represent pointers cast to integers.

This reverts commit 067d08029384af6e620f0fc48e31ff2a740e1fc8.

45 files changed, 154 insertions, 49 deletions

diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx
index e72ad0448220..a0b3ee6851d0 100644
--- a/sw/inc/IDocumentLinksAdministration.hxx
+++ b/sw/inc/IDocumentLinksAdministration.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SW_INC_IDOCUMENTLINKSADMINISTRATION_HXX
 #define INCLUDED_SW_INC_IDOCUMENTLINKSADMINISTRATION_HXX
 
+#include <tools/solar.h>
+
 namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
 namespace sfx2 { class SvLinkSource;  class LinkManager; }
 
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 0385fd255b53..48320be8374a 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -21,7 +21,10 @@
  #define INCLUDED_SW_INC_IDOCUMENTREDLINEACCESS_HXX
 
  #include <sal/types.h>
+ #include <tools/solar.h>
+
  #include <limits.h>
+
  #include <com/sun/star/uno/Sequence.hxx>
 
  class SwRangeRedline;
@@ -95,6 +98,10 @@ public:
 
 public:
 
+    /*************************************************
+        Query
+    *************************************************/
+
     /** Query the currently set redline mode
 
         @returns
@@ -130,6 +137,10 @@ public:
 
     virtual bool IsInRedlines(const SwNode& rNode) const = 0;
 
+    /***************************************************
+        Manipulation
+     ***************************************************/
+
     /** Append a new redline
 
         @param pPtr
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index d33695a68fc5..6e66fd018d63 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SW_INC_IDOCUMENTSETTINGACCESS_HXX
 #define INCLUDED_SW_INC_IDOCUMENTSETTINGACCESS_HXX
 
+#include <tools/solar.h>
 #include <rtl/ref.hxx>
 #include <chcmprse.hxx>
 #include <fldupde.hxx>
diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx
index e44b09d109c9..9230dd397cec 100644
--- a/sw/inc/IDocumentState.hxx
+++ b/sw/inc/IDocumentState.hxx
@@ -20,6 +20,8 @@
  #ifndef INCLUDED_SW_INC_IDOCUMENTSTATE_HXX
  #define INCLUDED_SW_INC_IDOCUMENTSTATE_HXX
 
+ #include <tools/solar.h>
+
  /** Get information about the current document state
  */
  class IDocumentState
diff --git a/sw/inc/accessibilityoptions.hxx b/sw/inc/accessibilityoptions.hxx
index 7361b54f9cb6..e80f2685f036 100644
--- a/sw/inc/accessibilityoptions.hxx
+++ b/sw/inc/accessibilityoptions.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_SW_INC_ACCESSIBILITYOPTIONS_HXX
 #define INCLUDED_SW_INC_ACCESSIBILITYOPTIONS_HXX
 
+#include <tools/solar.h>
+
 struct SwAccessibilityOptions
 {
     sal_Bool bIsAlwaysAutoColor         :1;
diff --git a/sw/inc/authratr.hxx b/sw/inc/authratr.hxx
index 1b01fb7f2df1..865092a7abfe 100644
--- a/sw/inc/authratr.hxx
+++ b/sw/inc/authratr.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SW_INC_AUTHRATR_HXX
 #define INCLUDED_SW_INC_AUTHRATR_HXX
 
+#include <tools/solar.h>
 #include <tools/color.hxx>
 #include "swdllapi.h"
 
@@ -41,6 +42,7 @@ public:
     }
 };
 
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/crsskip.hxx b/sw/inc/crsskip.hxx
index 2294da326d30..6dae1e2e3392 100644
--- a/sw/inc/crsskip.hxx
+++ b/sw/inc/crsskip.hxx
@@ -20,7 +20,8 @@
 #ifndef INCLUDED_SW_INC_CRSSKIP_HXX
 #define INCLUDED_SW_INC_CRSSKIP_HXX
 
-#include <sal/types.h>
+#include <tools/solar.h>
+
 
 // define for cursor travelling normally in western text cells and chars do
 // the same, but in complex text cell skip over legatures and char skip
diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx
index ad870d981a83..c5a188200c48 100644
--- a/sw/inc/cshtyp.hxx
+++ b/sw/inc/cshtyp.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SW_INC_CSHTYP_HXX
 #define INCLUDED_SW_INC_CSHTYP_HXX
 
+#include <tools/solar.h>
 #include "swdllapi.h"
 
 class SwPaM;
@@ -29,6 +30,7 @@ class SwLayoutFrm;
 struct SwMoveFnCollection;
 typedef SwMoveFnCollection* SwMoveFn;
 
+
 // Type definition for CrsrShell.
 // Direction-parameter for MovePage (initialized in SwCntntFrm).
 typedef SwLayoutFrm * (*SwWhichPage)( const SwLayoutFrm * );
@@ -66,6 +68,7 @@ typedef sal_Bool (*SwWhichRegion)( SwPaM&, SwPosRegion, sal_Bool bInReadOnly );
 extern SwWhichRegion fnRegionPrev, fnRegionCurr, fnRegionNext, fnRegionCurrAndSkip;
 extern SwPosRegion fnRegionStart, fnRegionEnd;
 
+
 /*
  * The following combinations are allowed:
  *  - find one in body                      -> FND_IN_BODY
@@ -83,6 +86,7 @@ enum FindRanges
     FND_IN_SELALL   = 0x01      ///< All (only in non-body and selections).
 };
 
+
 enum SwDocPositions
 {
     DOCPOS_START,
diff --git a/sw/inc/docfac.hxx b/sw/inc/docfac.hxx
index d7bd90c1e8f3..35827e09a4b2 100644
--- a/sw/inc/docfac.hxx
+++ b/sw/inc/docfac.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_SW_INC_DOCFAC_HXX
 #define INCLUDED_SW_INC_DOCFAC_HXX
 
+#include <tools/solar.h>
+
 class SwDoc;
 
 class SW_DLLPUBLIC SwDocFac
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index da93962fbdca..cb79ce418869 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SW_INC_FORMAT_HXX
 #define INCLUDED_SW_INC_FORMAT_HXX
 
+#include <tools/solar.h>
 #include "swdllapi.h"
 #include <swatrset.hxx>
 #include <calbck.hxx>
@@ -321,6 +322,8 @@ public:
     virtual bool IsShadowTransparent() const;
 };
 
+// --------------- inline Implementations ------------------------
+
 inline const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich,
                                              sal_Bool bInParents ) const
 {
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 344d67d9b3d0..cf911ab8bb0c 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SW_INC_HINTIDS_HXX
 #define INCLUDED_SW_INC_HINTIDS_HXX
 
+#include <tools/solar.h>
 #include <sal/types.h>
 #include "swdllapi.h"
 
@@ -276,6 +277,8 @@ RES_UNKNOWNATR_BEGIN = RES_BOXATR_END,
 RES_UNKNOWNATR_END
 };
 
+
+
 // Format IDs
 enum RES_FMT
 {
@@ -375,59 +378,49 @@ inline bool isATR(const sal_uInt16 nWhich)
 {
     return (RES_CHRATR_BEGIN <= nWhich) && (RES_UNKNOWNATR_END > nWhich);
 }
-
 inline bool isCHRATR(const sal_uInt16 nWhich)
 {
     return (RES_CHRATR_BEGIN <= nWhich) && (RES_CHRATR_END > nWhich);
 }
-
 inline bool isTXTATR_WITHEND(const sal_uInt16 nWhich)
 {
     return (RES_TXTATR_WITHEND_BEGIN <= nWhich)
         && (RES_TXTATR_WITHEND_END > nWhich);
 }
-
 inline bool isTXTATR_NOEND(const sal_uInt16 nWhich)
 {
     return (RES_TXTATR_NOEND_BEGIN <= nWhich)
         && (RES_TXTATR_NOEND_END > nWhich);
 }
-
 inline bool isTXTATR(const sal_uInt16 nWhich)
 {
     return (RES_TXTATR_BEGIN <= nWhich) && (RES_TXTATR_END > nWhich);
 }
-
 inline bool isPARATR(const sal_uInt16 nWhich)
 {
     return (RES_PARATR_BEGIN <= nWhich) && (RES_PARATR_END > nWhich);
 }
-
 inline bool isPARATR_LIST(const sal_uInt16 nWhich)
 {
-    return (RES_PARATR_LIST_BEGIN <= nWhich) && (RES_PARATR_LIST_END > nWhich);
-}
-
+    return (RES_PARATR_LIST_BEGIN <= nWhich) && (RES_PARATR_LIST_END > nWhich); }
 inline bool isFRMATR(const sal_uInt16 nWhich)
 {
     return (RES_FRMATR_BEGIN <= nWhich) && (RES_FRMATR_END > nWhich);
 }
-
 inline bool isGRFATR(const sal_uInt16 nWhich)
 {
     return (RES_GRFATR_BEGIN <= nWhich) && (RES_GRFATR_END > nWhich);
 }
-
 inline bool isBOXATR(const sal_uInt16 nWhich)
 {
     return (RES_BOXATR_BEGIN <= nWhich) && (RES_BOXATR_END > nWhich);
 }
-
 inline bool isUNKNOWNATR(const sal_uInt16 nWhich)
 {
     return (RES_UNKNOWNATR_BEGIN <= nWhich) && (RES_UNKNOWNATR_END > nWhich);
 }
 
+
 // Take the respective default attribute from the statistical default
 // attributes table over the Which-value.
 // If none exists, return a 0 pointer!!!
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index bd8d94bcc607..fc2caa527aba 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -22,6 +22,7 @@
 #include <limits.h>
 
 #include "rtl/instance.hxx"
+#include <tools/solar.h>
 #include <tools/rtti.hxx>
 #include <swdllapi.h>
 
@@ -139,19 +140,16 @@ inline sal_Int32 SwIndex::operator++()
 {
     return ChgValue( *this, m_nIndex+1 ).m_nIndex;
 }
-
 inline sal_Int32 SwIndex::operator--()
 {
     return ChgValue( *this, m_nIndex-1 ).m_nIndex;
 }
-
 inline sal_Int32 SwIndex::operator++(int)
 {
     sal_Int32 const nOldIndex = m_nIndex;
     ChgValue( *this, m_nIndex+1 );
     return nOldIndex;
 }
-
 inline sal_Int32 SwIndex::operator--(int)
 {
     sal_Int32 const nOldIndex = m_nIndex;
@@ -163,17 +161,14 @@ inline sal_Int32 SwIndex::operator+=( sal_Int32 const nVal )
 {
     return ChgValue( *this, m_nIndex + nVal ).m_nIndex;
 }
-
 inline sal_Int32 SwIndex::operator-=( sal_Int32 const nVal )
 {
     return ChgValue( *this, m_nIndex - nVal ).m_nIndex;
 }
-
 inline sal_Int32 SwIndex::operator+=( const SwIndex& rIndex )
 {
     return ChgValue( *this, m_nIndex + rIndex.m_nIndex ).m_nIndex;
 }
-
 inline sal_Int32 SwIndex::operator-=( const SwIndex& rIndex )
 {
     return ChgValue( *this, m_nIndex - rIndex.m_nIndex ).m_nIndex;
@@ -183,22 +178,18 @@ inline bool SwIndex::operator< ( const SwIndex& rIndex ) const
 {
     return m_nIndex <  rIndex.m_nIndex;
 }
-
 inline bool SwIndex::operator<=( const SwIndex& rIndex ) const
 {
     return m_nIndex <= rIndex.m_nIndex;
 }
-
 inline bool SwIndex::operator> ( const SwIndex& rIndex ) const
 {
     return m_nIndex >  rIndex.m_nIndex;
 }
-
 inline bool SwIndex::operator>=( const SwIndex& rIndex ) const
 {
     return m_nIndex >= rIndex.m_nIndex;
 }
-
 inline SwIndex& SwIndex::operator= ( sal_Int32 const nVal )
 {
     if (m_nIndex != nVal)
diff --git a/sw/inc/itabenum.hxx b/sw/inc/itabenum.hxx
index 22a7b382659f..c21ed1d500cb 100644
--- a/sw/inc/itabenum.hxx
+++ b/sw/inc/itabenum.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_SW_INC_ITABENUM_HXX
 #define INCLUDED_SW_INC_ITABENUM_HXX
 
+#include <tools/solar.h>
+
 namespace tabopts
 {
     const sal_uInt16 DEFAULT_BORDER     = 0x01;
@@ -37,6 +39,7 @@ struct SwInsertTableOptions
         mnInsMode( nInsMode ), mnRowsToRepeat( nRowsToRepeat ) {};
 };
 
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index 69fcf5500d2d..4c715c700f5c 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SW_INC_MDIEXP_HXX
 
 #include <rtl/ustring.hxx>
+#include <tools/solar.h>
 #include <tblenum.hxx>
 #include <swdllapi.h>
 
diff --git a/sw/inc/ndtyp.hxx b/sw/inc/ndtyp.hxx
index c79bd80bcf6d..9ea932588a8b 100644
--- a/sw/inc/ndtyp.hxx
+++ b/sw/inc/ndtyp.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SW_INC_NDTYP_HXX
 #define INCLUDED_SW_INC_NDTYP_HXX
 
+#include <tools/solar.h>
+
 // IDs for different nodes. The member indicating the type of node is
 // in base class.
 const sal_uInt8 ND_ENDNODE      = 0x01;
@@ -56,6 +58,8 @@ enum SwStartNodeType
 const sal_uInt8 ND_HAS_PREV_LAYNODE = 0x01;
 const sal_uInt8 ND_HAS_NEXT_LAYNODE = 0x02;
 
+
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index e08a2b22009d..aac38b412615 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -254,6 +254,7 @@
 #include <svx/xfltrit.hxx>
 #include <svx/xlineit.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <tools/solar.h>
 #include <tools/stream.hxx>
 #include <tools/tenccvt.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 341b25617630..a90133efa182 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -990,6 +990,7 @@
 #include <tools/resmgr.hxx>
 #include <tools/rtti.hxx>
 #include <tools/shl.hxx>
+#include <tools/solar.h>
 #include <tools/stream.hxx>
 #include <tools/time.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 75c8224984b4..03938d2912db 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -20,17 +20,21 @@
 #define INCLUDED_SW_INC_SPLARGS_HXX
 
 #include <i18nlangtag/lang.h>
+#include <tools/solar.h>
 #include <tools/gen.hxx>
 #include <limits.h>
 
 class SwTxtNode;
 class SwIndex;
 class Font;
-
 #include <com/sun/star/linguistic2/XSpellAlternatives.hpp>
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 
+/*************************************************************************
+ *                      struct SwArgsBase
+ *************************************************************************/
+
 
 struct SwArgsBase     // used for text conversion (Hangul/Hanja, ...)
 {
@@ -57,9 +61,10 @@ struct SwArgsBase     // used for text conversion (Hangul/Hanja, ...)
     }
 };
 
-/*
+/*************************************************************************
+ *                      struct SwConversionArgs
  * used for text conversion (Hangul/Hanja, Simplified/Traditional Chinese, ...)
- */
+ *************************************************************************/
 
 struct SwConversionArgs : SwArgsBase
 {
@@ -85,6 +90,10 @@ struct SwConversionArgs : SwArgsBase
         {}
 };
 
+/*************************************************************************
+ *                      struct SwSpellArgs
+ *************************************************************************/
+
 struct SwSpellArgs : SwArgsBase
 {
     ::com::sun::star::uno::Reference<
@@ -106,6 +115,10 @@ struct SwSpellArgs : SwArgsBase
         {}
 };
 
+/*************************************************************************
+ *                      class SwInterHyphInfo
+ *************************************************************************/
+
 // Parameter-class for Hyphenate.
 // docedt.cxx:  SwDoc::Hyphenate()
 // txtedt.cxx:  SwTxtNode::Hyphenate()
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 343723634af3..edad75436b1f 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -18,7 +18,7 @@
  */
 #ifndef INCLUDED_SW_INC_SWATRSET_HXX
 #define INCLUDED_SW_INC_SWATRSET_HXX
-
+#include <tools/solar.h>
 #include <tools/mempool.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
diff --git a/sw/inc/swdbdata.hxx b/sw/inc/swdbdata.hxx
index 4967cf990097..7d73861ce6cd 100644
--- a/sw/inc/swdbdata.hxx
+++ b/sw/inc/swdbdata.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SW_INC_SWDBDATA_HXX
 #define INCLUDED_SW_INC_SWDBDATA_HXX
 
+#include <tools/solar.h>
 #include <rtl/ustring.hxx>
 
 // contains the description of a data source
diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx
index 5c046b2cde7c..e89c89e73755 100644
--- a/sw/inc/swevent.hxx
+++ b/sw/inc/swevent.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SW_INC_SWEVENT_HXX
 #define INCLUDED_SW_INC_SWEVENT_HXX
 
+#include <tools/solar.h>
 #include <sfx2/sfx.hrc>
 
 #define     SW_EVENT_OBJECT_SELECT        ( EVENT_APP_START + 0 )
@@ -113,6 +114,7 @@ struct SwCallMouseEvent
     sal_Bool HasEvent() const { return EVENT_OBJECT_NONE != eType; }
 };
 
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 5ac3ea0db4cf..2c943b1f4b32 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -18,8 +18,8 @@
  */
 #ifndef INCLUDED_SW_INC_SWTYPES_HXX
 #define INCLUDED_SW_INC_SWTYPES_HXX
-
 #include <rtl/ustring.hxx>
+#include <tools/solar.h>
 #include <SwGetPoolIdFromName.hxx>
 
 #include <limits.h>
diff --git a/sw/inc/swunohelper.hxx b/sw/inc/swunohelper.hxx
index c0e0669aa404..f942b1468a23 100644
--- a/sw/inc/swunohelper.hxx
+++ b/sw/inc/swunohelper.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SW_INC_SWUNOHELPER_HXX
 #define INCLUDED_SW_INC_SWUNOHELPER_HXX
 
+#include <tools/solar.h>
 #include <sal/types.h>
 #include "swdllapi.h"
 
diff --git a/sw/inc/swwait.hxx b/sw/inc/swwait.hxx
index bdf620ff3c66..ca5cad51fab4 100644
--- a/sw/inc/swwait.hxx
+++ b/sw/inc/swwait.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SW_INC_SWWAIT_HXX
 #define INCLUDED_SW_INC_SWWAIT_HXX
 
+#include <tools/solar.h>
 #include "swdllapi.h"
 
 #include <boost/unordered_set.hpp>
diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx
index 1f986f48e4c2..270a834d6673 100644
--- a/sw/inc/tabcol.hxx
+++ b/sw/inc/tabcol.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_SW_INC_TABCOL_HXX
 #define INCLUDED_SW_INC_TABCOL_HXX
 
+#include <tools/solar.h>
+
 #include <vector>
 #include "swdllapi.h"
 
diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx
index 42d780fa2c27..4f50f3273689 100644
--- a/sw/inc/toxwrap.hxx
+++ b/sw/inc/toxwrap.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SW_INC_TOXWRAP_HXX
 #define INCLUDED_SW_INC_TOXWRAP_HXX
 
+#include <tools/solar.h>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include "swdllapi.h"
@@ -33,6 +34,7 @@ namespace lang {
 }
 }}}
 
+
 class SW_DLLPUBLIC IndexEntrySupplierWrapper
 {
     ::com::sun::star::lang::Locale aLcl;
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index e982f6327693..603b45618aac 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -19,10 +19,13 @@
 #ifndef INCLUDED_SW_INC_TXATBASE_HXX
 #define INCLUDED_SW_INC_TXATBASE_HXX
 
+#include <tools/solar.h>
 #include <svl/poolitem.hxx>
 #include <hintids.hxx>
+
 #include <boost/utility.hpp>
 
+
 class SfxItemPool;
 class SvXMLAttrContainerItem;
 class SwFmtRuby;
@@ -36,6 +39,7 @@ class SwTOXMark;
 class SwFmtRefMark;
 class SwFmtMeta;
 
+
 class SwTxtAttr : private boost::noncopyable
 {
 private:
@@ -130,6 +134,9 @@ public:
     virtual sal_Int32* GetEnd();
 };
 
+
+// --------------- Inline Implementations ------------------------
+
 inline const sal_Int32* SwTxtAttr::End() const
 {
     return const_cast<SwTxtAttr * >(this)->GetEnd();
@@ -161,6 +168,8 @@ inline void SwTxtAttr::SetDontExpand( bool bDontExpand )
     }
 }
 
+//------------------------------------------------------------------------
+
 inline const SwFmtCharFmt& SwTxtAttr::GetCharFmt() const
 {
     assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_CHARFMT );
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx
index 6a542ebf6b99..5ee6d11b23f3 100644
--- a/sw/inc/txatritr.hxx
+++ b/sw/inc/txatritr.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SW_INC_TXATRITR_HXX
 #define INCLUDED_SW_INC_TXATRITR_HXX
 
+#include <tools/solar.h>
 #include <sal/types.h>
 #include <editeng/langitem.hxx>
 #include <hintids.hxx>
@@ -29,6 +30,7 @@ class SwTxtNode;
 class SwTxtAttr;
 class SfxPoolItem;
 
+
 class SwScriptIterator
 {
     const OUString& m_rText;
@@ -47,6 +49,7 @@ public:
     const OUString& GetText() const { return m_rText; }
 };
 
+
 class SwTxtAttrIterator
 {
     SwScriptIterator aSIter;
@@ -70,6 +73,7 @@ public:
     sal_Int32 GetChgPos() const        { return nChgPos; }
 };
 
+
 class SwLanguageIterator : public SwTxtAttrIterator
 {
 public:
@@ -83,6 +87,7 @@ public:
         { return ((SvxLanguageItem&)GetAttr()).GetValue(); }
 };
 
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 6480b62f9d68..29a95bd8c1a6 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -18,7 +18,7 @@
  */
 #ifndef INCLUDED_SW_INC_UNOCOLL_HXX
 #define INCLUDED_SW_INC_UNOCOLL_HXX
-
+#include <tools/solar.h>
 #include <flyenum.hxx>
 #include <vcl/timer.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -189,8 +189,9 @@ class SwUnoCollection
 
 #define SW_SERVICE_INVALID          USHRT_MAX
 
+//
 // case-corrected versions of service-names (see #i67811)
-
+//
 #define CSS_TEXT_TEXTFIELD_DATE_TIME                    "com.sun.star.text.textfield.DateTime"
 #define CSS_TEXT_TEXTFIELD_USER                         "com.sun.star.text.textfield.User"
 #define CSS_TEXT_TEXTFIELD_SET_EXPRESSION               "com.sun.star.text.textfield.SetExpression"
@@ -533,4 +534,8 @@ public:
 #endif
 
 
+
+
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index a346cef49635..f3c0cc630752 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -22,10 +22,13 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <rtl/ustring.hxx>
+#include <tools/solar.h>
 
 TYPEINIT0(SwIndexReg);
 
+// -------
 // SwIndex
+// -------
 
 SwIndex::SwIndex(SwIndexReg *const pReg, sal_Int32 const nIdx)
     : m_nIndex( nIdx )
@@ -210,7 +213,9 @@ SwIndex& SwIndex::Assign( SwIndexReg* pArr, sal_Int32 nIdx )
     return *this;
 }
 
+// ----------
 // SwIndexReg
+// ----------
 
 SwIndexReg::SwIndexReg()
     : m_pFirst( 0 ), m_pLast( 0 )
@@ -282,7 +287,9 @@ void SwIndexReg::MoveTo( SwIndexReg& rArr )
 
 #ifdef DBG_UTIL
 
+// -------
 // SwIndex
+// -------
 
 sal_Int32 SwIndex::operator++(int)
 {
diff --git a/sw/source/core/inc/GetMetricVal.hxx b/sw/source/core/inc/GetMetricVal.hxx
index e78507f285b9..eca6b9ef1701 100644
--- a/sw/source/core/inc/GetMetricVal.hxx
+++ b/sw/source/core/inc/GetMetricVal.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_GETMETRICVAL_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_GETMETRICVAL_HXX
 
+#include <tools/solar.h>
+
 #define CM_1  0         // 1 centimeter     or 1/2 inch
 #define CM_05 1         // 0.5 centimeter   or 1/4 inch
 #define CM_01 2         // 0.1 centimeter   or 1/20 inch
diff --git a/sw/source/core/inc/SwPortionHandler.hxx b/sw/source/core/inc/SwPortionHandler.hxx
index 6807e99978e4..c30498cf94e7 100644
--- a/sw/source/core/inc/SwPortionHandler.hxx
+++ b/sw/source/core/inc/SwPortionHandler.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_SWPORTIONHANDLER_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_SWPORTIONHANDLER_HXX
 
+#include <tools/solar.h>
 #include <txttypes.hxx>
 
 /** The SwPortionHandler interface implements a visitor for the layout
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index 78ccefbffd24..7859097d9238 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_DRAWFONT_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_DRAWFONT_HXX
 
+#include <tools/solar.h>
 #include <tools/debug.hxx>
 
 class SwTxtFrm;
diff --git a/sw/source/core/inc/laycache.hxx b/sw/source/core/inc/laycache.hxx
index 5a034713d72b..b9a0a40ca557 100644
--- a/sw/source/core/inc/laycache.hxx
+++ b/sw/source/core/inc/laycache.hxx
@@ -20,11 +20,13 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_LAYCACHE_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_LAYCACHE_HXX
 
+#include <tools/solar.h>
+
 class SwDoc;
 class SwLayCacheImpl;
 class SvStream;
 
-/*
+/*************************************************************************
  *                      class SwLayoutCache
  *
  * This class allows to save layout information in the file and it contains
@@ -37,8 +39,7 @@ class SvStream;
  * if somebody reads the information, he increments the lock count by 1,
  * during the Read(..) function the lock count will set to $8000.
  *
- */
-
+ **************************************************************************/
 class SwLayoutCache
 {
     SwLayCacheImpl *pImpl;
diff --git a/sw/source/core/inc/unofldmid.h b/sw/source/core/inc/unofldmid.h
index 3cbd3fc64433..4652871e02b8 100644
--- a/sw/source/core/inc/unofldmid.h
+++ b/sw/source/core/inc/unofldmid.h
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFLDMID_H
 #define INCLUDED_SW_SOURCE_CORE_INC_UNOFLDMID_H
 
+#include <tools/solar.h>
+
 namespace com { namespace sun { namespace star { namespace uno {
     class Any;
 } } } }
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index f4a1f3ff7f56..371824cd24be 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLY_HXX
 #define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLY_HXX
 
+#include <tools/solar.h>
 #include <o3tl/sorted_vector.hxx>
-#include <sal/types.h>
 
 class SdrObject;
 class SwFrmFmt;
diff --git a/sw/source/filter/inc/rtf.hxx b/sw/source/filter/inc/rtf.hxx
index c2af10afdfb5..301b8ff2bf5f 100644
--- a/sw/source/filter/inc/rtf.hxx
+++ b/sw/source/filter/inc/rtf.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_INC_RTF_HXX
 #define INCLUDED_SW_SOURCE_FILTER_INC_RTF_HXX
 
+#include <tools/solar.h>
+
 class RTFSurround
 {
     union {
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index 83c10a864eb1..de63e3e691f7 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_INC_WRTSWTBL_HXX
 #define INCLUDED_SW_SOURCE_FILTER_INC_WRTSWTBL_HXX
 
+#include <tools/solar.h>
 #include <tools/color.hxx>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <o3tl/sorted_vector.hxx>
@@ -33,13 +34,18 @@ class SvxBrushItem;
 
 namespace editeng { class SvxBorderLine; }
 
-// Code aus dem HTML-Filter fuers schreiben von Tabellen
+//---------------------------------------------------------------------------
+//       Code aus dem HTML-Filter fuers schreiben von Tabellen
+//---------------------------------------------------------------------------
 
 #define COLFUZZY 20
 #define ROWFUZZY 20
 #define COL_DFLT_WIDTH ((2*COLFUZZY)+1)
 #define ROW_DFLT_HEIGHT (2*ROWFUZZY)+1
 
+
+//-----------------------------------------------------------------------
+
 class SW_DLLPUBLIC SwWriteTableCell
 {
     const SwTableBox *pBox;     // SwTableBox der Zelle
@@ -91,6 +97,9 @@ public:
 
 typedef boost::ptr_vector<SwWriteTableCell> SwWriteTableCells;
 
+
+//-----------------------------------------------------------------------
+
 class SW_DLLPUBLIC SwWriteTableRow
 {
     SwWriteTableCells aCells;       // Alle Zellen der Rows
@@ -159,6 +168,9 @@ public:
     ~SwWriteTableRows() { DeleteAndDestroyAll(); }
 };
 
+
+//-----------------------------------------------------------------------
+
 class SW_DLLPUBLIC SwWriteTableCol
 {
     sal_uInt32 nPos;                        // End Position der Spalte
@@ -218,6 +230,8 @@ public:
     ~SwWriteTableCols() { DeleteAndDestroyAll(); }
 };
 
+//-----------------------------------------------------------------------
+
 class SW_DLLPUBLIC SwWriteTable
 {
 protected:
@@ -310,6 +324,9 @@ public:
     const SwWriteTableRows& GetRows() const { return aRows; }
 };
 
+
+
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx
index 580e554196f0..b7187546d0fa 100644
--- a/sw/source/filter/ww8/WW8Sttbf.hxx
+++ b/sw/source/filter/ww8/WW8Sttbf.hxx
@@ -20,6 +20,7 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 #include <boost/shared_array.hpp>
+#include <tools/solar.h>
 #include <rtl/ustring.hxx>
 #include <tools/stream.hxx>
 #include <IDocumentExternalData.hxx>
diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx
index 3e46973e0bc1..16ff8283db34 100644
--- a/sw/source/filter/xml/xmlexpit.hxx
+++ b/sw/source/filter/xml/xmlexpit.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLEXPIT_HXX
 #define INCLUDED_SW_SOURCE_FILTER_XML_XMLEXPIT_HXX
 
+#include <tools/solar.h>
 #include "xmlitmap.hxx"
 #include <vector>
 
diff --git a/sw/source/filter/xml/xmlimpit.hxx b/sw/source/filter/xml/xmlimpit.hxx
index 5739724243bd..219ae8dba848 100644
--- a/sw/source/filter/xml/xmlimpit.hxx
+++ b/sw/source/filter/xml/xmlimpit.hxx
@@ -20,6 +20,8 @@
 #define INCLUDED_SW_SOURCE_FILTER_XML_XMLIMPIT_HXX
 
 #include <limits.h>
+#include <tools/solar.h>
+
 
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include "xmlitmap.hxx"
diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx
index 0c80718ef19b..2573ce8a10f8 100644
--- a/sw/source/filter/xml/xmlitem.hxx
+++ b/sw/source/filter/xml/xmlitem.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SW_SOURCE_FILTER_XML_XMLITEM_HXX
 
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
+#include <tools/solar.h>
 #include <limits.h>
 #include <xmloff/xmlictxt.hxx>
 
@@ -62,6 +63,7 @@ public:
                                    const SvXMLItemMapEntry& rEntry,
                                    const SvXMLUnitConverter& rUnitConv );
 
+
 };
 
 
diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx
index 454424ced70b..da04b9153ed2 100644
--- a/sw/source/ui/inc/fldmgr.hxx
+++ b/sw/source/ui/inc/fldmgr.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_UI_INC_FLDMGR_HXX
 #define INCLUDED_SW_SOURCE_UI_INC_FLDMGR_HXX
 
-#include <sal/types.h>
 #include "swdllapi.h"
 #include "swtypes.hxx"
 #include <com/sun/star/uno/Reference.h>
@@ -44,9 +43,9 @@ class SvxMacroItem;
 class SvNumberFormatter;
 class Window;
 
-/*
+/*--------------------------------------------------------------------
     Description: the groups of fields
-*/
+ --------------------------------------------------------------------*/
 enum SwFldGroups
 {
     GRP_DOC,
@@ -63,17 +62,17 @@ struct SwFldGroupRgn
     sal_uInt16 nEnd;
 };
 
-/*
+/*--------------------------------------------------------------------
     Description:  the field manager handles the insertation of fields
                   with command strings
-*/
+ --------------------------------------------------------------------*/
 struct SwInsertFld_Data
 {
     sal_uInt16 nTypeId;
     sal_uInt16 nSubType;
     const OUString sPar1;
     const OUString sPar2;
-    sal_uIntPtr nFormatId;
+    sal_uLong nFormatId;
     SwWrtShell* pSh;
     sal_Unicode cSeparator;
     sal_Bool bIsAutomaticLanguage;
@@ -83,7 +82,7 @@ struct SwInsertFld_Data
     Window* pParent; // parent dialog used for SwWrtShell::StartInputFldDlg()
 
     SwInsertFld_Data(sal_uInt16 nType, sal_uInt16 nSub, const OUString& rPar1, const OUString& rPar2,
-                    sal_uIntPtr nFmtId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', sal_Bool bIsAutoLanguage = sal_True) :
+                    sal_uLong nFmtId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', sal_Bool bIsAutoLanguage = sal_True) :
         nTypeId(nType),
         nSubType(nSub),
         sPar1(rPar1),
@@ -115,7 +114,7 @@ private:
     OUString          sMacroPath;
     OUString          sMacroName;
 
-    sal_uIntPtr           nCurFmt;
+    sal_uLong           nCurFmt;
     sal_Bool            bEvalExp;
 
     SAL_DLLPRIVATE sal_uInt16            GetCurrLanguage() const;
@@ -135,14 +134,14 @@ public:
     sal_Bool InsertFld( const SwInsertFld_Data& rData );
 
     // change the current field directly
-    void            UpdateCurFld(sal_uIntPtr nFormat,
+    void            UpdateCurFld(sal_uLong nFormat,
                                  const OUString& rPar1,
                                  const OUString& rPar2,
                                  SwField * _pField = 0); // #111840#
 
     OUString        GetCurFldPar1() const { return aCurPar1; }
     OUString        GetCurFldPar2() const { return aCurPar2; }
-    inline sal_uIntPtr   GetCurFldFmt() const;
+    inline sal_uLong   GetCurFldFmt() const;
 
     // determine a field
     SwField*        GetCurFld();
@@ -197,9 +196,9 @@ public:
 
     // format to a type
     sal_uInt16          GetFormatCount(sal_uInt16 nTypeId, bool bIsText, sal_Bool bHtmlMode = sal_False) const;
-    OUString            GetFormatStr(sal_uInt16 nTypeId, sal_uIntPtr nFormatId) const;
-    sal_uInt16          GetFormatId(sal_uInt16 nTypeId, sal_uIntPtr nFormatId) const;
-    sal_uIntPtr           GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberFormatter* pFormatter, double* pVal = 0L);
+    OUString            GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const;
+    sal_uInt16          GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const;
+    sal_uLong           GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberFormatter* pFormatter, double* pVal = 0L);
 
     // turn off evaluation of expression fields for insertation
     // of many expressino fields (see labels)
@@ -211,7 +210,7 @@ public:
 inline void SwFldMgr::SetEvalExpFlds(sal_Bool bEval)
     { bEvalExp = bEval; }
 
-inline sal_uIntPtr SwFldMgr::GetCurFldFmt() const
+inline sal_uLong SwFldMgr::GetCurFldFmt() const
     { return nCurFmt; }
 
 #endif
diff --git a/sw/source/ui/inc/initui.hxx b/sw/source/ui/inc/initui.hxx
index cb4a406202c6..7b39f2b48084 100644
--- a/sw/source/ui/inc/initui.hxx
+++ b/sw/source/ui/inc/initui.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UI_INC_INITUI_HXX
 #define INCLUDED_SW_SOURCE_UI_INC_INITUI_HXX
 
+#include "tools/solar.h"
 #include "swdllapi.h"
 #include "rtl/ustring.hxx"
 
diff --git a/sw/source/ui/uiview/viewfunc.hxx b/sw/source/ui/uiview/viewfunc.hxx
index e8c26e82dadf..e2eb9c32c396 100644
--- a/sw/source/ui/uiview/viewfunc.hxx
+++ b/sw/source/ui/uiview/viewfunc.hxx
@@ -18,6 +18,7 @@
  */
 #ifndef INCLUDED_SW_SOURCE_UI_UIVIEW_VIEWFUNC_HXX
 #define INCLUDED_SW_SOURCE_UI_UIVIEW_VIEWFUNC_HXX
+#include <tools/solar.h>
 
 class ImageButton;
 class Point;