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

Change-Id: I6e13f3705cb591573693cf60220e32aa823c5886
Reviewed-on: https://gerrit.libreoffice.org/8067
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Marcos Souza <marcos.souza.org@gmail.com>

2 files changed, 14 insertions, 14 deletions

diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx
index da04b9153ed2..454424ced70b 100644
--- a/sw/source/ui/inc/fldmgr.hxx
+++ b/sw/source/ui/inc/fldmgr.hxx
@@ -19,6 +19,7 @@
 #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>
@@ -43,9 +44,9 @@ class SvxMacroItem;
 class SvNumberFormatter;
 class Window;
 
-/*--------------------------------------------------------------------
+/*
     Description: the groups of fields
- --------------------------------------------------------------------*/
+*/
 enum SwFldGroups
 {
     GRP_DOC,
@@ -62,17 +63,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_uLong nFormatId;
+    sal_uIntPtr nFormatId;
     SwWrtShell* pSh;
     sal_Unicode cSeparator;
     sal_Bool bIsAutomaticLanguage;
@@ -82,7 +83,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_uLong nFmtId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', sal_Bool bIsAutoLanguage = sal_True) :
+                    sal_uIntPtr nFmtId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', sal_Bool bIsAutoLanguage = sal_True) :
         nTypeId(nType),
         nSubType(nSub),
         sPar1(rPar1),
@@ -114,7 +115,7 @@ private:
     OUString          sMacroPath;
     OUString          sMacroName;
 
-    sal_uLong           nCurFmt;
+    sal_uIntPtr           nCurFmt;
     sal_Bool            bEvalExp;
 
     SAL_DLLPRIVATE sal_uInt16            GetCurrLanguage() const;
@@ -134,14 +135,14 @@ public:
     sal_Bool InsertFld( const SwInsertFld_Data& rData );
 
     // change the current field directly
-    void            UpdateCurFld(sal_uLong nFormat,
+    void            UpdateCurFld(sal_uIntPtr nFormat,
                                  const OUString& rPar1,
                                  const OUString& rPar2,
                                  SwField * _pField = 0); // #111840#
 
     OUString        GetCurFldPar1() const { return aCurPar1; }
     OUString        GetCurFldPar2() const { return aCurPar2; }
-    inline sal_uLong   GetCurFldFmt() const;
+    inline sal_uIntPtr   GetCurFldFmt() const;
 
     // determine a field
     SwField*        GetCurFld();
@@ -196,9 +197,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_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);
+    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);
 
     // turn off evaluation of expression fields for insertation
     // of many expressino fields (see labels)
@@ -210,7 +211,7 @@ public:
 inline void SwFldMgr::SetEvalExpFlds(sal_Bool bEval)
     { bEvalExp = bEval; }
 
-inline sal_uLong SwFldMgr::GetCurFldFmt() const
+inline sal_uIntPtr SwFldMgr::GetCurFldFmt() const
     { return nCurFmt; }
 
 #endif
diff --git a/sw/source/ui/inc/initui.hxx b/sw/source/ui/inc/initui.hxx
index 7b39f2b48084..cb4a406202c6 100644
--- a/sw/source/ui/inc/initui.hxx
+++ b/sw/source/ui/inc/initui.hxx
@@ -19,7 +19,6 @@
 #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"