fdo#63154 Removed unused solar.h reference

Change-Id: I6b2f9e04e2232570c8bb9f36252b23a70c5f7525
Reviewed-on: https://gerrit.libreoffice.org/7604Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx

@@ -30,9 +30,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase4.hxx>
 #include <comphelper/accessibletexthelper.hxx>
-#include <tools/solar.h>
-
-// class VCLXAccessibleToolBoxItem ---------------------------------------------
 
 class ToolBox;
 

include/toolkit/helper/servicenames.hxx

@@ -21,7 +21,6 @@
 #define INCLUDED_TOOLKIT_HELPER_SERVICENAMES_HXX
 
 #include <sal/types.h>
-#include <tools/solar.h>
 
 extern const sal_Char szServiceName_Toolkit[], szServiceName2_Toolkit[];
 extern const sal_Char szServiceName_MVCIntrospection[], szServiceName2_MVCIntrospection[];

include/unotools/charclass.hxx

@@ -24,7 +24,6 @@
 
 #include <boost/noncopyable.hpp>
 #include <i18nlangtag/languagetag.hxx>
-#include <tools/solar.h>
 #include <com/sun/star/i18n/KCharacterType.hpp>
 #include <com/sun/star/i18n/KParseTokens.hpp>
 #include <com/sun/star/i18n/KParseType.hpp>

include/unotools/defaultoptions.hxx

@@ -21,13 +21,10 @@
 
 #include <unotools/unotoolsdllapi.h>
 #include <rtl/ustring.hxx>
-#include <tools/solar.h>
 #include <unotools/options.hxx>
 
 class SvtDefaultOptions_Impl;
 
-// class SvtDefaultOptions -----------------------------------------------
-
 class SvtDefaultOptions_Impl;
 class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtDefaultOptions : public utl::detail::Options
 {

include/unotools/lingucfg.hxx

@@ -26,19 +26,15 @@
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
-#include <tools/solar.h>
 #include <rtl/ustring.hxx>
 #include <unotools/configitem.hxx>
 #include <osl/mutex.hxx>
 #include <unotools/options.hxx>
 #include <i18nlangtag/lang.h>
-
 #include <vector>
 
 class SvtLinguConfigItem;
 
-//////////////////////////////////////////////////////////////////////
-
 struct UNOTOOLS_DLLPUBLIC SvtLinguOptions
 {
     ::com::sun::star::uno::Sequence< OUString >    aActiveDics;
@@ -131,8 +127,6 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguOptions
     SvtLinguOptions();
 };
 
-//////////////////////////////////////////////////////////////////////
-
 struct UNOTOOLS_DLLPUBLIC SvtLinguConfigDictionaryEntry
 {
     // the URL's pointing to the location of the files the dictionary consists of
@@ -143,8 +137,6 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguConfigDictionaryEntry
     com::sun::star::uno::Sequence< OUString >  aLocaleNames;
 };
 
-//////////////////////////////////////////////////////////////////////
-
 class UNOTOOLS_DLLPUBLIC SvtLinguConfig: public utl::detail::Options
 {
     // returns static object
@@ -221,8 +213,6 @@ public:
     bool                HasGrammarChecker() const;
 };
 
-//////////////////////////////////////////////////////////////////////
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/unotools/misccfg.hxx

@@ -20,7 +20,6 @@
 #define INCLUDED_UNOTOOLS_MISCCFG_HXX
 
 #include <unotools/unotoolsdllapi.h>
-#include <tools/solar.h>
 #include <unotools/options.hxx>
 
 namespace utl

include/unotools/searchopt.hxx

@@ -21,7 +21,6 @@
 #define INCLUDED_UNOTOOLS_SEARCHOPT_HXX
 
 #include <unotools/unotoolsdllapi.h>
-#include <tools/solar.h>
 
 class SvtSearchOptions_Impl;
 

include/unotools/transliterationwrapper.hxx

@@ -20,8 +20,8 @@
 
 #ifndef INCLUDED_UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
 #define INCLUDED_UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
+
 #include <rtl/ustring.hxx>
-#include <tools/solar.h>
 #include <i18nlangtag/languagetag.hxx>
 #include <com/sun/star/i18n/XExtendedTransliteration.hpp>
 
@@ -124,9 +124,7 @@ public:
 
 };
 
