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.

16 files changed, 59 insertions, 19 deletions

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;