fdo#63154 Removed unused solar.h ref. in svl

Change-Id: I0452b1fa83c52a7466a025259b086e82ec1dba83
Reviewed-on: https://gerrit.libreoffice.org/7734
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

14 files changed, 11 insertions, 71 deletions

diff --git a/include/svl/converter.hxx b/include/svl/converter.hxx
index 64364f0ceb85..82d22154b66a 100644
--- a/include/svl/converter.hxx
+++ b/include/svl/converter.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SVL_CONVERTER_HXX
 
 #include <svl/svldllapi.h>
-#include <tools/solar.h>
 
 class SvDbaseConverter
 {
diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx
index a5510a62d5f6..6f0e7dfd0c33 100644
--- a/include/svl/flagitem.hxx
+++ b/include/svl/flagitem.hxx
@@ -19,15 +19,12 @@
 #ifndef INCLUDED_SVL_FLAGITEM_HXX
 #define INCLUDED_SVL_FLAGITEM_HXX
 
+#include <svl/poolitem.hxx>
 #include <svl/svldllapi.h>
-#include <tools/solar.h>
 #include <tools/rtti.hxx>
-#include <svl/poolitem.hxx>
 
 class SvStream;
 
-// -----------------------------------------------------------------------
-
 DBG_NAMEEX_VISIBILITY(SfxFlagItem, SVL_DLLPUBLIC)
 
 class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem
diff --git a/include/svl/fstathelper.hxx b/include/svl/fstathelper.hxx
index 3409b3a88f92..6f92c01fe117 100644
--- a/include/svl/fstathelper.hxx
+++ b/include/svl/fstathelper.hxx
@@ -20,9 +20,8 @@
 #ifndef INCLUDED_SVL_FSTATHELPER_HXX
 #define INCLUDED_SVL_FSTATHELPER_HXX
 
-#include <svl/svldllapi.h>
 #include <rtl/ustring.hxx>
-#include <tools/solar.h>
+#include <svl/svldllapi.h>
 
 class Date;
 class Time;
diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx
index 05385eac45c2..11c862669a72 100644
--- a/include/svl/globalnameitem.hxx
+++ b/include/svl/globalnameitem.hxx
@@ -20,13 +20,10 @@
 #define INCLUDED_SVL_GLOBALNAMEITEM_HXX
 
 #include <svl/svldllapi.h>
-#include <tools/solar.h>
 #include <tools/rtti.hxx>
 #include <tools/globname.hxx>
 #include <svl/poolitem.hxx>
 
-// -----------------------------------------------------------------------
-
 class SVL_DLLPUBLIC SfxGlobalNameItem: public SfxPoolItem
 {
     SvGlobalName            m_aName;
diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx
index 5cb34f4fffaf..0e7216bbac8e 100644
--- a/include/svl/inethist.hxx
+++ b/include/svl/inethist.hxx
@@ -19,17 +19,11 @@
 #ifndef INCLUDED_SVL_INETHIST_HXX
 #define INCLUDED_SVL_INETHIST_HXX
 
-#include <svl/svldllapi.h>
-#include <tools/solar.h>
-#include <tools/urlobj.hxx>
 #include <svl/brdcst.hxx>
 #include <svl/hint.hxx>
+#include <svl/svldllapi.h>
+#include <tools/urlobj.hxx>
 
-/*========================================================================
- *
- * INetURLHistory interface.
- *
- *=======================================================================*/
 class INetURLHistory_Impl;
 class INetURLHistory : public SfxBroadcaster
 {
@@ -112,11 +106,7 @@ public:
     }
 };
 
-/*========================================================================
- *
- * INetURLHistoryHint (broadcasted from PutUrl()).
- *
- *=======================================================================*/
+// broadcasted from PutUrl().
 DECL_PTRHINT (SVL_DLLPUBLIC, INetURLHistoryHint, const INetURLObject);
 
 #endif // INCLUDED_SVL_INETHIST_HXX
diff --git a/include/svl/itemiter.hxx b/include/svl/itemiter.hxx
index 44d042293edd..bc6cca2a36fa 100644
--- a/include/svl/itemiter.hxx
+++ b/include/svl/itemiter.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SVL_ITEMITER_HXX
 
 #include <svl/svldllapi.h>
-#include <tools/solar.h>
 #include <svl/itemset.hxx>
 
 class SfxPoolItem;
diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx
index 757615e2033d..64f4afd00452 100644
--- a/include/svl/itemprop.hxx
+++ b/include/svl/itemprop.hxx
@@ -19,13 +19,12 @@
 #ifndef INCLUDED_SVL_ITEMPROP_HXX
 #define INCLUDED_SVL_ITEMPROP_HXX
 
-#include <svl/svldllapi.h>
-#include <tools/solar.h>
-#include <svl/itemset.hxx>
-#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <cppuhelper/implbase1.hxx>
+#include <svl/itemset.hxx>
+#include <svl/svldllapi.h>
 #include <vector>
 
 struct SfxItemPropertyMapEntry
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index a4710697a0f8..26ba3f33fe84 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -24,7 +24,6 @@
 #include <cstdarg>
 #include <svl/poolitem.hxx>
 #include <tools/rtti.hxx>
-#include <tools/solar.h>
 
 class SfxItemPool;
 class SfxPoolItem;
@@ -39,14 +38,10 @@ typedef SfxPoolItem const** SfxItemArray;
 #endif
 #define DBG(s)
 
-//========================================================================
-
 #define SFX_ITEMSET_GET( rSet, pItem, ItemType, nSlotId, bDeep ) \
     const ItemType *pItem = (const ItemType*) \
                             (rSet).GetItem( nSlotId, bDeep, TYPE(ItemType) )
 
-//========================================================================
-
 class SVL_DLLPUBLIC SfxItemSet
 {
     friend class SfxItemIter;
@@ -57,7 +52,6 @@ class SVL_DLLPUBLIC SfxItemSet
     sal_uInt16*                     _pWhichRanges;  // Array von Which-Bereichen
     sal_uInt16                      _nCount;        // Anzahl Items
 
-    //---------------------------------------------------------------------
 #ifndef _SFXITEMS_HXX
 
 friend class SfxItemPoolCache;
@@ -73,7 +67,6 @@ public:
     SfxItemArray                GetItems_Impl() const { return _aItems; }
 
 #endif
-    //---------------------------------------------------------------------
 
 private:
     const SfxItemSet&           operator=(const SfxItemSet &);   // n.i.!!
@@ -153,8 +146,6 @@ public:
     virtual int                 operator==(const SfxItemSet &) const;
 };
 
-// --------------- Inline Implementierungen ------------------------
-
 inline void SfxItemSet::SetParent( const SfxItemSet* pNew )
 {
     DBG( if (_pParent) --*_pChildCount(_pParent) );
@@ -162,8 +153,6 @@ inline void SfxItemSet::SetParent( const SfxItemSet* pNew )
     DBG( if (_pParent) ++*_pChildCount(_pParent) );
 }
 
-//========================================================================
-
 class SVL_DLLPUBLIC SfxAllItemSet: public SfxItemSet
 
 /*  versteht alle Ranges; werden durch das Putten der Items
diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx
index 102a851b095b..d2c6b2f40249 100644
--- a/include/svl/lckbitem.hxx
+++ b/include/svl/lckbitem.hxx
@@ -19,13 +19,10 @@
 #ifndef INCLUDED_SVL_LCKBITEM_HXX
 #define INCLUDED_SVL_LCKBITEM_HXX
 
+#include <svl/poolitem.hxx>
 #include <svl/svldllapi.h>
-#include <tools/solar.h>
 #include <tools/rtti.hxx>
 #include <tools/stream.hxx>
-#include <svl/poolitem.hxx>
-
-// -----------------------------------------------------------------------
 
 class SVL_DLLPUBLIC SfxLockBytesItem : public SfxPoolItem
 {
diff --git a/include/svl/nranges.hxx b/include/svl/nranges.hxx
index ec4a5503de83..497f3a1b296b 100644
--- a/include/svl/nranges.hxx
+++ b/include/svl/nranges.hxx
@@ -26,10 +26,6 @@
 #ifndef INCLUDED_SVL_NRANGES_HXX
 #define INCLUDED_SVL_NRANGES_HXX
 
-#include <tools/solar.h>
-
-//========================================================================
-
 class SfxUShortRanges
 {
     sal_uInt16*                 _pRanges; // 0-terminated array of sal_uInt16-pairs
diff --git a/include/svl/poolcach.hxx b/include/svl/poolcach.hxx
index 6eeb552ba5b1..f987b9b2e2c2 100644
--- a/include/svl/poolcach.hxx
+++ b/include/svl/poolcach.hxx
@@ -20,11 +20,8 @@
 #define INCLUDED_SVL_POOLCACH_HXX
 
 #include <svl/svldllapi.h>
-#include <tools/solar.h>
 #include <vector>
 
-//------------------------------------------------------------------------
-
 class SfxItemPool;
 class SfxItemSet;
 class SfxPoolItem;
diff --git a/include/svl/urihelper.hxx b/include/svl/urihelper.hxx
index 57e2c14eef0f..bd90e68fd9ef 100644
--- a/include/svl/urihelper.hxx
+++ b/include/svl/urihelper.hxx
@@ -20,12 +20,11 @@
 #ifndef INCLUDED_SVL_URIHELPER_HXX
 #define INCLUDED_SVL_URIHELPER_HXX
 
-#include <svl/svldllapi.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <rtl/textenc.h>
+#include <svl/svldllapi.h>
 #include <tools/link.hxx>
-#include <tools/solar.h>
 #include <tools/urlobj.hxx>
 
 namespace com { namespace sun { namespace star {
@@ -35,7 +34,6 @@ namespace com { namespace sun { namespace star {
 
 class CharClass;
 
-//============================================================================
 namespace URIHelper {
 
 /**
@@ -62,10 +60,8 @@ SVL_DLLPUBLIC OUString SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
                                     bool bRelativeNonURIs = false,
                                     INetURLObject::FSysStyle eStyle = INetURLObject::FSYS_DETECT);
 
-//============================================================================
 SVL_DLLPUBLIC void SetMaybeFileHdl(Link const & rTheMaybeFileHdl);
 
-//============================================================================
 SVL_DLLPUBLIC Link GetMaybeFileHdl();
 
 /**
@@ -119,7 +115,6 @@ normalizedMakeRelative(
 SVL_DLLPUBLIC OUString simpleNormalizedMakeRelative( OUString const & baseUriReference,
                                                      OUString const & uriReference);
 
-//============================================================================
 SVL_DLLPUBLIC OUString FindFirstURLInText(OUString const & rText,
                                           sal_Int32 & rBegin,
                                           sal_Int32 & rEnd,
@@ -128,7 +123,6 @@ SVL_DLLPUBLIC OUString FindFirstURLInText(OUString const & rText,
                                           rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
                                           INetURLObject::FSysStyle eStyle = INetURLObject::FSYS_DETECT);
 
-//============================================================================
 /** Remove any password component from both absolute and relative URLs.
 
     @ATT  The current implementation will not remove a password from a
diff --git a/include/svl/whiter.hxx b/include/svl/whiter.hxx
index 051078b87a27..e23633e62508 100644
--- a/include/svl/whiter.hxx
+++ b/include/svl/whiter.hxx
@@ -19,16 +19,11 @@
 #ifndef INCLUDED_SVL_WHITER_HXX
 #define INCLUDED_SVL_WHITER_HXX
 
-#include <svl/svldllapi.h>
-
 #include <limits.h>
-#include <tools/solar.h>
+#include <svl/svldllapi.h>
 
 class SfxItemSet;
 
-
-// INCLUDE ---------------------------------------------------------------
-
 class SVL_DLLPUBLIC SfxWhichIter
 {
     const sal_uInt16 *pRanges, *pStart;
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 1a5638cbba63..81eeaf62feb7 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -22,7 +22,6 @@
 #include <svl/svldllapi.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
-#include <tools/solar.h>
 #include <i18nlangtag/lang.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/Locale.hpp>
@@ -928,14 +927,11 @@ public:
             return m_xContext;
         }
 
-
-
     //! The following method is not to be used from outside but must be
     //! public for the InputScanner.
     // return the current FormatScanner
     inline const ImpSvNumberformatScan* GetFormatScanner() const { return pFormatScanner; }
 
-
     //! The following methods are not to be used from outside but must be
     //! public for the InputScanner and FormatScanner.
 
@@ -980,9 +976,6 @@ public:
 
 };
 
-
-// --------------------------- inline --------------------------------------
-
 inline sal_uInt32 SvNumberFormatter::GetMergeFmtIndex( sal_uInt32 nOldFmt ) const
 {
     if (pMergeTable)
@@ -1001,7 +994,6 @@ inline bool SvNumberFormatter::HasMergeFmtTbl() const
     return pMergeTable && !pMergeTable->empty();
 }
 
-
 // static
 inline sal_uInt16 SvNumberFormatter::ExpandTwoDigitYear( sal_uInt16 nYear, sal_uInt16 nTwoDigitYearStart )
 {