-// ............................................................................
 }       // namespace utl
-// ............................................................................
 
 #endif
 

toolkit/source/helper/servicenames.cxx

@@ -18,8 +18,6 @@
  */
 
 #include <sal/types.h>
-#include <tools/solar.h>
-
 #include <toolkit/helper/servicenames.hxx>
 
 const sal_Char szServiceName_Toolkit[] = "stardiv.vcl.VclToolkit", szServiceName2_Toolkit[] = "com.sun.star.awt.Toolkit";

unotools/source/config/searchopt.cxx

@@ -19,7 +19,6 @@
 
 
 #include <unotools/searchopt.hxx>
-#include <tools/solar.h>
 #include <tools/debug.hxx>
 #include <unotools/configitem.hxx>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
@@ -28,7 +27,6 @@
 #include <com/sun/star/uno/Any.h>
 #include <sal/macros.h>
 
-
 using namespace utl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::i18n;
@@ -36,8 +34,6 @@ using namespace com::sun::star::i18n;
 
 #define MAX_FLAGS_OFFSET    26
 
-//////////////////////////////////////////////////////////////////////
-
 
 class SvtSearchOptions_Impl : public ConfigItem
 {
@@ -70,7 +66,6 @@ public:
 };
 
 
-
 SvtSearchOptions_Impl::SvtSearchOptions_Impl() :
     ConfigItem( OUString("Office.Common/SearchOptions") )
 {
@@ -96,14 +91,12 @@ void SvtSearchOptions_Impl::Notify( const Sequence< OUString >&  )
 {
 }
 
-
 sal_Bool SvtSearchOptions_Impl::GetFlag( sal_uInt16 nOffset ) const
 {
     DBG_ASSERT( nOffset <= MAX_FLAGS_OFFSET, "offset out of range");
     return ((nFlags >> nOffset) & 0x01) ? sal_True : sal_False;
 }
 
-
 void SvtSearchOptions_Impl::SetFlag( sal_uInt16 nOffset, sal_Bool bVal )
 {
     DBG_ASSERT( nOffset <= MAX_FLAGS_OFFSET, "offset out of range");
@@ -117,7 +110,6 @@ void SvtSearchOptions_Impl::SetFlag( sal_uInt16 nOffset, sal_Bool bVal )
         SetModified( sal_True );
 }
 
-
 void SvtSearchOptions_Impl::SetModified( sal_Bool bVal )
 {
     bModified = bVal;
@@ -127,7 +119,6 @@ void SvtSearchOptions_Impl::SetModified( sal_Bool bVal )
     }
 }
 
-
 Sequence< OUString > SvtSearchOptions_Impl::GetPropertyNames() const
 {
     static const char* aPropNames[ MAX_FLAGS_OFFSET + 1 ] =
@@ -171,7 +162,6 @@ Sequence< OUString > SvtSearchOptions_Impl::GetPropertyNames() const
     return aNames;
 }
 
-
 sal_Bool SvtSearchOptions_Impl::Load()
 {
     sal_Bool bSucc = sal_False;
@@ -225,7 +215,6 @@ sal_Bool SvtSearchOptions_Impl::Load()
     return bSucc;
 }
 
-
 sal_Bool SvtSearchOptions_Impl::Save()
 {
     sal_Bool bSucc = sal_False;
@@ -251,21 +240,16 @@ sal_Bool SvtSearchOptions_Impl::Save()
     return bSucc;
 }
 
-
-//////////////////////////////////////////////////////////////////////
-
 SvtSearchOptions::SvtSearchOptions()
 {
     pImpl = new SvtSearchOptions_Impl;
 }
 
-
 SvtSearchOptions::~SvtSearchOptions()
 {
     delete pImpl;
 }
 
-
 sal_Int32 SvtSearchOptions::GetTransliterationFlags() const
 {
     sal_Int32 nRes = 0;
@@ -313,37 +297,31 @@ sal_Int32 SvtSearchOptions::GetTransliterationFlags() const
     return nRes;
 }
 
-
 sal_Bool SvtSearchOptions::IsWholeWordsOnly() const
 {
     return pImpl->GetFlag( 0 );
 }
 
