[Libreoffice-commits] .: 6 commits - cui/source sc/source svl/inc svl/source svtools/inc svtools/source sw/source unotools/inc unotools/source
August Sodora
augsod at kemper.freedesktop.org
Mon Dec 19 11:37:46 PST 2011
cui/source/inc/treeopt.hxx | 46 -
cui/source/options/treeopt.cxx | 650 ++++++++-------------
cui/source/options/treeopt.hrc | 21
cui/source/options/treeopt.src | 82 --
sc/source/ui/dbgui/tpsort.cxx | 23
sc/source/ui/dbgui/tpsubt.cxx | 17
sc/source/ui/inc/tpcalc.hxx | 1
sc/source/ui/inc/tpprint.hxx | 1
sc/source/ui/inc/tpsort.hxx | 2
sc/source/ui/inc/tpsubt.hxx | 2
sc/source/ui/inc/tpusrlst.hxx | 1
sc/source/ui/optdlg/tpcalc.cxx | 19
sc/source/ui/optdlg/tpprint.cxx | 14
sc/source/ui/optdlg/tpusrlst.cxx | 15
svl/inc/svl/languageoptions.hxx | 8
svl/source/config/languageoptions.cxx | 40 -
svtools/inc/svtools/accessibilityoptions.hxx | 1
svtools/inc/svtools/helpopt.hxx | 1
svtools/inc/svtools/htmlcfg.hxx | 3
svtools/inc/svtools/menuoptions.hxx | 35 -
svtools/inc/svtools/miscopt.hxx | 40 -
svtools/source/config/accessibilityoptions.cxx | 5
svtools/source/config/helpopt.cxx | 5
svtools/source/config/htmlcfg.cxx | 17
svtools/source/config/menuoptions.cxx | 27
svtools/source/config/miscopt.cxx | 35 -
sw/source/ui/app/appopt.cxx | 5
sw/source/ui/dialog/swdlgfact.cxx | 2
unotools/inc/unotools/cmdoptions.hxx | 81 --
unotools/inc/unotools/dynamicmenuoptions.hxx | 75 --
unotools/inc/unotools/extendedsecurityoptions.hxx | 33 -
unotools/inc/unotools/fltrcfg.hxx | 1
unotools/inc/unotools/fontoptions.hxx | 38 -
unotools/inc/unotools/historyoptions.hxx | 38 -
unotools/inc/unotools/internaloptions.hxx | 41 -
unotools/inc/unotools/localisationoptions.hxx | 36 -
unotools/inc/unotools/moduleoptions.hxx | 41 -
unotools/inc/unotools/pathoptions.hxx | 4
unotools/inc/unotools/printwarningoptions.hxx | 34 -
unotools/inc/unotools/saveopt.hxx | 3
unotools/inc/unotools/searchopt.hxx | 1
unotools/inc/unotools/securityoptions.hxx | 29
unotools/inc/unotools/startoptions.hxx | 35 -
unotools/inc/unotools/syslocaleoptions.hxx | 1
unotools/inc/unotools/useroptions.hxx | 1
unotools/source/config/cmdoptions.cxx | 27
unotools/source/config/dynamicmenuoptions.cxx | 22
unotools/source/config/extendedsecurityoptions.cxx | 145 ----
unotools/source/config/fltrcfg.cxx | 6
unotools/source/config/fontoptions.cxx | 18
unotools/source/config/historyoptions.cxx | 9
unotools/source/config/internaloptions.cxx | 37 -
unotools/source/config/localisationoptions.cxx | 18
unotools/source/config/moduleoptions.cxx | 48 -
unotools/source/config/pathoptions.cxx | 15
unotools/source/config/printwarningoptions.cxx | 18
unotools/source/config/saveopt.cxx | 15
unotools/source/config/searchopt.cxx | 7
unotools/source/config/securityoptions.cxx | 6
unotools/source/config/startoptions.cxx | 9
unotools/source/config/syslocaleoptions.cxx | 5
unotools/source/config/useroptions.cxx | 7
62 files changed, 260 insertions(+), 1762 deletions(-)
New commits:
commit 4327d79148af677629fceb1e0e7ddf99f9540d22
Author: August Sodora <augsod at gmail.com>
Date: Sat Dec 17 00:02:24 2011 -0500
Remove unused code
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index d4ee8ff..13cec84 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -26,11 +26,6 @@
*
************************************************************************/
-
-//_________________________________________________________________________________________________________________
-// includes
-//_________________________________________________________________________________________________________________
-
#include <unotools/extendedsecurityoptions.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/configitem.hxx>
@@ -48,19 +43,11 @@
#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
-//_________________________________________________________________________________________________________________
-// namespaces
-//_________________________________________________________________________________________________________________
-
using namespace ::utl ;
using namespace ::rtl ;
using namespace ::osl ;
using namespace ::com::sun::star::uno ;
-//_________________________________________________________________________________________________________________
-// const
-//_________________________________________________________________________________________________________________
-
#define ROOTNODE_SECURITY OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Security"))
#define SECURE_EXTENSIONS_SET OUString(RTL_CONSTASCII_USTRINGPARAM("SecureExtensions"))
@@ -72,10 +59,6 @@ using namespace ::com::sun::star::uno ;
#define PROPERTYCOUNT 1
-//_________________________________________________________________________________________________________________
-// private declarations!
-//_________________________________________________________________________________________________________________
-
struct OUStringHashCode
{
size_t operator()( const ::rtl::OUString& sString ) const
@@ -98,23 +81,10 @@ class ExtensionHashMap : public ::boost::unordered_map< ::rtl::OUString,
class SvtExtendedSecurityOptions_Impl : public ConfigItem
{
- //-------------------------------------------------------------------------------------------------------------
- // public methods
- //-------------------------------------------------------------------------------------------------------------
-
public:
-
- //---------------------------------------------------------------------------------------------------------
- // constructor / destructor
- //---------------------------------------------------------------------------------------------------------
-
SvtExtendedSecurityOptions_Impl();
~SvtExtendedSecurityOptions_Impl();
- //---------------------------------------------------------------------------------------------------------
- // overloaded methods of baseclass
- //---------------------------------------------------------------------------------------------------------
-
/*-****************************************************************************************************//**
@short called for notify of configmanager
@descr These method is called from the ConfigManager before application ends or from the
@@ -146,33 +116,7 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem
virtual void Commit();
- //---------------------------------------------------------------------------------------------------------
- // public interface
- //---------------------------------------------------------------------------------------------------------
-
- /*-****************************************************************************************************//**
- @short Access method to check for security problems
- @descr Different methods to check for security related problems.
-
- @seealso -
-
- @param -
- @return -
-
- @onerror -
- *//*-*****************************************************************************************************/
-
- sal_Bool IsSecureHyperlink( const rtl::OUString& aURL ) const;
- Sequence< rtl::OUString > GetSecureExtensionList() const;
-
SvtExtendedSecurityOptions::OpenHyperlinkMode GetOpenHyperlinkMode();
- void SetOpenHyperlinkMode( SvtExtendedSecurityOptions::OpenHyperlinkMode aMode );
- sal_Bool IsOpenHyperlinkModeReadOnly() const;
-
- //-------------------------------------------------------------------------------------------------------------
- // private methods
- //-------------------------------------------------------------------------------------------------------------
-
private:
/*-****************************************************************************************************//**
@@ -204,11 +148,6 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem
*//*-*****************************************************************************************************/
void FillExtensionHashMap( ExtensionHashMap& aHashMap );
- //-------------------------------------------------------------------------------------------------------------
- // private member
- //-------------------------------------------------------------------------------------------------------------
-
- private:
OUString m_aSecureExtensionsSetName;
OUString m_aExtensionPropName;
@@ -217,10 +156,6 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem
ExtensionHashMap m_aExtensionHashMap;
};
-//_________________________________________________________________________________________________________________
-// definitions
-//_________________________________________________________________________________________________________________
-
//*****************************************************************************************************************
// constructor
//*****************************************************************************************************************
@@ -317,59 +252,11 @@ void SvtExtendedSecurityOptions_Impl::Commit()
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-sal_Bool SvtExtendedSecurityOptions_Impl::IsSecureHyperlink( const OUString& aURL ) const
-{
- INetURLObject aURLObject( aURL );
-
- String aExtension = aURLObject.getExtension();
- aExtension.ToLowerAscii();
-
- ExtensionHashMap::const_iterator pIter = m_aExtensionHashMap.find( aExtension );
- if ( pIter != m_aExtensionHashMap.end() )
- return sal_True;
- else
- return sal_False;
-}
-
-//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
-Sequence< OUString > SvtExtendedSecurityOptions_Impl::GetSecureExtensionList() const
-{
- Sequence< OUString > aResult( m_aExtensionHashMap.size() );
-
- sal_Int32 nIndex = 0;
- for ( ExtensionHashMap::const_iterator pIter = m_aExtensionHashMap.begin();
- pIter != m_aExtensionHashMap.end(); ++pIter )
- {
- aResult[nIndex++] = pIter->first;
- }
-
- return aResult;
-}
-
-//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
SvtExtendedSecurityOptions::OpenHyperlinkMode SvtExtendedSecurityOptions_Impl::GetOpenHyperlinkMode()
{
return m_eOpenHyperlinkMode;
}
-sal_Bool SvtExtendedSecurityOptions_Impl::IsOpenHyperlinkModeReadOnly() const
-{
- return m_bROOpenHyperlinkMode;
-}
-
-//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
-void SvtExtendedSecurityOptions_Impl::SetOpenHyperlinkMode( SvtExtendedSecurityOptions::OpenHyperlinkMode eNewMode )
-{
- m_eOpenHyperlinkMode = eNewMode;
- SetModified();
-}
-
//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
commit db8ff2610aea96597f1a09ec81ae09a7c832d158
Author: August Sodora <augsod at gmail.com>
Date: Fri Dec 16 23:49:38 2011 -0500
callcatcher: Remove unused code
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 70e53b0..6609563 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 14332e5..c2bc52f 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 9ab7c10..c680b0b 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 7aa0014..20edfd0 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 059a5f4..987f20b 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 8accbe9..d3f987e 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 bb22358..0ba8e3d 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 853c87b..0eb5bf7 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 e8cac65..8185028 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 5e69b75..46b9037 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 e4d8f23..f1bc3e5 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 c750ec9..77f1fce 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 2f964c5..1c21994 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 020b64c..0e14911 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 9b35b7b..9d6c7b6 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 eb0f83d..00f4100 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 eeabc62..66eb0c1 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 b89c308..5b09f66 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 e5359da..6e1eb8b 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 76954df..81bd2b7 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 6fd10f8..8d2ee21 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 2c1b498..36a4466 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 719d99d..ff1b64c 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 e47bd0b..01e9394 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 478e1f2..87de457 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 cd581e6..052d664 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 1c438ae..171ae04 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 ee3b9c0..2b36a7c 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 38bb833..f31d639 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 f9aa7a8..b05bd17 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 febf4f6..fa489e5 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 53e6cca..9029136 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 da8395a..476cbae 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 43f60c5..0f20d62 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 10ed2ca..cf9b38a 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 fd1b7c7..045e38d 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
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list