29 files changed, 95 insertions, 30 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: */