-
 void SvtSearchOptions::SetWholeWordsOnly( sal_Bool bVal )
 {
     pImpl->SetFlag( 0, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsBackwards() const
 {
     return pImpl->GetFlag( 1 );
 }
 
-
 void SvtSearchOptions::SetBackwards( sal_Bool bVal )
 {
     pImpl->SetFlag( 1, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsUseRegularExpression() const
 {
     return pImpl->GetFlag( 2 );
 }
 
-
 void SvtSearchOptions::SetUseRegularExpression( sal_Bool bVal )
 {
     pImpl->SetFlag( 2, bVal );
@@ -354,253 +332,211 @@ void SvtSearchOptions::SetSearchForStyles( sal_Bool bVal )
     pImpl->SetFlag( 3, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsSimilaritySearch() const
 {
     return pImpl->GetFlag( 4 );
 }
 
-
 void SvtSearchOptions::SetSimilaritySearch( sal_Bool bVal )
 {
     pImpl->SetFlag( 4, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsUseAsianOptions() const
 {
     return pImpl->GetFlag( 5 );
 }
 
-
 void SvtSearchOptions::SetUseAsianOptions( sal_Bool bVal )
 {
     pImpl->SetFlag( 5, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsMatchCase() const
 {
     return pImpl->GetFlag( 6 );
 }
 
-
 void SvtSearchOptions::SetMatchCase( sal_Bool bVal )
 {
     pImpl->SetFlag( 6, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsMatchFullHalfWidthForms() const
 {
     return pImpl->GetFlag( 7 );
 }
 
-
 void SvtSearchOptions::SetMatchFullHalfWidthForms( sal_Bool bVal )
 {
     pImpl->SetFlag( 7, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsMatchHiraganaKatakana() const
 {
     return pImpl->GetFlag( 8 );
 }
 
-
 void SvtSearchOptions::SetMatchHiraganaKatakana( sal_Bool bVal )
 {
     pImpl->SetFlag( 8, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsMatchContractions() const
 {
     return pImpl->GetFlag( 9 );
 }
 
-
 void SvtSearchOptions::SetMatchContractions( sal_Bool bVal )
 {
     pImpl->SetFlag( 9, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsMatchMinusDashChoon() const
 {
     return pImpl->GetFlag( 10 );
 }
 
-
 void SvtSearchOptions::SetMatchMinusDashChoon( sal_Bool bVal )
 {
     pImpl->SetFlag( 10, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsMatchRepeatCharMarks() const
 {
     return pImpl->GetFlag( 11 );
 }
 
-
 void SvtSearchOptions::SetMatchRepeatCharMarks( sal_Bool bVal )
 {
     pImpl->SetFlag( 11, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsMatchVariantFormKanji() const
 {
     return pImpl->GetFlag( 12 );
 }
 
-
 void SvtSearchOptions::SetMatchVariantFormKanji( sal_Bool bVal )
 {
     pImpl->SetFlag( 12, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsMatchOldKanaForms() const
 {
     return pImpl->GetFlag( 13 );
 }
 
-
 void SvtSearchOptions::SetMatchOldKanaForms( sal_Bool bVal )
 {
     pImpl->SetFlag( 13, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsMatchDiziDuzu() const
 {
     return pImpl->GetFlag( 14 );
 }
 
-
 void SvtSearchOptions::SetMatchDiziDuzu( sal_Bool bVal )
 {
     pImpl->SetFlag( 14, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsMatchBavaHafa() const
 {
     return pImpl->GetFlag( 15 );
 }
 
-
 void SvtSearchOptions::SetMatchBavaHafa( sal_Bool bVal )
 {
     pImpl->SetFlag( 15, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsMatchTsithichiDhizi() const
 {
     return pImpl->GetFlag( 16 );
 }
 
-
 void SvtSearchOptions::SetMatchTsithichiDhizi( sal_Bool bVal )
 {
     pImpl->SetFlag( 16, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsMatchHyuiyuByuvyu() const
 {
     return pImpl->GetFlag( 17 );
 }
 
-
 void SvtSearchOptions::SetMatchHyuiyuByuvyu( sal_Bool bVal )
 {
     pImpl->SetFlag( 17, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsMatchSesheZeje() const
 {
     return pImpl->GetFlag( 18 );
 }
 
-
 void SvtSearchOptions::SetMatchSesheZeje( sal_Bool bVal )
 {
     pImpl->SetFlag( 18, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsMatchIaiya() const
 {
     return pImpl->GetFlag( 19 );
 }
 
-
 void SvtSearchOptions::SetMatchIaiya( sal_Bool bVal )
 {
     pImpl->SetFlag( 19, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsMatchKiku() const
 {
     return pImpl->GetFlag( 20 );
 }
 
-
 void SvtSearchOptions::SetMatchKiku( sal_Bool bVal )
 {
     pImpl->SetFlag( 20, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsIgnorePunctuation() const
 {
     return pImpl->GetFlag( 21 );
 }
 
-
 void SvtSearchOptions::SetIgnorePunctuation( sal_Bool bVal )
 {
     pImpl->SetFlag( 21, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsIgnoreWhitespace() const
 {
     return pImpl->GetFlag( 22 );
 }
 
-
 void SvtSearchOptions::SetIgnoreWhitespace( sal_Bool bVal )
 {
     pImpl->SetFlag( 22, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsIgnoreProlongedSoundMark() const
 {
     return pImpl->GetFlag( 23 );
 }
 
-
 void SvtSearchOptions::SetIgnoreProlongedSoundMark( sal_Bool bVal )
 {
     pImpl->SetFlag( 23, bVal );
 }
 
-
 sal_Bool SvtSearchOptions::IsIgnoreMiddleDot() const
 {
     return pImpl->GetFlag( 24 );
 }
 
-
 void SvtSearchOptions::SetIgnoreMiddleDot( sal_Bool bVal )
 {
     pImpl->SetFlag( 24, bVal );
@@ -608,13 +544,12 @@ void SvtSearchOptions::SetIgnoreMiddleDot( sal_Bool bVal )
 
 sal_Bool SvtSearchOptions::IsNotes() const
 {
-        return pImpl->GetFlag( 25 );
+    return pImpl->GetFlag( 25 );
 }
 
-
 void SvtSearchOptions::SetNotes( sal_Bool bVal )
 {
-        pImpl->SetFlag( 25, bVal );
+    pImpl->SetFlag( 25, bVal );
 }
 
 sal_Bool SvtSearchOptions::IsIgnoreDiacritics_CTL() const
@@ -627,6 +562,4 @@ void SvtSearchOptions::SetIgnoreDiacritics_CTL( sal_Bool bVal )
     pImpl->SetFlag( 26, bVal );
 }
 
-//////////////////////////////////////////////////////////////////////
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

unotools/source/config/useroptions.cxx

@@ -23,7 +23,6 @@
 #include <unotools/configmgr.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <tools/solar.h>
 #include <osl/mutex.hxx>
 #include <rtl/instance.hxx>
 #include "itemholder1.hxx"
@@ -74,8 +73,6 @@ const sal_uInt16 nOptionNameCount = SAL_N_ELEMENTS(vOptionNames);
 
 boost::weak_ptr<SvtUserOptions::Impl> SvtUserOptions::pSharedImpl;
 
-// class ChangeListener --------------------------------------------------
-
 class SvtUserOptions::ChangeListener : public cppu::WeakImplHelper1<util::XChangesListener>
 {
 public:
@@ -90,8 +87,6 @@ private:
     Impl& m_rParent;
 };
 
-// class Impl ------------------------------------------------------------
-
 class SvtUserOptions::Impl : public utl::ConfigurationBroadcaster
 {
 public:
@@ -110,8 +105,6 @@ private:
     uno::Reference<beans::XPropertySet>    m_xData;
 };
 
-// class SvtUserOptions::ChangeListener ----------------------------------
-
 void SvtUserOptions::ChangeListener::changesOccurred (util::ChangesEvent const& rEvent) throw(uno::RuntimeException)
 {
     if (rEvent.Changes.getLength())
@@ -130,8 +123,6 @@ void SvtUserOptions::ChangeListener::disposing (lang::EventObject const& rSource
     }
 }
 
-// class SvtUserOptions::Impl --------------------------------------------
-
 SvtUserOptions::Impl::Impl() :
     m_xChangeListener( new ChangeListener(*this) )
 {
@@ -163,8 +154,6 @@ SvtUserOptions::Impl::Impl() :
     }
 }
 
-// -----------------------------------------------------------------------
-
 OUString SvtUserOptions::Impl::GetToken (sal_uInt16 nToken) const
 {
     OUString sToken;
@@ -185,8 +174,6 @@ OUString SvtUserOptions::Impl::GetToken (sal_uInt16 nToken) const
     return sToken;
 }
 
-// -----------------------------------------------------------------------
-
 void SvtUserOptions::Impl::SetToken (sal_uInt16 nToken, OUString const& sToken)
 {
     if (nToken < nOptionNameCount)
@@ -206,8 +193,6 @@ void SvtUserOptions::Impl::SetToken (sal_uInt16 nToken, OUString const& sToken)
         SAL_WARN("unotools.config", "SvtUserOptions::Impl::GetToken(): invalid token");
 }
 
-// -----------------------------------------------------------------------
-
 OUString SvtUserOptions::Impl::GetFullName () const
 {
     // TODO international name
@@ -218,15 +203,11 @@ OUString SvtUserOptions::Impl::GetFullName () const
     return sFullName;
 }
 
-// -----------------------------------------------------------------------
-
 void SvtUserOptions::Impl::Notify ()
 {
     NotifyListeners(0);
 }
 
-// -----------------------------------------------------------------------
-
 sal_Bool SvtUserOptions::Impl::IsTokenReadonly (sal_uInt16 nToken) const
 {
     if (nToken < nOptionNameCount)
@@ -244,8 +225,6 @@ sal_Bool SvtUserOptions::Impl::IsTokenReadonly (sal_uInt16 nToken) const
     }
 }
 
-// class SvtUserOptions --------------------------------------------------
-
 SvtUserOptions::SvtUserOptions ()
 {
     // Global access, must be guarded (multithreading)
@@ -261,8 +240,6 @@ SvtUserOptions::SvtUserOptions ()
     pImpl->AddListener(this);
 }
 
-// -----------------------------------------------------------------------
-
 SvtUserOptions::~SvtUserOptions()
 {
     // Global access, must be guarded (multithreading)
@@ -270,8 +247,6 @@ SvtUserOptions::~SvtUserOptions()
     pImpl->RemoveListener(this);
 }
 
-// -----------------------------------------------------------------------
-
 namespace
 {
     class theUserOptionsMutex : public rtl::Static<osl::Mutex, theUserOptionsMutex>{};
@@ -282,11 +257,7 @@ osl::Mutex& SvtUserOptions::GetInitMutex()
     return theUserOptionsMutex::get();
 }
 
-// -----------------------------------------------------------------------
 
-//
-// getters
-//
 OUString SvtUserOptions::GetCompany        () const { return GetToken(USER_OPT_COMPANY); }
 OUString SvtUserOptions::GetFirstName      () const { return GetToken(USER_OPT_FIRSTNAME); }
 OUString SvtUserOptions::GetLastName       () const { return GetToken(USER_OPT_LASTNAME); }
@@ -304,39 +275,27 @@ OUString SvtUserOptions::GetFax            () const { return GetToken(USER_OPT_F
 OUString SvtUserOptions::GetEmail          () const { return GetToken(USER_OPT_EMAIL); }
 OUString SvtUserOptions::GetCustomerNumber () const { return GetToken(USER_OPT_CUSTOMERNUMBER); }
 
-// -----------------------------------------------------------------------
 
-//
-// setters
-//
 void SvtUserOptions::SetCustomerNumber (OUString const& sToken) { SetToken(USER_OPT_CUSTOMERNUMBER, sToken); }
 
-// -----------------------------------------------------------------------
-
 sal_Bool SvtUserOptions::IsTokenReadonly (sal_uInt16 nToken) const
 {
     osl::MutexGuard aGuard(GetInitMutex());
     return pImpl->IsTokenReadonly(nToken);
 }
 
-// -----------------------------------------------------------------------
-
 OUString SvtUserOptions::GetToken (sal_uInt16 nToken) const
 {
     osl::MutexGuard aGuard(GetInitMutex());
     return pImpl->GetToken(nToken);
 }
 
-// -----------------------------------------------------------------------
-
 void SvtUserOptions::SetToken (sal_uInt16 nToken, OUString const& rNewToken)
 {
     osl::MutexGuard aGuard(GetInitMutex());
     pImpl->SetToken(nToken, rNewToken);
 }
 
-// -----------------------------------------------------------------------
-
 OUString SvtUserOptions::GetFullName () const
 {
     osl::MutexGuard aGuard(GetInitMutex());