diff options
author | August Sodora <augsod@gmail.com> | 2011-12-16 23:49:38 -0500 |
---|---|---|
committer | August Sodora <augsod@gmail.com> | 2011-12-19 14:36:10 -0500 |
commit | db8ff2610aea96597f1a09ec81ae09a7c832d158 (patch) | |
tree | a4e43a3f315d5f7efb89073e89687fcb1f8ca576 /unotools | |
parent | 4f766a2d84de3cc9fa872c251501df79f5081e22 (diff) |
callcatcher: Remove unused code
Diffstat (limited to 'unotools')
34 files changed, 0 insertions, 791 deletions
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() ); |