diff options
56 files changed, 0 insertions, 1103 deletions
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 70e53b039db1..6609563a815e 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -58,15 +58,6 @@ using namespace com::sun::star; -// STATIC DATA ----------------------------------------------------------- - -static sal_uInt16 pSortRanges[] = -{ - SID_SORT, - SID_SORT, - 0 -}; - // ----------------------------------------------------------------------- /* @@ -174,13 +165,6 @@ void ScTabPageSortFields::Init() aFlArr[2] = &aFlSort3; } -//------------------------------------------------------------------------ - -sal_uInt16* ScTabPageSortFields::GetRanges() -{ - return pSortRanges; -} - // ----------------------------------------------------------------------- SfxTabPage* ScTabPageSortFields::Create( Window* pParent, @@ -690,13 +674,6 @@ void ScTabPageSortOptions::Init() aLbLanguage.InsertLanguage( LANGUAGE_SYSTEM ); } -//------------------------------------------------------------------------ - -sal_uInt16* ScTabPageSortOptions::GetRanges() -{ - return pSortRanges; -} - // ----------------------------------------------------------------------- SfxTabPage* ScTabPageSortOptions::Create( diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 14332e5e7a78..c2bc52f0f37c 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ - #undef SC_DLLIMPLEMENTATION #include "scitems.hxx" @@ -42,15 +41,6 @@ #include "subtdlg.hrc" #include "tpsubt.hxx" -// STATIC DATA ----------------------------------------------------------- - -static sal_uInt16 pSubTotalsRanges[] = -{ - SID_SUBTOTALS, - SID_SUBTOTALS, - 0 -}; - //======================================================================== // Zwischenergebnisgruppen-Tabpage: @@ -126,13 +116,6 @@ void ScTpSubTotalGroup::Init() FillListBoxes(); } -//------------------------------------------------------------------------ - -sal_uInt16* ScTpSubTotalGroup::GetRanges() -{ - return pSubTotalsRanges; -} - // ----------------------------------------------------------------------- bool ScTpSubTotalGroup::DoReset( sal_uInt16 nGroupNo, diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 9ab7c107561b..c680b0b38f3e 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -46,7 +46,6 @@ class ScTpCalcOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - static sal_uInt16* GetRanges (); virtual sal_Bool FillItemSet ( SfxItemSet& rCoreSet ); virtual void Reset ( const SfxItemSet& rCoreSet ); using SfxTabPage::DeactivatePage; diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index 7aa00147fa64..20edfd036e62 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -46,7 +46,6 @@ class ScTpPrintOptions : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - static sal_uInt16* GetRanges(); virtual sal_Bool FillItemSet( SfxItemSet& rCoreSet ); virtual void Reset( const SfxItemSet& rCoreSet ); using SfxTabPage::DeactivatePage; diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 059a5f4f7da5..987f20bb813d 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -62,7 +62,6 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - static sal_uInt16* GetRanges (); virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); @@ -141,7 +140,6 @@ public: #define SfxTabPage ::SfxTabPage static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - static sal_uInt16* GetRanges (); virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 8accbe98279b..d3f987e17336 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -55,7 +55,6 @@ protected: public: virtual ~ScTpSubTotalGroup(); - static sal_uInt16* GetRanges (); bool DoReset ( sal_uInt16 nGroupNo, const SfxItemSet& rArgSet ); bool DoFillItemSet ( sal_uInt16 nGroupNo, @@ -153,7 +152,6 @@ protected: public: virtual ~ScTpSubTotalOptions(); - static sal_uInt16* GetRanges (); static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index bb223580572e..0ba8e3d45757 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -47,7 +47,6 @@ class ScTpUserLists : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rAttrSet ); - static sal_uInt16* GetRanges (); virtual sal_Bool FillItemSet ( SfxItemSet& rCoreAttrs ); virtual void Reset ( const SfxItemSet& rCoreAttrs ); using SfxTabPage::DeactivatePage; diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 853c87b87664..0eb5bf78f00b 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -26,11 +26,8 @@ * ************************************************************************/ - #undef SC_DLLIMPLEMENTATION - - //------------------------------------------------------------------ #include "scitems.hxx" @@ -52,15 +49,6 @@ #include <math.h> -// STATIC DATA ----------------------------------------------------------- - -static sal_uInt16 pCalcOptRanges[] = -{ - SID_SCDOCOPTIONS, - SID_SCDOCOPTIONS, - 0 -}; - //======================================================================== ScTpCalcOptions::ScTpCalcOptions( Window* pParent, @@ -123,13 +111,6 @@ void ScTpCalcOptions::Init() //----------------------------------------------------------------------- -sal_uInt16* ScTpCalcOptions::GetRanges() -{ - return pCalcOptRanges; -} - -//----------------------------------------------------------------------- - SfxTabPage* ScTpCalcOptions::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new ScTpCalcOptions( pParent, rAttrSet ) ); diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index e8cac656ae9b..81850282dfab 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -40,15 +40,6 @@ // ----------------------------------------------------------------------- -static sal_uInt16 pPrintOptRanges[] = -{ - SID_SCPRINTOPTIONS, - SID_SCPRINTOPTIONS, - 0 -}; - -// ----------------------------------------------------------------------- - ScTpPrintOptions::ScTpPrintOptions( Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage ( pParent, @@ -66,11 +57,6 @@ ScTpPrintOptions::~ScTpPrintOptions() { } -sal_uInt16* ScTpPrintOptions::GetRanges() -{ - return pPrintOptRanges; -} - SfxTabPage* ScTpPrintOptions::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new ScTpPrintOptions( pParent, rAttrSet ); diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 5e69b75099b9..46b9037d6d74 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -54,16 +54,8 @@ #define CR (sal_Unicode)13 #define LF (sal_Unicode)10 -static sal_uInt16 pUserListsRanges[] = -{ - SID_SCUSERLISTS, - SID_SCUSERLISTS, - 0 -}; - static const sal_Unicode cDelimiter = ','; - //======================================================================== // Benutzerdefinierte Listen: @@ -165,13 +157,6 @@ void ScTpUserLists::Init() // ----------------------------------------------------------------------- -sal_uInt16* ScTpUserLists::GetRanges() -{ - return pUserListsRanges; -} - -// ----------------------------------------------------------------------- - SfxTabPage* ScTpUserLists::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new ScTpUserLists( pParent, rAttrSet ) ); diff --git a/svl/inc/svl/languageoptions.hxx b/svl/inc/svl/languageoptions.hxx index e4d8f23804a1..f1bc3e55abfc 100644 --- a/svl/inc/svl/languageoptions.hxx +++ b/svl/inc/svl/languageoptions.hxx @@ -82,11 +82,6 @@ public: sal_Bool IsVerticalTextEnabled() const; sal_Bool IsAsianTypographyEnabled() const; sal_Bool IsJapaneseFindEnabled() const; - sal_Bool IsRubyEnabled() const; - sal_Bool IsChangeCaseMapEnabled() const; - sal_Bool IsDoubleLinesEnabled() const; - sal_Bool IsEmphasisMarksEnabled() const; - sal_Bool IsVerticalCallOutEnabled() const; void SetAll( sal_Bool _bSet ); sal_Bool IsAnyEnabled() const; @@ -95,13 +90,10 @@ public: sal_Bool IsCTLFontEnabled() const; void SetCTLSequenceChecking( sal_Bool _bEnabled ); - sal_Bool IsCTLSequenceChecking() const; void SetCTLSequenceCheckingRestricted( sal_Bool _bEnable ); - sal_Bool IsCTLSequenceCheckingRestricted( void ) const; void SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable ); - sal_Bool IsCTLSequenceCheckingTypeAndReplace() const; sal_Bool IsReadOnly(EOption eOption) const; diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx index c750ec9f6312..77f1fce83a3b 100644 --- a/svl/source/config/languageoptions.cxx +++ b/svl/source/config/languageoptions.cxx @@ -89,31 +89,6 @@ sal_Bool SvtLanguageOptions::IsJapaneseFindEnabled() const return m_pCJKOptions->IsJapaneseFindEnabled(); } //------------------------------------------------------------------------------ -sal_Bool SvtLanguageOptions::IsRubyEnabled() const -{ - return m_pCJKOptions->IsRubyEnabled(); -} -//------------------------------------------------------------------------------ -sal_Bool SvtLanguageOptions::IsChangeCaseMapEnabled() const -{ - return m_pCJKOptions->IsChangeCaseMapEnabled(); -} -//------------------------------------------------------------------------------ -sal_Bool SvtLanguageOptions::IsDoubleLinesEnabled() const -{ - return m_pCJKOptions->IsDoubleLinesEnabled(); -} -//------------------------------------------------------------------------------ -sal_Bool SvtLanguageOptions::IsEmphasisMarksEnabled() const -{ - return m_pCJKOptions->IsEmphasisMarksEnabled(); -} -//------------------------------------------------------------------------------ -sal_Bool SvtLanguageOptions::IsVerticalCallOutEnabled() const -{ - return m_pCJKOptions->IsVerticalCallOutEnabled(); -} -//------------------------------------------------------------------------------ void SvtLanguageOptions::SetAll( sal_Bool _bSet ) { m_pCJKOptions->SetAll( _bSet ); @@ -140,32 +115,17 @@ void SvtLanguageOptions::SetCTLSequenceChecking( sal_Bool _bEnabled ) { m_pCTLOptions->SetCTLSequenceChecking( _bEnabled ); } -//------------------------------------------------------------------------------ -sal_Bool SvtLanguageOptions::IsCTLSequenceChecking() const -{ - return m_pCTLOptions->IsCTLSequenceChecking(); -} void SvtLanguageOptions::SetCTLSequenceCheckingRestricted( sal_Bool _bEnable ) { m_pCTLOptions->SetCTLSequenceCheckingRestricted( _bEnable ); } -sal_Bool SvtLanguageOptions::IsCTLSequenceCheckingRestricted( void ) const -{ - return m_pCTLOptions->IsCTLSequenceCheckingRestricted(); -} - void SvtLanguageOptions::SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable ) { m_pCTLOptions->SetCTLSequenceCheckingTypeAndReplace( _bEnable ); } -sal_Bool SvtLanguageOptions::IsCTLSequenceCheckingTypeAndReplace() const -{ - return m_pCTLOptions->IsCTLSequenceCheckingTypeAndReplace(); -} - //------------------------------------------------------------------------------ sal_Bool SvtLanguageOptions::IsReadOnly(SvtLanguageOptions::EOption eOption) const { diff --git a/svtools/inc/svtools/accessibilityoptions.hxx b/svtools/inc/svtools/accessibilityoptions.hxx index 2f964c5e2069..1c219947d971 100644 --- a/svtools/inc/svtools/accessibilityoptions.hxx +++ b/svtools/inc/svtools/accessibilityoptions.hxx @@ -49,7 +49,6 @@ public: virtual ~SvtAccessibilityOptions(); // get & set config entries - sal_Bool GetIsForDrawings() const; // obsolete! sal_Bool GetIsForBorders() const; // obsolete! sal_Bool GetIsForPagePreviews() const; sal_Bool GetIsHelpTipsDisappear() const; diff --git a/svtools/inc/svtools/helpopt.hxx b/svtools/inc/svtools/helpopt.hxx index 020b64c76b94..0e149117305f 100644 --- a/svtools/inc/svtools/helpopt.hxx +++ b/svtools/inc/svtools/helpopt.hxx @@ -83,7 +83,6 @@ public: void SetWelcomeScreen( sal_Bool b ); sal_Bool IsWelcomeScreen() const; - String GetLocale() const; String GetSystem() const; }; diff --git a/svtools/inc/svtools/htmlcfg.hxx b/svtools/inc/svtools/htmlcfg.hxx index 9b35b7b31ca9..9d6c7b682743 100644 --- a/svtools/inc/svtools/htmlcfg.hxx +++ b/svtools/inc/svtools/htmlcfg.hxx @@ -93,9 +93,6 @@ public: sal_Bool IsNumbersEnglishUS() const; void SetNumbersEnglishUS(sal_Bool bSet); - - void AddListenerLink( const Link& rLink ); - void RemoveListenerLink( const Link& rLink ); }; #endif diff --git a/svtools/inc/svtools/menuoptions.hxx b/svtools/inc/svtools/menuoptions.hxx index eb0f83df22c0..00f4100056e2 100644 --- a/svtools/inc/svtools/menuoptions.hxx +++ b/svtools/inc/svtools/menuoptions.hxx @@ -28,19 +28,11 @@ #ifndef INCLUDED_SVTOOLS_MENUOPTIONS_HXX #define INCLUDED_SVTOOLS_MENUOPTIONS_HXX -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include "svtools/svtdllapi.h" #include <sal/types.h> #include <osl/mutex.hxx> #include <unotools/options.hxx> -//_________________________________________________________________________________________________________________ -// forward declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. @@ -51,10 +43,6 @@ class Link; class SvtMenuOptions_Impl; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short collect informations about menu features @descr - @@ -67,16 +55,8 @@ class SvtMenuOptions_Impl; class SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options { - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - public: - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short standard constructor and destructor @descr This will initialize an instance with default values. @@ -98,9 +78,6 @@ class SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options void AddListenerLink( const Link& rLink ); void RemoveListenerLink( const Link& rLink ); - //--------------------------------------------------------------------------------------------------------- - // interface - //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Menu/..." @@ -119,17 +96,9 @@ class SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options *//*-*****************************************************************************************************/ sal_Bool IsEntryHidingEnabled() const; - sal_Bool IsFollowMouseEnabled() const; sal_Int16 GetMenuIconsState() const; - - void SetEntryHidingState( sal_Bool bState ); - void SetFollowMouseState( sal_Bool bState ); void SetMenuIconsState( sal_Int16 bState ); - //------------------------------------------------------------------------------------------------------------- - // private methods - //------------------------------------------------------------------------------------------------------------- - private: /*-****************************************************************************************************//** @@ -148,10 +117,6 @@ class SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options SVT_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); - //------------------------------------------------------------------------------------------------------------- - // private member - //------------------------------------------------------------------------------------------------------------- - private: /*Attention diff --git a/svtools/inc/svtools/miscopt.hxx b/svtools/inc/svtools/miscopt.hxx index eeabc624deff..66eb0c1ddc09 100644 --- a/svtools/inc/svtools/miscopt.hxx +++ b/svtools/inc/svtools/miscopt.hxx @@ -28,10 +28,6 @@ #ifndef INCLUDED_SVTOOLS_MISCOPT_HXX #define INCLUDED_SVTOOLS_MISCOPT_HXX -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include "svtools/svtdllapi.h" #include <sal/types.h> #include <osl/mutex.hxx> @@ -39,10 +35,6 @@ #include <rtl/ustring.hxx> #include <unotools/options.hxx> -//_________________________________________________________________________________________________________________ -// forward declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. @@ -53,10 +45,6 @@ class SvtMiscOptions_Impl; class Link; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short collect informations about misc group @descr - @@ -71,16 +59,7 @@ class Link; class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options { - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - public: - - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short standard constructor and destructor @descr This will initialize an instance with default values. @@ -103,39 +82,28 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options void AddListenerLink( const Link& rLink ); void RemoveListenerLink( const Link& rLink ); - //--------------------------------------------------------------------------------------------------------- - // interface - //--------------------------------------------------------------------------------------------------------- - sal_Bool UseSystemFileDialog() const; void SetUseSystemFileDialog( sal_Bool bSet ); sal_Bool IsUseSystemFileDialogReadOnly() const; sal_Bool TryODMADialog() const; void SetTryODMADialog( sal_Bool bSet ); - sal_Bool IsTryUseODMADialogReadOnly() const; sal_Bool DisableUICustomization() const; sal_Bool IsPluginsEnabled() const; - void SetPluginsEnabled( sal_Bool bEnable ); - sal_Bool IsPluginsEnabledReadOnly() const; sal_Int16 GetSymbolsSize() const; void SetSymbolsSize( sal_Int16 eSet ); sal_Int16 GetCurrentSymbolsSize() const; bool AreCurrentSymbolsLarge() const; - sal_Bool IsGetSymbolsSizeReadOnly() const; sal_Int16 GetSymbolsStyle() const; void SetSymbolsStyle( sal_Int16 eSet ); sal_Int16 GetCurrentSymbolsStyle() const; - ::rtl::OUString GetCurrentSymbolsStyleName() const; - sal_Bool IsGetSymbolsStyleReadOnly() const; sal_Int16 GetToolboxStyle() const; void SetToolboxStyle( sal_Int16 nStyle ); - sal_Bool IsGetToolboxStyleReadOnly() const; sal_Bool IsModifyByPrinting() const; void SetModifyByPrinting(sal_Bool bSet ); @@ -153,10 +121,6 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options void SetExperimentalMode( sal_Bool bSet ); sal_Bool IsExperimentalMode() const; - //------------------------------------------------------------------------------------------------------------- - // private methods - //------------------------------------------------------------------------------------------------------------- - private: /*-****************************************************************************************************//** @@ -175,10 +139,6 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options SVT_DLLPRIVATE static ::osl::Mutex& GetInitMutex(); - //------------------------------------------------------------------------------------------------------------- - // private member - //------------------------------------------------------------------------------------------------------------- - private: /*Attention diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index b89c30881882..5b09f66cef9a 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -546,11 +546,6 @@ void SvtAccessibilityOptions::Commit() // ----------------------------------------------------------------------- -sal_Bool SvtAccessibilityOptions::GetIsForDrawings() const -{ - OSL_FAIL( "SvtAccessibilityOptions::GetIsForDrawings: is obsolete!" ); - return sal_False; -} sal_Bool SvtAccessibilityOptions::GetIsForBorders() const { OSL_FAIL( "SvtAccessibilityOptions::GetIsForBorders: is obsolete!" ); diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index e5359dae23ec..6e1eb8bcff89 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -712,11 +712,6 @@ sal_Bool SvtHelpOptions::IsWelcomeScreen() const return pImp->IsWelcomeScreen(); } -String SvtHelpOptions::GetLocale() const -{ - return pImp->GetLocale(); -} - String SvtHelpOptions::GetSystem() const { return pImp->GetSystem(); diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx index 76954dfcc5d6..81bd2b786a4a 100644 --- a/svtools/source/config/htmlcfg.cxx +++ b/svtools/source/config/htmlcfg.cxx @@ -253,23 +253,6 @@ void SvxHtmlOptions::Commit() PutProperties(aNames, aValues); } -void SvxHtmlOptions::AddListenerLink( const Link& rLink ) -{ - pImp->aList.push_back( rLink ); -} - -void SvxHtmlOptions::RemoveListenerLink( const Link& rLink ) -{ - for ( ::std::list<Link>::iterator iter = pImp->aList.begin(); iter != pImp->aList.end(); ++iter ) - { - if ( *iter == rLink ) - { - pImp->aList.erase(iter); - break; - } - } -} - void SvxHtmlOptions::CallListeners() { for ( ::std::list<Link>::const_iterator iter = pImp->aList.begin(); iter != pImp->aList.end(); ++iter ) diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index 6fd10f8ed10f..8d2ee21b8185 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -495,33 +495,6 @@ sal_Bool SvtMenuOptions::IsEntryHidingEnabled() const //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtMenuOptions::IsFollowMouseEnabled() const -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pDataContainer->IsFollowMouseEnabled(); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** -void SvtMenuOptions::SetEntryHidingState( sal_Bool bState ) -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - m_pDataContainer->SetEntryHidingState( bState ); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** -void SvtMenuOptions::SetFollowMouseState( sal_Bool bState ) -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - m_pDataContainer->SetFollowMouseState( bState ); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** sal_Int16 SvtMenuOptions::GetMenuIconsState() const { MutexGuard aGuard( GetOwnStaticMutex() ); diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 2c1b498af5c8..36a44660915a 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -848,26 +848,11 @@ void SvtMiscOptions::SetTryODMADialog( sal_Bool bEnable ) m_pDataContainer->SetTryODMADialog( bEnable ); } -sal_Bool SvtMiscOptions::IsTryUseODMADialogReadOnly() const -{ - return m_pDataContainer->IsTryUseODMADialogReadOnly(); -} - sal_Bool SvtMiscOptions::IsPluginsEnabled() const { return m_pDataContainer->IsPluginsEnabled(); } -void SvtMiscOptions::SetPluginsEnabled( sal_Bool bEnable ) -{ - m_pDataContainer->SetPluginsEnabled( bEnable ); -} - -sal_Bool SvtMiscOptions::IsPluginsEnabledReadOnly() const -{ - return m_pDataContainer->IsPluginsEnabledReadOnly(); -} - sal_Int16 SvtMiscOptions::GetSymbolsSize() const { return m_pDataContainer->GetSymbolsSize(); @@ -901,11 +886,6 @@ bool SvtMiscOptions::AreCurrentSymbolsLarge() const return ( GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_LARGE ); } -sal_Bool SvtMiscOptions::IsGetSymbolsSizeReadOnly() const -{ - return m_pDataContainer->IsGetSymbolsSizeReadOnly(); -} - sal_Int16 SvtMiscOptions::GetSymbolsStyle() const { return m_pDataContainer->GetSymbolsStyle(); @@ -916,21 +896,11 @@ sal_Int16 SvtMiscOptions::GetCurrentSymbolsStyle() const return m_pDataContainer->GetCurrentSymbolsStyle(); } -OUString SvtMiscOptions::GetCurrentSymbolsStyleName() const -{ - return Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); -} - void SvtMiscOptions::SetSymbolsStyle( sal_Int16 nSet ) { m_pDataContainer->SetSymbolsStyle( nSet ); } -sal_Bool SvtMiscOptions::IsGetSymbolsStyleReadOnly() const -{ - return m_pDataContainer->IsGetSymbolsStyleReadOnly(); -} - sal_Bool SvtMiscOptions::DisableUICustomization() const { return m_pDataContainer->DisableUICustomization(); @@ -946,11 +916,6 @@ void SvtMiscOptions::SetToolboxStyle( sal_Int16 nStyle ) m_pDataContainer->SetToolboxStyle( nStyle, true ); } -sal_Bool SvtMiscOptions::IsGetToolboxStyleReadOnly() const -{ - return m_pDataContainer->IsGetToolboxStyleReadOnly(); -} - sal_Bool SvtMiscOptions::UseSystemPrintDialog() const { return m_pDataContainer->UseSystemPrintDialog(); diff --git a/unotools/inc/unotools/cmdoptions.hxx b/unotools/inc/unotools/cmdoptions.hxx index 719d99db4461..ff1b64c76c8e 100644 --- a/unotools/inc/unotools/cmdoptions.hxx +++ b/unotools/inc/unotools/cmdoptions.hxx @@ -28,10 +28,6 @@ #ifndef INCLUDED_unotools_CMDOPTIONS_HXX #define INCLUDED_unotools_CMDOPTIONS_HXX -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include "unotools/unotoolsdllapi.h" #include <sal/types.h> #include <osl/mutex.hxx> @@ -40,20 +36,12 @@ #include <rtl/ustring.hxx> #include <unotools/options.hxx> -//_________________________________________________________________________________________________________________ -// types, enums, ... -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @descr The method GetList() returns a list of property values. Use follow defines to seperate values by names. *//*-*************************************************************************************************************/ #define CMDOPTIONS_PROPERTYNAME_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CommandURL" )) -//_________________________________________________________________________________________________________________ -// forward declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. @@ -63,10 +51,6 @@ class SvtCommandOptions_Impl; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short collect informations about dynamic menus @descr Make it possible to configure dynamic menu structures of menus like "new" or "wizard". @@ -81,10 +65,6 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options { friend class SvtCommandOptions_Impl; - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - public: enum CmdOption @@ -93,10 +73,6 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options CMDOPTION_NONE }; - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short standard constructor and destructor @descr This will initialize an instance with default values. @@ -116,25 +92,6 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options SvtCommandOptions(); virtual ~SvtCommandOptions(); - //--------------------------------------------------------------------------------------------------------- - // interface - //--------------------------------------------------------------------------------------------------------- - - /*-****************************************************************************************************//** - @short clear complete sepcified list - @descr Call this methods to clear the whole list. - To fill it again use AppendItem(). - - @seealso - - - @param "eMenu" select right menu to clear. - @return - - - @onerror - - *//*-*****************************************************************************************************/ - - void Clear( CmdOption eOption ); - /*-****************************************************************************************************//** @short return complete specified list @descr Call it to get all entries of an dynamic menu. @@ -166,36 +123,6 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options sal_Bool Lookup( CmdOption eOption, const ::rtl::OUString& aCommandURL ) const; /*-****************************************************************************************************//** - @short return complete specified list - @descr Call it to get all entries of an dynamic menu. - We return a list of all nodes with his names and properties. - - @seealso - - - @param "eOption" select the list to retrieve. - @return A list of command strings is returned. - - @onerror We return an empty list. - *//*-*****************************************************************************************************/ - - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetList( CmdOption eOption ) const; - - /*-****************************************************************************************************//** - @short adds a new command to specified options list - @descr You can add a command to specified options list! - - @seealso method Clear() - - @param "eOption" specifies the command list - @param "sURL" URL for dispatch - @return - - - @onerror - - *//*-*****************************************************************************************************/ - - void AddCommand( CmdOption eOption, const ::rtl::OUString& sURL ); - - /*-****************************************************************************************************//** @short register an office frame, which must update its dispatches if the underlying configuration was changed. @@ -212,10 +139,6 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options void EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); - //------------------------------------------------------------------------------------------------------------- - // private methods - //------------------------------------------------------------------------------------------------------------- - private: /*-****************************************************************************************************//** @@ -234,10 +157,6 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); - //------------------------------------------------------------------------------------------------------------- - // private member - //------------------------------------------------------------------------------------------------------------- - private: /*Attention diff --git a/unotools/inc/unotools/dynamicmenuoptions.hxx b/unotools/inc/unotools/dynamicmenuoptions.hxx index e47bd0b6d723..01e9394be721 100644 --- a/unotools/inc/unotools/dynamicmenuoptions.hxx +++ b/unotools/inc/unotools/dynamicmenuoptions.hxx @@ -28,10 +28,6 @@ #ifndef INCLUDED_unotools_DYNAMICMENUOPTIONS_HXX #define INCLUDED_unotools_DYNAMICMENUOPTIONS_HXX -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include "unotools/unotoolsdllapi.h" #include <sal/types.h> #include <osl/mutex.hxx> @@ -39,10 +35,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <unotools/options.hxx> -//_________________________________________________________________________________________________________________ -// types, enums, ... -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @descr The method GetList() returns a list of property values. Use follow defines to seperate values by names. @@ -61,9 +53,6 @@ enum EDynamicMenuType E_WIZARDMENU = 1, E_HELPBOOKMARKS = 2 }; -//_________________________________________________________________________________________________________________ -// forward declarations -//_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @@ -74,10 +63,6 @@ enum EDynamicMenuType class SvtDynamicMenuOptions_Impl; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short collect informations about dynamic menus @descr Make it possible to configure dynamic menu structures of menus like "new" or "wizard". @@ -90,16 +75,7 @@ class SvtDynamicMenuOptions_Impl; class UNOTOOLS_DLLPUBLIC SvtDynamicMenuOptions: public utl::detail::Options { - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - public: - - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short standard constructor and destructor @descr This will initialize an instance with default values. @@ -119,25 +95,6 @@ class UNOTOOLS_DLLPUBLIC SvtDynamicMenuOptions: public utl::detail::Options SvtDynamicMenuOptions(); virtual ~SvtDynamicMenuOptions(); - //--------------------------------------------------------------------------------------------------------- - // interface - //--------------------------------------------------------------------------------------------------------- - - /*-****************************************************************************************************//** - @short clear complete sepcified list - @descr Call this methods to clear the whole list. - To fill it again use AppendItem(). - - @seealso - - - @param "eMenu" select right menu to clear. - @return - - - @onerror - - *//*-*****************************************************************************************************/ - - void Clear( EDynamicMenuType eMenu ); - /*-****************************************************************************************************//** @short return complete specified list @descr Call it to get all entries of an dynamic menu. @@ -152,34 +109,6 @@ class UNOTOOLS_DLLPUBLIC SvtDynamicMenuOptions: public utl::detail::Options *//*-*****************************************************************************************************/ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > GetMenu( EDynamicMenuType eMenu ) const; - - /*-****************************************************************************************************//** - @short append a new item to specified menu - @descr You can append items to a menu only - removing isn't allowed for a special item! - We support a nothing or all mechanism only! Clear all or append something ... - - @seealso method Clear() - - @param "eMenu" select right menu. - @param "sURL" URL for dispatch - @param "sTitle" label of menu entry - @param "sImageIdentifier" icon identifier - @param "sTargetName" target for dispatch - @return - - - @onerror - - *//*-*****************************************************************************************************/ - - void AppendItem( EDynamicMenuType eMenu , - const ::rtl::OUString& sURL , - const ::rtl::OUString& sTitle , - const ::rtl::OUString& sImageIdentifier , - const ::rtl::OUString& sTargetName ); - - //------------------------------------------------------------------------------------------------------------- - // private methods - //------------------------------------------------------------------------------------------------------------- - private: /*-****************************************************************************************************//** @@ -198,10 +127,6 @@ class UNOTOOLS_DLLPUBLIC SvtDynamicMenuOptions: public utl::detail::Options UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); - //------------------------------------------------------------------------------------------------------------- - // private member - //------------------------------------------------------------------------------------------------------------- - private: /*Attention diff --git a/unotools/inc/unotools/extendedsecurityoptions.hxx b/unotools/inc/unotools/extendedsecurityoptions.hxx index 478e1f274663..87de457ae045 100644 --- a/unotools/inc/unotools/extendedsecurityoptions.hxx +++ b/unotools/inc/unotools/extendedsecurityoptions.hxx @@ -28,10 +28,6 @@ #ifndef INCLUDED_unotools_EXTENDEDSECURITYOPTIONS_HXX #define INCLUDED_unotools_EXTENDEDSECURITYOPTIONS_HXX -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include "unotools/unotoolsdllapi.h" #include <sal/types.h> #include <osl/mutex.hxx> @@ -39,10 +35,6 @@ #include <rtl/ustring.hxx> #include <unotools/options.hxx> -//_________________________________________________________________________________________________________________ -// forward declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. @@ -52,10 +44,6 @@ class SvtExtendedSecurityOptions_Impl; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short collect informations about security features @descr - @@ -70,10 +58,6 @@ class SvtExtendedSecurityOptions_Impl; class UNOTOOLS_DLLPUBLIC SvtExtendedSecurityOptions: public utl::detail::Options { - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - public: // Must be zero based! enum OpenHyperlinkMode @@ -83,10 +67,6 @@ class UNOTOOLS_DLLPUBLIC SvtExtendedSecurityOptions: public utl::detail::Options OPEN_ALWAYS }; - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short standard constructor and destructor @descr This will initialize an instance with default values. @@ -106,20 +86,7 @@ class UNOTOOLS_DLLPUBLIC SvtExtendedSecurityOptions: public utl::detail::Options SvtExtendedSecurityOptions(); virtual ~SvtExtendedSecurityOptions(); - //--------------------------------------------------------------------------------------------------------- - // interface - //--------------------------------------------------------------------------------------------------------- - - sal_Bool IsSecureHyperlink( const rtl::OUString& aURL ) const; - com::sun::star::uno::Sequence< rtl::OUString > GetSecureExtensionList() const; - OpenHyperlinkMode GetOpenHyperlinkMode(); - void SetOpenHyperlinkMode( OpenHyperlinkMode aMode ); - sal_Bool IsOpenHyperlinkModeReadOnly() const; - - //------------------------------------------------------------------------------------------------------------- - // private methods - //------------------------------------------------------------------------------------------------------------- private: diff --git a/unotools/inc/unotools/fltrcfg.hxx b/unotools/inc/unotools/fltrcfg.hxx index cd581e6544fd..052d6648034e 100644 --- a/unotools/inc/unotools/fltrcfg.hxx +++ b/unotools/inc/unotools/fltrcfg.hxx @@ -77,7 +77,6 @@ public: void SetWriter2WinWord( sal_Bool bFlag ); sal_Bool IsUseEnhancedFields() const; - void SetUseEnhancedFields( sal_Bool bFlag ); sal_Bool IsExcel2Calc() const; void SetExcel2Calc( sal_Bool bFlag ); diff --git a/unotools/inc/unotools/fontoptions.hxx b/unotools/inc/unotools/fontoptions.hxx index 1c438ae44570..171ae049ceea 100644 --- a/unotools/inc/unotools/fontoptions.hxx +++ b/unotools/inc/unotools/fontoptions.hxx @@ -28,20 +28,12 @@ #ifndef INCLUDED_unotools_FONTOPTIONS_HXX #define INCLUDED_unotools_FONTOPTIONS_HXX -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include "unotools/unotoolsdllapi.h" #include <sal/types.h> #include <osl/mutex.hxx> #include <rtl/ustring.hxx> #include <unotools/options.hxx> -//_________________________________________________________________________________________________________________ -// forward declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. @@ -51,10 +43,6 @@ class SvtFontOptions_Impl; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short collect informations about font features @descr - @@ -67,16 +55,7 @@ class SvtFontOptions_Impl; class UNOTOOLS_DLLPUBLIC SvtFontOptions: public utl::detail::Options { - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - public: - - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short standard constructor and destructor @descr This will initialize an instance with default values. @@ -96,10 +75,6 @@ class UNOTOOLS_DLLPUBLIC SvtFontOptions: public utl::detail::Options SvtFontOptions(); virtual ~SvtFontOptions(); - //--------------------------------------------------------------------------------------------------------- - // interface - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short interface methods to get and set value of config key "org.openoffice.Office.Common/Font" @descr These values defines different states of font handling. @@ -122,19 +97,11 @@ class UNOTOOLS_DLLPUBLIC SvtFontOptions: public utl::detail::Options @onerror No error should occurre! *//*-*****************************************************************************************************/ - sal_Bool IsReplacementTableEnabled ( ) const ; - void EnableReplacementTable ( sal_Bool bState ) ; - sal_Bool IsFontHistoryEnabled ( ) const ; void EnableFontHistory ( sal_Bool bState ) ; sal_Bool IsFontWYSIWYGEnabled ( ) const ; void EnableFontWYSIWYG ( sal_Bool bState ) ; - - //------------------------------------------------------------------------------------------------------------- - // private methods - //------------------------------------------------------------------------------------------------------------- - private: /*-****************************************************************************************************//** @@ -151,11 +118,6 @@ class UNOTOOLS_DLLPUBLIC SvtFontOptions: public utl::detail::Options *//*-*****************************************************************************************************/ UNOTOOLS_DLLPRIVATE static ::osl::Mutex& impl_GetOwnStaticMutex(); - - //------------------------------------------------------------------------------------------------------------- - // private member - //------------------------------------------------------------------------------------------------------------- - private: /*Attention diff --git a/unotools/inc/unotools/historyoptions.hxx b/unotools/inc/unotools/historyoptions.hxx index ee3b9c0dd5ea..2b36a7cd3eb1 100644 --- a/unotools/inc/unotools/historyoptions.hxx +++ b/unotools/inc/unotools/historyoptions.hxx @@ -28,10 +28,6 @@ #ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX #define INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include "unotools/unotoolsdllapi.h" #include <sal/types.h> #include <osl/mutex.hxx> @@ -40,10 +36,6 @@ #include <rtl/ustring.hxx> #include <unotools/options.hxx> -//_________________________________________________________________________________________________________________ -// types, enums, ... -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @descr The method GetList() returns a list of property values. Use follow defines to seperate values by names. @@ -65,10 +57,6 @@ enum EHistoryType eHELPBOOKMARKS = 2 }; -//_________________________________________________________________________________________________________________ -// forward declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. @@ -78,10 +66,6 @@ enum EHistoryType class SvtHistoryOptions_Impl; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short collect informations about history features @descr - @@ -94,16 +78,7 @@ class SvtHistoryOptions_Impl; class UNOTOOLS_DLLPUBLIC SvtHistoryOptions: public utl::detail::Options { - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - public: - - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short standard constructor and destructor @descr This will initialize an instance with default values. @@ -123,10 +98,6 @@ class UNOTOOLS_DLLPUBLIC SvtHistoryOptions: public utl::detail::Options SvtHistoryOptions(); virtual ~SvtHistoryOptions(); - //--------------------------------------------------------------------------------------------------------- - // interface - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short interface methods to get and set value of config key "org.openoffice.Office.Common/History/..." @descr key "PickList" : The last used documents displayed in the file menu. @@ -150,7 +121,6 @@ class UNOTOOLS_DLLPUBLIC SvtHistoryOptions: public utl::detail::Options *//*-*****************************************************************************************************/ sal_uInt32 GetSize( EHistoryType eHistory ) const ; - void SetSize( EHistoryType eHistory, sal_uInt32 nSize ) ; /*-****************************************************************************************************//** @short clear complete sepcified list @@ -207,10 +177,6 @@ class UNOTOOLS_DLLPUBLIC SvtHistoryOptions: public utl::detail::Options const ::rtl::OUString& sTitle , const ::rtl::OUString& sPassword ); - //------------------------------------------------------------------------------------------------------------- - // private methods - //------------------------------------------------------------------------------------------------------------- - private: /*-****************************************************************************************************//** @@ -227,10 +193,6 @@ class UNOTOOLS_DLLPUBLIC SvtHistoryOptions: public utl::detail::Options UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); - //------------------------------------------------------------------------------------------------------------- - // private member - //------------------------------------------------------------------------------------------------------------- - private: /*Attention diff --git a/unotools/inc/unotools/internaloptions.hxx b/unotools/inc/unotools/internaloptions.hxx index 38bb8337dc55..f31d639086eb 100644 --- a/unotools/inc/unotools/internaloptions.hxx +++ b/unotools/inc/unotools/internaloptions.hxx @@ -28,27 +28,15 @@ #ifndef INCLUDED_unotools_INTERNALOPTIONS_HXX #define INCLUDED_unotools_INTERNALOPTIONS_HXX -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include "unotools/unotoolsdllapi.h" #include <sal/types.h> #include <osl/mutex.hxx> #include <rtl/ustring.hxx> #include <unotools/options.hxx> -//_________________________________________________________________________________________________________________ -// namespaces! -//_________________________________________________________________________________________________________________ - #define MUTEX ::osl::Mutex #define OUSTRING ::rtl::OUString -//_________________________________________________________________________________________________________________ -// forward declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. @@ -58,10 +46,6 @@ class SvtInternalOptions_Impl; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short collect informations about internal features @descr - @@ -76,16 +60,8 @@ class SvtInternalOptions_Impl; class UNOTOOLS_DLLPUBLIC SvtInternalOptions: public utl::detail::Options { - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - public: - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short standard constructor and destructor @descr This will initialize an instance with default values. @@ -105,10 +81,6 @@ class UNOTOOLS_DLLPUBLIC SvtInternalOptions: public utl::detail::Options SvtInternalOptions(); virtual ~SvtInternalOptions(); - //--------------------------------------------------------------------------------------------------------- - // interface - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short interface methods to get and set value of config key "org.openoffice.Office.Common/Internal/..." @descr These options describe internal states to enable/disable features of installed office. @@ -127,20 +99,11 @@ class UNOTOOLS_DLLPUBLIC SvtInternalOptions: public utl::detail::Options *//*-*****************************************************************************************************/ sal_Bool SlotCFGEnabled () const; - sal_Bool CrashMailEnabled () const; sal_Bool MailUIEnabled () const; - sal_Bool IsRemoveMenuEntryClose() const; - sal_Bool IsRemoveMenuEntryBackToWebtop() const; - sal_Bool IsRemoveMenuEntryNewWebtop() const; - sal_Bool IsRemoveMenuEntryLogout() const; OUSTRING GetCurrentTempURL() const; void SetCurrentTempURL( const OUSTRING& aNewCurrentTempURL ); - //------------------------------------------------------------------------------------------------------------- - // private methods - //------------------------------------------------------------------------------------------------------------- - private: /*-****************************************************************************************************//** @@ -159,10 +122,6 @@ class UNOTOOLS_DLLPUBLIC SvtInternalOptions: public utl::detail::Options UNOTOOLS_DLLPRIVATE static MUTEX& GetOwnStaticMutex(); - //------------------------------------------------------------------------------------------------------------- - // private member - //------------------------------------------------------------------------------------------------------------- - private: /*Attention diff --git a/unotools/inc/unotools/localisationoptions.hxx b/unotools/inc/unotools/localisationoptions.hxx index f9aa7a850e0b..b05bd17fd124 100644 --- a/unotools/inc/unotools/localisationoptions.hxx +++ b/unotools/inc/unotools/localisationoptions.hxx @@ -28,19 +28,11 @@ #ifndef INCLUDED_unotools_LOCALISATIONOPTIONS_HXX #define INCLUDED_unotools_LOCALISATIONOPTIONS_HXX -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include <sal/types.h> #include "unotools/unotoolsdllapi.h" #include <osl/mutex.hxx> #include <unotools/options.hxx> -//_________________________________________________________________________________________________________________ -// forward declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. @@ -50,10 +42,6 @@ class SvtLocalisationOptions_Impl; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short collect informations about localisation features @descr - @@ -66,16 +54,7 @@ class SvtLocalisationOptions_Impl; class UNOTOOLS_DLLPUBLIC SvtLocalisationOptions: public utl::detail::Options { - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - public: - - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short standard constructor and destructor @descr This will initialize an instance with default values. @@ -95,10 +74,6 @@ class UNOTOOLS_DLLPUBLIC SvtLocalisationOptions: public utl::detail::Options SvtLocalisationOptions(); virtual ~SvtLocalisationOptions(); - //--------------------------------------------------------------------------------------------------------- - // interface - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Localisation/AutoMnemonic" @descr These value specifies if shortcuts should be assigned automatically. @@ -112,7 +87,6 @@ class UNOTOOLS_DLLPUBLIC SvtLocalisationOptions: public utl::detail::Options *//*-*****************************************************************************************************/ sal_Bool IsAutoMnemonic ( ) const ; - void SetAutoMnemonic ( sal_Bool bState ) ; /*-****************************************************************************************************//** @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Localisation/DialogScale" @@ -133,12 +107,6 @@ class UNOTOOLS_DLLPUBLIC SvtLocalisationOptions: public utl::detail::Options *//*-*****************************************************************************************************/ sal_Int32 GetDialogScale( ) const ; - void SetDialogScale( sal_Int32 nScale ) ; - - //------------------------------------------------------------------------------------------------------------- - // private methods - //------------------------------------------------------------------------------------------------------------- - private: /*-****************************************************************************************************//** @@ -157,10 +125,6 @@ class UNOTOOLS_DLLPUBLIC SvtLocalisationOptions: public utl::detail::Options UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); - //------------------------------------------------------------------------------------------------------------- - // private member - //------------------------------------------------------------------------------------------------------------- - private: /*Attention diff --git a/unotools/inc/unotools/moduleoptions.hxx b/unotools/inc/unotools/moduleoptions.hxx index febf4f63f862..fa489e572707 100644 --- a/unotools/inc/unotools/moduleoptions.hxx +++ b/unotools/inc/unotools/moduleoptions.hxx @@ -29,10 +29,6 @@ #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX #define INCLUDED_SVTOOLS_MODULEOPTIONS_HXX -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include "unotools/unotoolsdllapi.h" #include <salhelper/singletonref.hxx> #include <com/sun/star/frame/XModel.hpp> @@ -42,10 +38,6 @@ #include <osl/mutex.hxx> #include <unotools/options.hxx> -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - #define FEATUREFLAG_BASICIDE 0x00000020 #define FEATUREFLAG_MATH 0x00000100 #define FEATUREFLAG_CHART 0x00000200 @@ -55,10 +47,6 @@ #define FEATUREFLAG_IMPRESS 0x00008000 #define FEATUREFLAG_INSIGHT 0x00010000 -//_________________________________________________________________________________________________________________ -// forward declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. @@ -67,10 +55,6 @@ *//*-*************************************************************************************************************/ class SvtModuleOptions_Impl; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short collect informations about installation state of modules @descr Use these class to get installation state of different office modules like writer, calc etc @@ -85,9 +69,6 @@ class SvtModuleOptions_Impl; *//*-*************************************************************************************************************/ class UNOTOOLS_DLLPUBLIC SvtModuleOptions: public utl::detail::Options { - //------------------------------------------------------------------------------------------------------------- - // public const declarations! - //------------------------------------------------------------------------------------------------------------- public: enum EModule @@ -126,23 +107,13 @@ class UNOTOOLS_DLLPUBLIC SvtModuleOptions: public utl::detail::Options }; - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- public: - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- SvtModuleOptions(); virtual ~SvtModuleOptions(); - //--------------------------------------------------------------------------------------------------------- - // interface - //--------------------------------------------------------------------------------------------------------- sal_Bool IsModuleInstalled ( EModule eModule ) const; ::rtl::OUString GetModuleName ( EModule eModule ) const; - ::rtl::OUString GetModuleName ( EFactory eFactory ) const; ::rtl::OUString GetFactoryName ( EFactory eFactory ) const; ::rtl::OUString GetFactoryShortName ( EFactory eFactory ) const; ::rtl::OUString GetFactoryStandardTemplate( EFactory eFactory ) const; @@ -213,9 +184,6 @@ class UNOTOOLS_DLLPUBLIC SvtModuleOptions: public utl::detail::Options ::rtl::OUString GetDefaultModuleName(); - //--------------------------------------------------------------------------------------------------------- - // old interface ... - //--------------------------------------------------------------------------------------------------------- sal_Bool IsMath () const; sal_Bool IsChart () const; sal_Bool IsCalc () const; @@ -224,21 +192,12 @@ class UNOTOOLS_DLLPUBLIC SvtModuleOptions: public utl::detail::Options sal_Bool IsImpress () const; sal_Bool IsBasicIDE () const; sal_Bool IsDataBase () const; - sal_uInt32 GetFeatures() const; ::com::sun::star::uno::Sequence < ::rtl::OUString > GetAllServiceNames(); - //------------------------------------------------------------------------------------------------------------- - // private methods - //------------------------------------------------------------------------------------------------------------- private: UNOTOOLS_DLLPRIVATE static ::osl::Mutex& impl_GetOwnStaticMutex(); - //------------------------------------------------------------------------------------------------------------- - // private member - //------------------------------------------------------------------------------------------------------------- - private: - /*Attention Don't initialize these static member in these header! diff --git a/unotools/inc/unotools/pathoptions.hxx b/unotools/inc/unotools/pathoptions.hxx index 53e6ccaca463..90291368dd95 100644 --- a/unotools/inc/unotools/pathoptions.hxx +++ b/unotools/inc/unotools/pathoptions.hxx @@ -102,9 +102,6 @@ public: const String& GetUIConfigPath() const; const String& GetFingerprintPath() const; - sal_Bool IsPathReadonly(Pathes ePath)const; - const String& GetPath(Pathes ePath) const; - // set the pathes void SetAddinPath( const String& rPath ); void SetAutoCorrectPath( const String& rPath ); @@ -128,7 +125,6 @@ public: void SetTemplatePath( const String& rPath ); void SetUserConfigPath( const String& rPath ); void SetWorkPath( const String& rPath ); - void SetPath( SvtPathOptions::Pathes ePath, const String& rNewPath ); String SubstituteVariable( const String& rVar ) const; String ExpandMacros( const String& rPath ) const; diff --git a/unotools/inc/unotools/printwarningoptions.hxx b/unotools/inc/unotools/printwarningoptions.hxx index da8395a520d9..476cbaed7618 100644 --- a/unotools/inc/unotools/printwarningoptions.hxx +++ b/unotools/inc/unotools/printwarningoptions.hxx @@ -29,20 +29,12 @@ #ifndef INCLUDED_unotools_PRINTWARNINGOPTIONS_HXX #define INCLUDED_unotools_PRINTWARNINGOPTIONS_HXX -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include "unotools/unotoolsdllapi.h" #include <sal/types.h> #include <osl/mutex.hxx> #include <rtl/ustring.hxx> #include <unotools/options.hxx> -//_________________________________________________________________________________________________________________ -// forward declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. @@ -52,10 +44,6 @@ class SvtPrintWarningOptions_Impl; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short collect informations about startup features @descr - @@ -68,16 +56,7 @@ class SvtPrintWarningOptions_Impl; class UNOTOOLS_DLLPUBLIC SvtPrintWarningOptions: public utl::detail::Options { - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - public: - - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short standard constructor and destructor @descr This will initialize an instance with default values. @@ -97,10 +76,6 @@ class UNOTOOLS_DLLPUBLIC SvtPrintWarningOptions: public utl::detail::Options SvtPrintWarningOptions(); virtual ~SvtPrintWarningOptions(); - //--------------------------------------------------------------------------------------------------------- - // interface - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short interface methods to get and set value of config key "org.openoffice.Office.Common/Print/Warning..." @descr These options describe internal states to enable/disable features of installed office. @@ -110,20 +85,14 @@ class UNOTOOLS_DLLPUBLIC SvtPrintWarningOptions: public utl::detail::Options sal_Bool IsPaperSize() const; sal_Bool IsPaperOrientation() const; - sal_Bool IsNotFound() const; sal_Bool IsTransparency() const; sal_Bool IsModifyDocumentOnPrintingAllowed() const; void SetPaperSize( sal_Bool bState ); void SetPaperOrientation( sal_Bool bState ); - void SetNotFound( sal_Bool bState ); void SetTransparency( sal_Bool bState ); void SetModifyDocumentOnPrintingAllowed( sal_Bool bState ); - //------------------------------------------------------------------------------------------------------------- - // private methods - //------------------------------------------------------------------------------------------------------------- - private: /*-****************************************************************************************************//** @@ -141,9 +110,6 @@ class UNOTOOLS_DLLPUBLIC SvtPrintWarningOptions: public utl::detail::Options UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); - //------------------------------------------------------------------------------------------------------------- - // private member - //------------------------------------------------------------------------------------------------------------- private: /*Attention diff --git a/unotools/inc/unotools/saveopt.hxx b/unotools/inc/unotools/saveopt.hxx index 43f60c5b4b19..0f20d621fbc0 100644 --- a/unotools/inc/unotools/saveopt.hxx +++ b/unotools/inc/unotools/saveopt.hxx @@ -104,7 +104,6 @@ public: void SetSaveRelFSys( sal_Bool b ); sal_Bool IsSaveRelFSys() const; - void SetSaveUnpacked( sal_Bool b ); sal_Bool IsSaveUnpacked() const; void SetLoadUserSettings(sal_Bool b); @@ -122,10 +121,8 @@ public: void SetODFDefaultVersion( ODFDefaultVersion eVersion ); ODFDefaultVersion GetODFDefaultVersion() const; - void SetUseSHA1InODF12( sal_Bool bUse ); sal_Bool IsUseSHA1InODF12() const; - void SetUseBlowfishInODF12( sal_Bool bUse ); sal_Bool IsUseBlowfishInODF12() const; sal_Bool IsReadOnly( EOption eOption ) const; diff --git a/unotools/inc/unotools/searchopt.hxx b/unotools/inc/unotools/searchopt.hxx index 10ed2ca79bce..cf9b38a72b50 100644 --- a/unotools/inc/unotools/searchopt.hxx +++ b/unotools/inc/unotools/searchopt.hxx @@ -57,7 +57,6 @@ public: sal_Bool IsWholeWordsOnly() const; sal_Bool IsBackwards() const; sal_Bool IsUseRegularExpression() const; - sal_Bool IsSearchForStyles() const; sal_Bool IsSimilaritySearch() const; sal_Bool IsUseAsianOptions() const; sal_Bool IsMatchCase() const; // also Japanese search option diff --git a/unotools/inc/unotools/securityoptions.hxx b/unotools/inc/unotools/securityoptions.hxx index fd1b7c757163..045e38d05e4f 100644 --- a/unotools/inc/unotools/securityoptions.hxx +++ b/unotools/inc/unotools/securityoptions.hxx @@ -28,10 +28,6 @@ #ifndef INCLUDED_unotools_SECURITYOPTIONS_HXX #define INCLUDED_unotools_SECURITYOPTIONS_HXX -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include "unotools/unotoolsdllapi.h" #include <sal/types.h> #include <osl/mutex.hxx> @@ -39,10 +35,6 @@ #include <rtl/ustring.hxx> #include <unotools/options.hxx> -//_________________________________________________________________________________________________________________ -// forward declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. @@ -52,10 +44,6 @@ class SvtSecurityOptions_Impl; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @descr These values present modes to handle StarOffice basic scripts. see GetBasicMode/SetBasicMode() for further informations @@ -82,9 +70,6 @@ enum EBasicSecurityMode class UNOTOOLS_DLLPUBLIC SvtSecurityOptions: public utl::detail::Options { - //------------------------------------------------------------------------------------------------------------- - // public types - //------------------------------------------------------------------------------------------------------------- public: enum EOption @@ -125,16 +110,7 @@ class UNOTOOLS_DLLPUBLIC SvtSecurityOptions: public utl::detail::Options }; */ - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - public: - - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short standard constructor and destructor @descr This will initialize an instance with default values. @@ -154,10 +130,6 @@ class UNOTOOLS_DLLPUBLIC SvtSecurityOptions: public utl::detail::Options SvtSecurityOptions(); virtual ~SvtSecurityOptions(); - //--------------------------------------------------------------------------------------------------------- - // interface - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short returns readonly state @descr It can be called to get information about the readonly state of a provided item. @@ -236,7 +208,6 @@ class UNOTOOLS_DLLPUBLIC SvtSecurityOptions: public utl::detail::Options ::com::sun::star::uno::Sequence< Certificate > GetTrustedAuthors ( ) const ; void SetTrustedAuthors ( const ::com::sun::star::uno::Sequence< Certificate >& rAuthors ) ; - sal_Bool IsTrustedAuthorsEnabled ( ) ; // for bool options only! bool IsOptionSet ( EOption eOption ) const ; diff --git a/unotools/inc/unotools/startoptions.hxx b/unotools/inc/unotools/startoptions.hxx index 464c2a433446..17f4a52ce000 100644 --- a/unotools/inc/unotools/startoptions.hxx +++ b/unotools/inc/unotools/startoptions.hxx @@ -28,20 +28,12 @@ #ifndef INCLUDED_unotools_STARTOPTIONS_HXX #define INCLUDED_unotools_STARTOPTIONS_HXX -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include "unotools/unotoolsdllapi.h" #include <sal/types.h> #include <osl/mutex.hxx> #include <rtl/ustring.hxx> #include <unotools/options.hxx> -//_________________________________________________________________________________________________________________ -// forward declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. @@ -51,10 +43,6 @@ class SvtStartOptions_Impl; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short collect informations about startup features @descr - @@ -67,16 +55,7 @@ class SvtStartOptions_Impl; class UNOTOOLS_DLLPUBLIC SvtStartOptions: public utl::detail::Options { - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - public: - - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short standard constructor and destructor @descr This will initialize an instance with default values. @@ -96,10 +75,6 @@ class UNOTOOLS_DLLPUBLIC SvtStartOptions: public utl::detail::Options SvtStartOptions(); virtual ~SvtStartOptions(); - //--------------------------------------------------------------------------------------------------------- - // interface - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** @short returns or set the connection URL of an office @descr Specifies the URL for an UNO connection. @@ -110,12 +85,6 @@ class UNOTOOLS_DLLPUBLIC SvtStartOptions: public utl::detail::Options *//*-*****************************************************************************************************/ ::rtl::OUString GetConnectionURL( ) const ; - void SetConnectionURL( const ::rtl::OUString& sURL ) ; - - //------------------------------------------------------------------------------------------------------------- - // private methods - //------------------------------------------------------------------------------------------------------------- - private: /*-****************************************************************************************************//** @@ -133,10 +102,6 @@ class UNOTOOLS_DLLPUBLIC SvtStartOptions: public utl::detail::Options UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); - //------------------------------------------------------------------------------------------------------------- - // private member - //------------------------------------------------------------------------------------------------------------- - private: /*Attention diff --git a/unotools/inc/unotools/syslocaleoptions.hxx b/unotools/inc/unotools/syslocaleoptions.hxx index becd4bc23df4..6df96491e129 100644 --- a/unotools/inc/unotools/syslocaleoptions.hxx +++ b/unotools/inc/unotools/syslocaleoptions.hxx @@ -112,7 +112,6 @@ public: /// The config string may be empty to denote the SYSTEM locale const ::rtl::OUString& GetUILocaleConfigString() const; void SetUILocaleConfigString( const ::rtl::OUString& rStr ); - com::sun::star::lang::Locale GetUILocale() const; com::sun::star::lang::Locale GetRealUILocale() const; LanguageType GetRealUILanguage() const; diff --git a/unotools/inc/unotools/useroptions.hxx b/unotools/inc/unotools/useroptions.hxx index 17f4d52bc248..2467fd23a4cd 100644 --- a/unotools/inc/unotools/useroptions.hxx +++ b/unotools/inc/unotools/useroptions.hxx @@ -90,7 +90,6 @@ public: ::rtl::OUString GetApartment() const; ::rtl::OUString GetFullName() const; - ::rtl::OUString GetLocale() const; // set the address token void SetCompany( const ::rtl::OUString& rNewToken ); diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index a131324cbf3c..e6568bc4d683 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -541,15 +541,6 @@ SvtCommandOptions::~SvtCommandOptions() //***************************************************************************************************************** // public method //***************************************************************************************************************** -void SvtCommandOptions::Clear( CmdOption eCmdOption ) -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - m_pDataContainer->Clear( eCmdOption ); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** sal_Bool SvtCommandOptions::HasEntries( CmdOption eOption ) const { MutexGuard aGuard( GetOwnStaticMutex() ); @@ -568,24 +559,6 @@ sal_Bool SvtCommandOptions::Lookup( CmdOption eCmdOption, const OUString& aComma //***************************************************************************************************************** // public method //***************************************************************************************************************** -Sequence< OUString > SvtCommandOptions::GetList( CmdOption eCmdOption ) const -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pDataContainer->GetList( eCmdOption ); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** -void SvtCommandOptions::AddCommand( CmdOption eCmdOption, const OUString& sURL ) -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - m_pDataContainer->AddCommand( eCmdOption, sURL ); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** void SvtCommandOptions::EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame) { MutexGuard aGuard( GetOwnStaticMutex() ); diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx index ecbc414d56d8..2f676be1ddeb 100644 --- a/unotools/source/config/dynamicmenuoptions.cxx +++ b/unotools/source/config/dynamicmenuoptions.cxx @@ -857,34 +857,12 @@ SvtDynamicMenuOptions::~SvtDynamicMenuOptions() //***************************************************************************************************************** // public method //***************************************************************************************************************** -void SvtDynamicMenuOptions::Clear( EDynamicMenuType eMenu ) -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - m_pDataContainer->Clear( eMenu ); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** Sequence< Sequence< PropertyValue > > SvtDynamicMenuOptions::GetMenu( EDynamicMenuType eMenu ) const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetMenu( eMenu ); } -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** -void SvtDynamicMenuOptions::AppendItem( EDynamicMenuType eMenu , - const OUString& sURL , - const OUString& sTitle , - const OUString& sImageIdentifier, - const OUString& sTargetName ) -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - m_pDataContainer->AppendItem( eMenu, sURL, sTitle, sImageIdentifier, sTargetName ); -} - namespace { class theDynamicMenuOptionsMutex : public rtl::Static<osl::Mutex, theDynamicMenuOptionsMutex>{}; diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index b06d33def3ed..d4ee8ff77597 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -469,44 +469,12 @@ SvtExtendedSecurityOptions::~SvtExtendedSecurityOptions() //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtExtendedSecurityOptions::IsSecureHyperlink( const rtl::OUString& aURL ) const -{ - MutexGuard aGuard( GetInitMutex() ); - return m_pDataContainer->IsSecureHyperlink( aURL ); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** -Sequence< rtl::OUString > SvtExtendedSecurityOptions::GetSecureExtensionList() const -{ - MutexGuard aGuard( GetInitMutex() ); - return m_pDataContainer->GetSecureExtensionList(); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** SvtExtendedSecurityOptions::OpenHyperlinkMode SvtExtendedSecurityOptions::GetOpenHyperlinkMode() { MutexGuard aGuard( GetInitMutex() ); return m_pDataContainer->GetOpenHyperlinkMode(); } -sal_Bool SvtExtendedSecurityOptions::IsOpenHyperlinkModeReadOnly() const -{ - return m_pDataContainer->IsOpenHyperlinkModeReadOnly(); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** -void SvtExtendedSecurityOptions::SetOpenHyperlinkMode( SvtExtendedSecurityOptions::OpenHyperlinkMode eMode ) -{ - MutexGuard aGuard( GetInitMutex() ); - m_pDataContainer->SetOpenHyperlinkMode( eMode ); -} - namespace { class theExtendedSecurityOptionsMutex : public rtl::Static<osl::Mutex, theExtendedSecurityOptionsMutex>{}; diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx index a5cb32e470c2..5b0b638390f8 100644 --- a/unotools/source/config/fltrcfg.cxx +++ b/unotools/source/config/fltrcfg.cxx @@ -565,12 +565,6 @@ sal_Bool SvtFilterOptions::IsUseEnhancedFields() const return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS ); } -void SvtFilterOptions::SetUseEnhancedFields( sal_Bool bFlag ) -{ - pImp->SetFlag( FILTERCFG_USE_ENHANCED_FIELDS, bFlag ); - SetModified(); -} - // ----------------------------------------------------------------------- sal_Bool SvtFilterOptions::IsExcel2Calc() const { diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx index c7f3f9aa7d74..96f5fe6ca25c 100644 --- a/unotools/source/config/fontoptions.cxx +++ b/unotools/source/config/fontoptions.cxx @@ -428,24 +428,6 @@ SvtFontOptions::~SvtFontOptions() //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtFontOptions::IsReplacementTableEnabled() const -{ - MutexGuard aGuard( impl_GetOwnStaticMutex() ); - return m_pDataContainer->IsReplacementTableEnabled(); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** -void SvtFontOptions::EnableReplacementTable( sal_Bool bState ) -{ - MutexGuard aGuard( impl_GetOwnStaticMutex() ); - m_pDataContainer->EnableReplacementTable( bState ); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** sal_Bool SvtFontOptions::IsFontHistoryEnabled() const { MutexGuard aGuard( impl_GetOwnStaticMutex() ); diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index 73161be7345d..6c94d5bd6c0d 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/unotools/source/config/historyoptions.cxx @@ -660,15 +660,6 @@ sal_uInt32 SvtHistoryOptions::GetSize( EHistoryType eHistory ) const //***************************************************************************************************************** // public method //***************************************************************************************************************** -void SvtHistoryOptions::SetSize( EHistoryType eHistory, sal_uInt32 nSize ) -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - m_pDataContainer->SetSize( eHistory, nSize ); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** void SvtHistoryOptions::Clear( EHistoryType eHistory ) { MutexGuard aGuard( GetOwnStaticMutex() ); diff --git a/unotools/source/config/internaloptions.cxx b/unotools/source/config/internaloptions.cxx index c373cce3c8c6..3976d1883a75 100644 --- a/unotools/source/config/internaloptions.cxx +++ b/unotools/source/config/internaloptions.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ - #include <deque> #include <unotools/internaloptions.hxx> @@ -478,48 +477,12 @@ sal_Bool SvtInternalOptions::SlotCFGEnabled() const //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtInternalOptions::CrashMailEnabled() const -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pDataContainer->CrashMailEnabled(); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** sal_Bool SvtInternalOptions::MailUIEnabled() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->MailUIEnabled(); } -//***************************************************************************************************************** -// public methods -//***************************************************************************************************************** -sal_Bool SvtInternalOptions::IsRemoveMenuEntryClose() const -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pDataContainer->IsRemoveMenuEntryClose(); -} - -sal_Bool SvtInternalOptions::IsRemoveMenuEntryBackToWebtop() const -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pDataContainer->IsRemoveMenuEntryBackToWebtop(); -} - -sal_Bool SvtInternalOptions::IsRemoveMenuEntryNewWebtop() const -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pDataContainer->IsRemoveMenuEntryNewWebtop(); -} - -sal_Bool SvtInternalOptions::IsRemoveMenuEntryLogout() const -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pDataContainer->IsRemoveMenuEntryLogout(); -} - OUString SvtInternalOptions::GetCurrentTempURL() const { MutexGuard aGuard( GetOwnStaticMutex() ); diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx index ba77809221ba..6bb02fce8352 100644 --- a/unotools/source/config/localisationoptions.cxx +++ b/unotools/source/config/localisationoptions.cxx @@ -397,30 +397,12 @@ sal_Bool SvtLocalisationOptions::IsAutoMnemonic() const //***************************************************************************************************************** // public method //***************************************************************************************************************** -void SvtLocalisationOptions::SetAutoMnemonic( sal_Bool bState ) -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - m_pDataContainer->SetAutoMnemonic( bState ); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** sal_Int32 SvtLocalisationOptions::GetDialogScale() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetDialogScale(); } -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** -void SvtLocalisationOptions::SetDialogScale( sal_Int32 nScale ) -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - m_pDataContainer->SetDialogScale( nScale ); -} - namespace { class theLocalisationOptionsMutex : public rtl::Static<osl::Mutex, theLocalisationOptionsMutex>{}; diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 46fbc0cc1bd2..6f7403ac2d98 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -1208,32 +1208,6 @@ sal_Bool SvtModuleOptions::IsDataBase() const ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SDATABASE ); } -//***************************************************************************************************************** -sal_uInt32 SvtModuleOptions::GetFeatures() const -{ - ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); - - sal_uInt32 nFeature = 0; - - if( m_pDataContainer->IsModuleInstalled( E_SWRITER ) == sal_True ) - nFeature |= FEATUREFLAG_WRITER; - if( m_pDataContainer->IsModuleInstalled( E_SCALC ) == sal_True ) - nFeature |= FEATUREFLAG_CALC; - if( m_pDataContainer->IsModuleInstalled( E_SDRAW ) == sal_True ) - nFeature |= FEATUREFLAG_DRAW; - if( m_pDataContainer->IsModuleInstalled( E_SIMPRESS ) == sal_True ) - nFeature |= FEATUREFLAG_IMPRESS; - if( m_pDataContainer->IsModuleInstalled( E_SCHART ) == sal_True ) - nFeature |= FEATUREFLAG_CHART; - if( m_pDataContainer->IsModuleInstalled( E_SMATH ) == sal_True ) - nFeature |= FEATUREFLAG_MATH; - if( m_pDataContainer->IsModuleInstalled( E_SBASIC ) == sal_True ) - nFeature |= FEATUREFLAG_BASICIDE; - if( m_pDataContainer->IsModuleInstalled( E_SDATABASE ) == sal_True ) - nFeature |= FEATUREFLAG_INSIGHT; - - return nFeature; -} namespace { @@ -1280,28 +1254,6 @@ namespace return ::rtl::OUString(); } -::rtl::OUString SvtModuleOptions::GetModuleName( EFactory eFactory ) const -{ - switch( eFactory ) - { - case SvtModuleOptions::E_WRITER : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Writer")); } - case SvtModuleOptions::E_WRITERWEB : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Writer")); } - case SvtModuleOptions::E_WRITERGLOBAL : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Writer")); } - case SvtModuleOptions::E_CALC : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Calc")); } - case SvtModuleOptions::E_DRAW : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Draw")); } - case SvtModuleOptions::E_IMPRESS : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Impress")); } - case SvtModuleOptions::E_MATH : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Math")); } - case SvtModuleOptions::E_CHART : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Chart")); } - case SvtModuleOptions::E_BASIC : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Basic")); } - case SvtModuleOptions::E_DATABASE : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Database")); } - default: - OSL_FAIL( "unknown factory" ); - break; - } - - return ::rtl::OUString(); -} - /*----------------------------------------------- 07.03.2004 15:03 -----------------------------------------------*/ diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 68c6d171322e..beb37edb5058 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -1011,20 +1011,5 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Pathes ePath ) { return pImp->GetLocale(); } -// ----------------------------------------------------------------------- -sal_Bool SvtPathOptions::IsPathReadonly(Pathes ePath)const -{ - return pImp->IsPathReadonly(ePath); -} -// ----------------------------------------------------------------------- -const String& SvtPathOptions::GetPath(Pathes ePath)const -{ - return pImp->GetPath(ePath); -} -// ----------------------------------------------------------------------- -void SvtPathOptions::SetPath( SvtPathOptions::Pathes ePath, const String& rNewPath ) -{ - pImp->SetPath(ePath, rNewPath); -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx index c90e525eafb2..c790c1257e64 100644 --- a/unotools/source/config/printwarningoptions.cxx +++ b/unotools/source/config/printwarningoptions.cxx @@ -322,15 +322,6 @@ sal_Bool SvtPrintWarningOptions::IsPaperOrientation() const //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtPrintWarningOptions::IsNotFound() const -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pDataContainer->IsNotFound(); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** sal_Bool SvtPrintWarningOptions::IsTransparency() const { MutexGuard aGuard( GetOwnStaticMutex() ); @@ -358,15 +349,6 @@ void SvtPrintWarningOptions::SetPaperOrientation( sal_Bool bState ) //***************************************************************************************************************** // public method //***************************************************************************************************************** -void SvtPrintWarningOptions::SetNotFound( sal_Bool bState ) -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - m_pDataContainer->SetNotFound( bState ); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** void SvtPrintWarningOptions::SetTransparency( sal_Bool bState ) { MutexGuard aGuard( GetOwnStaticMutex() ); diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 2fb32c4a1ce7..787b644c5781 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -1000,11 +1000,6 @@ sal_Bool SvtSaveOptions::IsSaveRelFSys() const return pImp->pSaveOpt->IsSaveRelFSys(); } -void SvtSaveOptions::SetSaveUnpacked( sal_Bool b ) -{ - pImp->pSaveOpt->SetSaveUnpacked( b ); -} - sal_Bool SvtSaveOptions::IsSaveUnpacked() const { return pImp->pSaveOpt->IsSaveUnpacked(); @@ -1060,21 +1055,11 @@ SvtSaveOptions::ODFDefaultVersion SvtSaveOptions::GetODFDefaultVersion() const return pImp->pSaveOpt->GetODFDefaultVersion(); } -void SvtSaveOptions::SetUseSHA1InODF12( sal_Bool bUse ) -{ - pImp->pSaveOpt->SetUseSHA1InODF12( bUse ); -} - sal_Bool SvtSaveOptions::IsUseSHA1InODF12() const { return pImp->pSaveOpt->IsUseSHA1InODF12(); } -void SvtSaveOptions::SetUseBlowfishInODF12( sal_Bool bUse ) -{ - pImp->pSaveOpt->SetUseBlowfishInODF12( bUse ); -} - sal_Bool SvtSaveOptions::IsUseBlowfishInODF12() const { return pImp->pSaveOpt->IsUseBlowfishInODF12(); diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index e51386d3e0bd..3e30e7e27a3e 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.cxx @@ -358,13 +358,6 @@ void SvtSearchOptions::SetUseRegularExpression( sal_Bool bVal ) pImpl->SetFlag( 2, bVal ); } - -sal_Bool SvtSearchOptions::IsSearchForStyles() const -{ - return pImpl->GetFlag( 3 ); -} - - void SvtSearchOptions::SetSearchForStyles( sal_Bool bVal ) { pImpl->SetFlag( 3, bVal ); diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 71ca268b7bd5..89b63cbd1ca9 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -1140,12 +1140,6 @@ void SvtSecurityOptions::SetTrustedAuthors( const Sequence< Certificate >& rAuth m_pDataContainer->SetTrustedAuthors( rAuthors ); } -sal_Bool SvtSecurityOptions::IsTrustedAuthorsEnabled() -{ - MutexGuard aGuard( GetInitMutex() ); - return m_pDataContainer->IsTrustedAuthorsEnabled(); -} - bool SvtSecurityOptions::IsOptionSet( EOption eOption ) const { MutexGuard aGuard( GetInitMutex() ); diff --git a/unotools/source/config/startoptions.cxx b/unotools/source/config/startoptions.cxx index 070111fde6f5..093a4c5b1318 100644 --- a/unotools/source/config/startoptions.cxx +++ b/unotools/source/config/startoptions.cxx @@ -379,15 +379,6 @@ OUString SvtStartOptions::GetConnectionURL() const return m_pDataContainer->GetConnectionURL(); } -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** -void SvtStartOptions::SetConnectionURL( const OUString& sURL ) -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - m_pDataContainer->SetConnectionURL( sURL ); -} - namespace { class theStartOptionsMutex : public rtl::Static<osl::Mutex, theStartOptionsMutex>{}; diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index 00652986a25f..b37108413c77 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -660,11 +660,6 @@ com::sun::star::lang::Locale SvtSysLocaleOptions::GetLocale() const return lcl_str_to_locale( GetLocaleConfigString() ); } -com::sun::star::lang::Locale SvtSysLocaleOptions::GetUILocale() const -{ - return lcl_str_to_locale( GetUILocaleConfigString() ); -} - com::sun::star::lang::Locale SvtSysLocaleOptions::GetRealLocale() const { return pOptions->GetRealLocale(); diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index 235ab8e0098e..cec823ebfc9d 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.cxx @@ -1135,13 +1135,6 @@ namespace // ----------------------------------------------------------------------- -::rtl::OUString SvtUserOptions::GetLocale() const -{ - return utl::ConfigManager::getLocale(); -} - -// ----------------------------------------------------------------------- - void SvtUserOptions::SetCompany( const ::rtl::OUString& rNewToken ) { ::osl::MutexGuard aGuard( GetInitMutex() ); |