[Libreoffice-commits] .: 3 commits - svl/inc svl/source svtools/source unotools/inc unotools/source unusedcode.easy vcl/inc vcl/source writerfilter/inc writerfilter/source
August Sodora
augsod at kemper.freedesktop.org
Tue Dec 20 12:23:49 PST 2011
svl/inc/svl/cjkoptions.hxx | 2
svl/source/config/cjkoptions.cxx | 14 ---
svtools/source/config/miscopt.cxx | 41 ---------
unotools/inc/unotools/accelcfg.hxx | 10 --
unotools/inc/unotools/lingucfg.hxx | 2
unotools/inc/unotools/syslocaleoptions.hxx | 1
unotools/source/config/accelcfg.cxx | 33 -------
unotools/source/config/cmdoptions.cxx | 109 ------------------------
unotools/source/config/dynamicmenuoptions.cxx | 108 -----------------------
unotools/source/config/fontoptions.cxx | 60 -------------
unotools/source/config/historyoptions.cxx | 63 -------------
unotools/source/config/lingucfg.cxx | 37 --------
unotools/source/config/localisationoptions.cxx | 60 -------------
unotools/source/config/pathoptions.cxx | 23 -----
unotools/source/config/saveopt.cxx | 31 ------
unotools/source/config/startoptions.cxx | 50 -----------
unotools/source/config/syslocaleoptions.cxx | 7 -
unusedcode.easy | 32 -------
vcl/inc/printdlg.hxx | 1
vcl/inc/vcl/arrange.hxx | 2
vcl/inc/vcl/canvastools.hxx | 24 -----
vcl/source/helper/canvastools.cxx | 44 ---------
vcl/source/window/arrange.cxx | 32 -------
vcl/source/window/printdlg.cxx | 5 -
writerfilter/inc/resourcemodel/TagLogger.hxx | 2
writerfilter/source/resourcemodel/TagLogger.cxx | 12 --
26 files changed, 1 insertion(+), 804 deletions(-)
New commits:
commit bbe9cf453c9fd1809e6802e01bf959f7de7e9de9
Author: August Sodora <augsod at gmail.com>
Date: Tue Dec 20 15:20:29 2011 -0500
callcatcher: Remove unused code
diff --git a/svl/inc/svl/cjkoptions.hxx b/svl/inc/svl/cjkoptions.hxx
index 430c8e5..c4db7b4 100644
--- a/svl/inc/svl/cjkoptions.hxx
+++ b/svl/inc/svl/cjkoptions.hxx
@@ -68,8 +68,6 @@ public:
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;
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index 5e07df8..1bc9726 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -86,8 +86,6 @@ public:
sal_Bool IsRubyEnabled() const { return bRuby; }
sal_Bool IsChangeCaseMapEnabled() const { return bChangeCaseMap; }
sal_Bool IsDoubleLinesEnabled() const { return bDoubleLines; }
- sal_Bool IsEmphasisMarksEnabled() const { return bEmphasisMarks; }
- sal_Bool IsVerticalCallOutEnabled() const { return bVerticalCallOut; }
sal_Bool IsAnyEnabled() const {
return bCJKFont||bVerticalText||bAsianTypography||bJapaneseFind||
@@ -448,18 +446,6 @@ sal_Bool SvtCJKOptions::IsDoubleLinesEnabled() const
DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
return pCJKOptions->IsDoubleLinesEnabled();
}
-// -----------------------------------------------------------------------
-sal_Bool SvtCJKOptions::IsEmphasisMarksEnabled() const
-{
- DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
- return pCJKOptions->IsEmphasisMarksEnabled();
-}
-// -----------------------------------------------------------------------
-sal_Bool SvtCJKOptions::IsVerticalCallOutEnabled() const
-{
- DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
- return pCJKOptions->IsVerticalCallOutEnabled();
-}
void SvtCJKOptions::SetAll(sal_Bool bSet)
{
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 36a4466..42a0c0d 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -26,10 +26,6 @@
*
************************************************************************/
-//_________________________________________________________________________________________________________________
-// includes
-//_________________________________________________________________________________________________________________
-
#include <svtools/miscopt.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/configitem.hxx>
@@ -49,20 +45,12 @@
#include <list>
-//_________________________________________________________________________________________________________________
-// namespaces
-//_________________________________________________________________________________________________________________
-
using namespace ::utl ;
using namespace ::rtl ;
using namespace ::osl ;
using namespace ::com::sun::star::uno ;
using namespace ::com::sun::star;
-//_________________________________________________________________________________________________________________
-// const
-//_________________________________________________________________________________________________________________
-
#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
#define ROOTNODE_MISC ASCII_STR("Office.Common/Misc")
#define DEFAULT_PLUGINSENABLED sal_True;
@@ -94,16 +82,8 @@ using namespace ::com::sun::star;
#define VCL_TOOLBOX_STYLE_FLAT ((sal_uInt16)0x0004) // from <vcl/toolbox.hxx>
-//_________________________________________________________________________________________________________________
-// private declarations!
-//_________________________________________________________________________________________________________________
-
class SvtMiscOptions_Impl : public ConfigItem
{
- //-------------------------------------------------------------------------------------------------------------
- // private member
- //-------------------------------------------------------------------------------------------------------------
-
private:
::std::list<Link> aList;
sal_Bool m_bUseSystemFileDialog;
@@ -125,23 +105,11 @@ class SvtMiscOptions_Impl : public ConfigItem
sal_Bool m_bAlwaysAllowSave;
sal_Bool m_bExperimentalMode;
- //-------------------------------------------------------------------------------------------------------------
- // public methods
- //-------------------------------------------------------------------------------------------------------------
-
public:
- //---------------------------------------------------------------------------------------------------------
- // constructor / destructor
- //---------------------------------------------------------------------------------------------------------
-
SvtMiscOptions_Impl();
~SvtMiscOptions_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
@@ -219,8 +187,6 @@ class SvtMiscOptions_Impl : public ConfigItem
inline sal_Bool IsPluginsEnabled() const
{ return m_bPluginsEnabled; }
- void SetPluginsEnabled( sal_Bool bEnable );
-
inline sal_Bool IsPluginsEnabledReadOnly() const
{ return m_bIsPluginsEnabledRO; }
@@ -646,13 +612,6 @@ void SvtMiscOptions_Impl::ImplSetSymbolsStyle( bool bValue, sal_Int16 nSet, cons
}
}
-void SvtMiscOptions_Impl::SetPluginsEnabled( sal_Bool bEnable )
-{
- m_bPluginsEnabled = bEnable;
- SetModified();
- CallListeners();
-}
-
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
diff --git a/unotools/inc/unotools/accelcfg.hxx b/unotools/inc/unotools/accelcfg.hxx
index 633ab38..d18076b 100644
--- a/unotools/inc/unotools/accelcfg.hxx
+++ b/unotools/inc/unotools/accelcfg.hxx
@@ -68,18 +68,8 @@ public:
// save the configuration to a stream, f.e. into a document
bool Commit( SvStream& rStream );
- // returns the configured URL for a KeyEvent
- ::rtl::OUString GetCommand( const ::com::sun::star::awt::KeyEvent& rKeyEvent );
-
- // returns the whole configuration
- const SvtAcceleratorItemList& GetItems();
-
// sets a single configuration item
void SetCommand( const SvtAcceleratorConfigItem& rItem );
-
- // sets several or all configuration items
- // if bClear=sal_False, all items not in the sequence remain unchanged
- void SetItems( const SvtAcceleratorItemList& rItems, bool bClear );
};
#endif
diff --git a/unotools/inc/unotools/lingucfg.hxx b/unotools/inc/unotools/lingucfg.hxx
index 668cb26..6ae88f0 100644
--- a/unotools/inc/unotools/lingucfg.hxx
+++ b/unotools/inc/unotools/lingucfg.hxx
@@ -205,10 +205,8 @@ public:
const com::sun::star::uno::Any &rValue );
sal_Bool GetOptions( SvtLinguOptions &rOptions ) const;
- sal_Bool SetOptions( const SvtLinguOptions &rOptions );
sal_Bool IsReadOnly( const rtl::OUString &rPropertyName ) const;
- sal_Bool IsReadOnly( sal_Int32 nPropertyHandle ) const;
//!
//! the following functions work on the 'ServiceManager' sub node of the
diff --git a/unotools/inc/unotools/syslocaleoptions.hxx b/unotools/inc/unotools/syslocaleoptions.hxx
index 6df9649..d053835 100644
--- a/unotools/inc/unotools/syslocaleoptions.hxx
+++ b/unotools/inc/unotools/syslocaleoptions.hxx
@@ -110,7 +110,6 @@ public:
LanguageType GetRealLanguage() const;
/// The config string may be empty to denote the SYSTEM locale
- const ::rtl::OUString& GetUILocaleConfigString() const;
void SetUILocaleConfigString( const ::rtl::OUString& rStr );
com::sun::star::lang::Locale GetRealUILocale() const;
LanguageType GetRealUILanguage() const;
diff --git a/unotools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx
index 200266c..f780df1 100644
--- a/unotools/source/config/accelcfg.cxx
+++ b/unotools/source/config/accelcfg.cxx
@@ -202,25 +202,6 @@ SvtAcceleratorConfiguration::~SvtAcceleratorConfiguration()
}
}
-::rtl::OUString SvtAcceleratorConfiguration::GetCommand( const ::com::sun::star::awt::KeyEvent& rKeyEvent )
-{
- sal_Int16 nCode=rKeyEvent.KeyCode, nModifier=rKeyEvent.Modifiers;
- if ( !nCode )
- nCode = rKeyEvent.KeyFunc;
-
- std::list< SvtAcceleratorConfigItem>::const_iterator p;
- for ( p = pImp->aList.begin(); p != pImp->aList.end(); ++p )
- if ( p->nCode == nCode && p->nModifier == nModifier )
- return p->aCommand;
-
- return ::rtl::OUString();
-}
-
-const SvtAcceleratorItemList& SvtAcceleratorConfiguration::GetItems()
-{
- return pImp->aList;
-}
-
void SvtAcceleratorConfiguration::SetCommand( const SvtAcceleratorConfigItem& rItem )
{
std::list< SvtAcceleratorConfigItem>::iterator p;
@@ -235,20 +216,6 @@ void SvtAcceleratorConfiguration::SetCommand( const SvtAcceleratorConfigItem& rI
}
-void SvtAcceleratorConfiguration::SetItems( const SvtAcceleratorItemList& rItems, bool bClear )
-{
- if ( bClear )
- {
- pImp->aList = rItems;
- }
- else
- {
- std::list< SvtAcceleratorConfigItem>::const_iterator p;
- for ( p = rItems.begin(); p != rItems.end(); ++p )
- SetCommand( *p );
- }
-}
-
String SvtAcceleratorConfiguration::GetStreamName()
{
return String::CreateFromAscii("KeyBindings.xml");
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index e6568bc..e17672b 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -26,11 +26,6 @@
*
************************************************************************/
-
-//_________________________________________________________________________________________________________________
-// includes
-//_________________________________________________________________________________________________________________
-
#include <unotools/cmdoptions.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/configitem.hxx>
@@ -47,10 +42,6 @@
#include <algorithm>
#include <boost/unordered_map.hpp>
-//_________________________________________________________________________________________________________________
-// namespaces
-//_________________________________________________________________________________________________________________
-
using namespace ::std ;
using namespace ::utl ;
using namespace ::rtl ;
@@ -58,10 +49,6 @@ using namespace ::osl ;
using namespace ::com::sun::star::uno ;
using namespace ::com::sun::star::beans ;
-//_________________________________________________________________________________________________________________
-// const
-//_________________________________________________________________________________________________________________
-
#define ROOTNODE_CMDOPTIONS OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Commands/Execute" ))
#define PATHDELIMITER OUString(RTL_CONSTASCII_USTRINGPARAM("/" ))
@@ -73,10 +60,6 @@ using namespace ::com::sun::star::beans ;
#define OFFSET_CMD 0
-//_________________________________________________________________________________________________________________
-// private declarations!
-//_________________________________________________________________________________________________________________
-
// Method to retrieve a hash code from a string. May be we have to change it to decrease collisions in the hash map
struct OUStringHashCode
{
@@ -156,23 +139,11 @@ typedef ::std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::f
class SvtCommandOptions_Impl : public ConfigItem
{
- //-------------------------------------------------------------------------------------------------------------
- // public methods
- //-------------------------------------------------------------------------------------------------------------
-
public:
- //---------------------------------------------------------------------------------------------------------
- // constructor / destructor
- //---------------------------------------------------------------------------------------------------------
-
SvtCommandOptions_Impl();
~SvtCommandOptions_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
@@ -204,10 +175,6 @@ class SvtCommandOptions_Impl : public ConfigItem
virtual void Commit();
- //---------------------------------------------------------------------------------------------------------
- // public interface
- //---------------------------------------------------------------------------------------------------------
-
/*-****************************************************************************************************//**
@short base implementation of public interface for "SvtDynamicMenuOptions"!
@descr These class is used as static member of "SvtDynamicMenuOptions" ...
@@ -221,18 +188,10 @@ class SvtCommandOptions_Impl : public ConfigItem
@onerror -
*//*-*****************************************************************************************************/
- void Clear ( SvtCommandOptions::CmdOption eCmdOption );
sal_Bool HasEntries ( SvtCommandOptions::CmdOption eOption ) const;
sal_Bool Lookup ( SvtCommandOptions::CmdOption eCmdOption, const OUString& ) const;
- Sequence< OUString > GetList ( SvtCommandOptions::CmdOption eCmdOption ) const ;
- void AddCommand ( SvtCommandOptions::CmdOption eCmdOption,
- const OUString& sURL );
void EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
- //-------------------------------------------------------------------------------------------------------------
- // private methods
- //-------------------------------------------------------------------------------------------------------------
-
private:
/*-****************************************************************************************************//**
@@ -250,19 +209,11 @@ class SvtCommandOptions_Impl : public ConfigItem
Sequence< OUString > impl_GetPropertyNames();
- //-------------------------------------------------------------------------------------------------------------
- // private member
- //-------------------------------------------------------------------------------------------------------------
-
private:
SvtCmdOptions m_aDisabledCommands;
SvtFrameVector m_lFrames;
};
-//_________________________________________________________________________________________________________________
-// definitions
-//_________________________________________________________________________________________________________________
-
//*****************************************************************************************************************
// constructor
//*****************************************************************************************************************
@@ -367,25 +318,6 @@ void SvtCommandOptions_Impl::Commit()
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-void SvtCommandOptions_Impl::Clear( SvtCommandOptions::CmdOption eCmdOption )
-{
- switch( eCmdOption )
- {
- case SvtCommandOptions::CMDOPTION_DISABLED:
- {
- m_aDisabledCommands.Clear();
- SetModified();
- }
- break;
-
- default:
- DBG_ASSERT( sal_False, "SvtCommandOptions_Impl::Clear()\nUnknown option type given!\n" );
- }
-}
-
-//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
sal_Bool SvtCommandOptions_Impl::HasEntries( SvtCommandOptions::CmdOption eOption ) const
{
if ( eOption == SvtCommandOptions::CMDOPTION_DISABLED )
@@ -397,28 +329,6 @@ sal_Bool SvtCommandOptions_Impl::HasEntries( SvtCommandOptions::CmdOption eOptio
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-Sequence< OUString > SvtCommandOptions_Impl::GetList( SvtCommandOptions::CmdOption eCmdOption ) const
-{
- Sequence< OUString > lReturn;
-
- switch( eCmdOption )
- {
- case SvtCommandOptions::CMDOPTION_DISABLED:
- {
- lReturn = m_aDisabledCommands.GetList();
- }
- break;
-
- default:
- DBG_ASSERT( sal_False, "SvtCommandOptions_Impl::GetList()\nUnknown option type given!\n" );
- }
-
- return lReturn;
-}
-
-//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
sal_Bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption, const OUString& aCommand ) const
{
switch( eCmdOption )
@@ -437,25 +347,6 @@ sal_Bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-void SvtCommandOptions_Impl::AddCommand( SvtCommandOptions::CmdOption eCmdOption, const OUString& sCmd )
-{
- switch( eCmdOption )
- {
- case SvtCommandOptions::CMDOPTION_DISABLED:
- {
- m_aDisabledCommands.AddCommand( sCmd );
- SetModified();
- }
- break;
-
- default:
- DBG_ASSERT( sal_False, "SvtCommandOptions_Impl::GetList()\nUnknown option type given!\n" );
- }
-}
-
-//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
void SvtCommandOptions_Impl::EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame)
{
// check if frame already exists inside list
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index 2f676be..c972c93 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -41,10 +41,6 @@
#include <algorithm>
-//_________________________________________________________________________________________________________________
-// namespaces
-//_________________________________________________________________________________________________________________
-
using namespace ::std ;
using namespace ::utl ;
using namespace ::rtl ;
@@ -52,10 +48,6 @@ using namespace ::osl ;
using namespace ::com::sun::star::uno ;
using namespace ::com::sun::star::beans ;
-//_________________________________________________________________________________________________________________
-// const
-//_________________________________________________________________________________________________________________
-
#define ROOTNODE_MENUS OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Menus/" ))
#define PATHDELIMITER OUString(RTL_CONSTASCII_USTRINGPARAM("/" ))
@@ -78,10 +70,6 @@ using namespace ::com::sun::star::beans ;
#define PATHPREFIX_SETUP OUString(RTL_CONSTASCII_USTRINGPARAM("m" ))
#define PATHPREFIX_USER OUString(RTL_CONSTASCII_USTRINGPARAM("u" ))
-//_________________________________________________________________________________________________________________
-// private declarations!
-//_________________________________________________________________________________________________________________
-
/*-****************************************************************************************************************
@descr struct to hold information about one menu entry.
****************************************************************************************************************-*/
@@ -115,7 +103,6 @@ struct SvtDynMenuEntry
class SvtDynMenu
{
public:
- //---------------------------------------------------------------------------------------------------------
// append setup written menu entry
// Don't touch name of entry. It was defined by setup and must be the same everytime!
// Look for double menu entries here too ... may be some seperator items are supeflous ...
@@ -130,7 +117,6 @@ class SvtDynMenu
}
}
- //---------------------------------------------------------------------------------------------------------
// append user specific menu entry
// We must find unique name for it by using special prefix
// and next count of user setted entries!
@@ -148,7 +134,6 @@ class SvtDynMenu
}
}
- //---------------------------------------------------------------------------------------------------------
// the only way to free memory!
void Clear()
{
@@ -156,7 +141,6 @@ class SvtDynMenu
lUserEntries.clear();
}
- //---------------------------------------------------------------------------------------------------------
// convert internal list to external format
// for using it on right menus realy
// Notice: We build a property list with 4 entries and set it on result list then.
@@ -212,7 +196,7 @@ class SvtDynMenu
}
private:
- //---------------------------------------------------------------------------------------------------------
+
// search for an entry named "ux" with x=[0..i] inside our menu
// which has set highest number x. So we can add another user entry.
sal_Int32 impl_getNextUserEntryNr() const
@@ -244,23 +228,11 @@ class SvtDynMenu
class SvtDynamicMenuOptions_Impl : public ConfigItem
{
- //-------------------------------------------------------------------------------------------------------------
- // public methods
- //-------------------------------------------------------------------------------------------------------------
-
public:
- //---------------------------------------------------------------------------------------------------------
- // constructor / destructor
- //---------------------------------------------------------------------------------------------------------
-
SvtDynamicMenuOptions_Impl();
~SvtDynamicMenuOptions_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
@@ -292,10 +264,6 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
virtual void Commit();
- //---------------------------------------------------------------------------------------------------------
- // public interface
- //---------------------------------------------------------------------------------------------------------
-
/*-****************************************************************************************************//**
@short base implementation of public interface for "SvtDynamicMenuOptions"!
@descr These class is used as static member of "SvtDynamicMenuOptions" ...
@@ -309,17 +277,7 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
@onerror -
*//*-*****************************************************************************************************/
- void Clear ( EDynamicMenuType eMenu );
Sequence< Sequence< PropertyValue > > GetMenu ( EDynamicMenuType eMenu ) const ;
- void AppendItem ( EDynamicMenuType eMenu ,
- const OUString& sURL ,
- const OUString& sTitle ,
- const OUString& sImageIdentifier,
- const OUString& sTargetName );
-
- //-------------------------------------------------------------------------------------------------------------
- // private methods
- //-------------------------------------------------------------------------------------------------------------
private:
@@ -393,10 +351,6 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
SvtDynMenu m_aHelpBookmarksMenu ;
};
-//_________________________________________________________________________________________________________________
-// definitions
-//_________________________________________________________________________________________________________________
-
//*****************************************************************************************************************
// constructor
//*****************************************************************************************************************
@@ -624,33 +578,6 @@ void SvtDynamicMenuOptions_Impl::Commit()
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-void SvtDynamicMenuOptions_Impl::Clear( EDynamicMenuType eMenu )
-{
- switch( eMenu )
- {
- case E_NEWMENU : {
- m_aNewMenu.Clear();
- SetModified();
- }
- break;
-
- case E_WIZARDMENU : {
- m_aWizardMenu.Clear();
- SetModified();
- }
- break;
-
- case E_HELPBOOKMARKS : {
- m_aHelpBookmarksMenu.Clear();
- SetModified();
- }
- break;
- }
-}
-
-//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
Sequence< Sequence< PropertyValue > > SvtDynamicMenuOptions_Impl::GetMenu( EDynamicMenuType eMenu ) const
{
Sequence< Sequence< PropertyValue > > lReturn;
@@ -675,39 +602,6 @@ Sequence< Sequence< PropertyValue > > SvtDynamicMenuOptions_Impl::GetMenu( EDyna
}
//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
-void SvtDynamicMenuOptions_Impl::AppendItem( EDynamicMenuType eMenu ,
- const OUString& sURL ,
- const OUString& sTitle ,
- const OUString& sImageIdentifier,
- const OUString& sTargetName )
-{
- SvtDynMenuEntry aItem( sURL, sTitle, sImageIdentifier, sTargetName );
-
- switch( eMenu )
- {
- case E_NEWMENU : {
- m_aNewMenu.AppendUserEntry( aItem );
- SetModified();
- }
- break;
-
- case E_WIZARDMENU : {
- m_aWizardMenu.AppendUserEntry( aItem );
- SetModified();
- }
- break;
-
- case E_HELPBOOKMARKS : {
- m_aHelpBookmarksMenu.AppendUserEntry( aItem );
- SetModified();
- }
- break;
- }
-}
-
-//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
Sequence< OUString > SvtDynamicMenuOptions_Impl::impl_GetPropertyNames( sal_uInt32& nNewCount, sal_uInt32& nWizardCount, sal_uInt32& nHelpBookmarksCount )
diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx
index 96f5fe6..d4b5260 100644
--- a/unotools/source/config/fontoptions.cxx
+++ b/unotools/source/config/fontoptions.cxx
@@ -38,19 +38,11 @@
#include <rtl/instance.hxx>
#include "itemholder1.hxx"
-//_________________________________________________________________________________________________________________
-// namespaces
-//_________________________________________________________________________________________________________________
-
using namespace ::utl ;
using namespace ::rtl ;
using namespace ::osl ;
using namespace ::com::sun::star::uno ;
-//_________________________________________________________________________________________________________________
-// const
-//_________________________________________________________________________________________________________________
-
#define ROOTNODE_FONT OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Font" ))
#define PROPERTYNAME_REPLACEMENTTABLE OUString(RTL_CONSTASCII_USTRINGPARAM("Substitution/Replacement" ))
@@ -63,29 +55,13 @@ using namespace ::com::sun::star::uno ;
#define PROPERTYCOUNT 3
-//_________________________________________________________________________________________________________________
-// private declarations!
-//_________________________________________________________________________________________________________________
-
class SvtFontOptions_Impl : public ConfigItem
{
- //-------------------------------------------------------------------------------------------------------------
- // public methods
- //-------------------------------------------------------------------------------------------------------------
-
public:
- //---------------------------------------------------------------------------------------------------------
- // constructor / destructor
- //---------------------------------------------------------------------------------------------------------
-
SvtFontOptions_Impl();
~SvtFontOptions_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
@@ -117,10 +93,6 @@ class SvtFontOptions_Impl : public ConfigItem
virtual void Commit();
- //---------------------------------------------------------------------------------------------------------
- // public interface
- //---------------------------------------------------------------------------------------------------------
-
/*-****************************************************************************************************//**
@short access method to get internal values
@descr These method give us a chance to regulate acces to ouer internal values.
@@ -134,19 +106,12 @@ class SvtFontOptions_Impl : public ConfigItem
@onerror -
*//*-*****************************************************************************************************/
- 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:
/*-****************************************************************************************************//**
@@ -164,10 +129,6 @@ class SvtFontOptions_Impl : public ConfigItem
static Sequence< OUString > impl_GetPropertyNames();
- //-------------------------------------------------------------------------------------------------------------
- // private member
- //-------------------------------------------------------------------------------------------------------------
-
private:
sal_Bool m_bReplacementTable ;
@@ -175,10 +136,6 @@ class SvtFontOptions_Impl : public ConfigItem
sal_Bool m_bFontWYSIWYG ;
};
-//_________________________________________________________________________________________________________________
-// definitions
-//_________________________________________________________________________________________________________________
-
//*****************************************************************************************************************
// constructor
//*****************************************************************************************************************
@@ -314,23 +271,6 @@ void SvtFontOptions_Impl::Commit()
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-sal_Bool SvtFontOptions_Impl::IsReplacementTableEnabled() const
-{
- return m_bReplacementTable;
-}
-
-//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
-void SvtFontOptions_Impl::EnableReplacementTable( sal_Bool bState )
-{
- m_bReplacementTable = bState;
- SetModified();
-}
-
-//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
sal_Bool SvtFontOptions_Impl::IsFontHistoryEnabled() const
{
return m_bFontHistory;
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 6c94d5b..91b5a88 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -55,10 +55,6 @@
#include <unotools/loghelper.hxx>
-//_________________________________________________________________________________________________________________
-// namespaces
-//_________________________________________________________________________________________________________________
-
using namespace ::std ;
using namespace ::utl ;
using namespace ::rtl ;
@@ -68,10 +64,6 @@ using namespace ::com::sun::star::beans ;
namespace css = ::com::sun::star;
-//_________________________________________________________________________________________________________________
-// const
-//_________________________________________________________________________________________________________________
-
namespace {
static const ::sal_Int32 s_nOffsetURL = 0;
static const ::sal_Int32 s_nOffsetFilter = 1;
@@ -79,10 +71,6 @@ namespace {
static const ::sal_Int32 s_nOffsetPassword = 3;
}
-//_________________________________________________________________________________________________________________
-// private declarations!
-//_________________________________________________________________________________________________________________
-
struct IMPL_THistoryItem
{
IMPL_THistoryItem()
@@ -122,7 +110,6 @@ public:
~SvtHistoryOptions_Impl();
sal_uInt32 GetSize( EHistoryType eHistory );
- void SetSize( EHistoryType eHistory, sal_uInt32 nSize );
void Clear( EHistoryType eHistory );
Sequence< Sequence< PropertyValue > > GetList( EHistoryType eHistory );
void AppendItem( EHistoryType eHistory ,
@@ -218,56 +205,6 @@ sal_uInt32 SvtHistoryOptions_Impl::GetSize( EHistoryType eHistory )
}
//*****************************************************************************************************************
-// public method
-// Attention: We return the max. size of our internal lists - That is the capacity not the size!
-//*****************************************************************************************************************
-void SvtHistoryOptions_Impl::SetSize( EHistoryType eHistory, sal_uInt32 nSize )
-{
- css::uno::Reference< css::beans::XPropertySet > xListAccess(m_xCommonXCU, css::uno::UNO_QUERY);
- if (! xListAccess.is ())
- return;
-
- try
- {
- switch( eHistory )
- {
- case ePICKLIST:
- if(nSize!=GetSize(ePICKLIST))
- {
- xListAccess->setPropertyValue(s_sPickListSize, css::uno::makeAny(nSize));
- ::comphelper::ConfigurationHelper::flush(m_xCommonXCU);
- }
- break;
-
- case eHISTORY:
- if(nSize!=GetSize(eHISTORY))
- {
- xListAccess->setPropertyValue(s_sURLHistorySize, css::uno::makeAny(nSize));
- ::comphelper::ConfigurationHelper::flush(m_xCommonXCU);
- }
- break;
-
- case eHELPBOOKMARKS:
- if(nSize!=GetSize(eHELPBOOKMARKS))
- {
- xListAccess->setPropertyValue(s_sHelpBookmarksSize, css::uno::makeAny(nSize));
- ::comphelper::ConfigurationHelper::flush(m_xCommonXCU);
- }
- break;
-
- default:
- break;
- }
-
- impl_truncateList (eHistory, nSize);
- }
- catch(const css::uno::Exception& ex)
- {
- LogHelper::logIt(ex);
- }
-}
-
-//*****************************************************************************************************************
void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt32 nSize )
{
css::uno::Reference< css::container::XNameAccess > xList;
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 096ccb2..eb4b381 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -59,16 +57,12 @@ using ::rtl::Uri;
#define EXPAND_PROTOCOL "vnd.sun.star.expand:"
#define FILE_PROTOCOL "file:///"
-///////////////////////////////////////////////////////////////////////////
-
namespace
{
class theSvtLinguConfigItemMutex :
public rtl::Static< osl::Mutex, theSvtLinguConfigItemMutex > {};
}
-///////////////////////////////////////////////////////////////////////////
-
static sal_Bool lcl_SetLocale( sal_Int16 &rLanguage, const uno::Any &rVal )
{
sal_Bool bSucc = sal_False;
@@ -86,7 +80,6 @@ static sal_Bool lcl_SetLocale( sal_Int16 &rLanguage, const uno::Any &rVal )
return bSucc;
}
-
static inline const OUString lcl_LanguageToCfgLocaleStr( sal_Int16 nLanguage )
{
OUString aRes;
@@ -95,7 +88,6 @@ static inline const OUString lcl_LanguageToCfgLocaleStr( sal_Int16 nLanguage )
return aRes;
}
-
static sal_Int16 lcl_CfgAnyToLanguage( const uno::Any &rVal )
{
OUString aTmp;
@@ -103,9 +95,6 @@ static sal_Int16 lcl_CfgAnyToLanguage( const uno::Any &rVal )
return (aTmp.getLength() == 0) ? LANGUAGE_SYSTEM : MsLangId::convertIsoStringToLanguage( aTmp );
}
-
-//////////////////////////////////////////////////////////////////////
-
SvtLinguOptions::SvtLinguOptions()
{
nDefaultLanguage = LANGUAGE_NONE;
@@ -154,10 +143,6 @@ SvtLinguOptions::SvtLinguOptions()
}
-
-//////////////////////////////////////////////////////////////////////
-
-
class SvtLinguConfigItem : public utl::ConfigItem
{
SvtLinguOptions aOpt;
@@ -856,7 +841,6 @@ SvtLinguConfig::SvtLinguConfig()
++nCfgItemRefCount;
}
-
SvtLinguConfig::~SvtLinguConfig()
{
osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get());
@@ -872,7 +856,6 @@ SvtLinguConfig::~SvtLinguConfig()
}
}
-
SvtLinguConfigItem & SvtLinguConfig::GetConfigItem()
{
// Global access, must be guarded (multithreading)
@@ -885,72 +868,52 @@ SvtLinguConfigItem & SvtLinguConfig::GetConfigItem()
return *pCfgItem;
}
-
uno::Sequence< OUString > SvtLinguConfig::GetNodeNames( const OUString &rNode )
{
return GetConfigItem().GetNodeNames( rNode );
}
-
uno::Sequence< uno::Any > SvtLinguConfig::GetProperties( const uno::Sequence< OUString > &rNames )
{
return GetConfigItem().GetProperties(rNames);
}
-
sal_Bool SvtLinguConfig::ReplaceSetProperties(
const OUString &rNode, uno::Sequence< beans::PropertyValue > rValues )
{
return GetConfigItem().ReplaceSetProperties( rNode, rValues );
}
-
uno::Any SvtLinguConfig::GetProperty( const OUString &rPropertyName ) const
{
return GetConfigItem().GetProperty( rPropertyName );
}
-
uno::Any SvtLinguConfig::GetProperty( sal_Int32 nPropertyHandle ) const
{
return GetConfigItem().GetProperty( nPropertyHandle );
}
-
sal_Bool SvtLinguConfig::SetProperty( const OUString &rPropertyName, const uno::Any &rValue )
{
return GetConfigItem().SetProperty( rPropertyName, rValue );
}
-
sal_Bool SvtLinguConfig::SetProperty( sal_Int32 nPropertyHandle, const uno::Any &rValue )
{
return GetConfigItem().SetProperty( nPropertyHandle, rValue );
}
-
sal_Bool SvtLinguConfig::GetOptions( SvtLinguOptions &rOptions ) const
{
return GetConfigItem().GetOptions( rOptions );
}
-
-sal_Bool SvtLinguConfig::SetOptions( const SvtLinguOptions &rOptions )
-{
- return GetConfigItem().SetOptions( rOptions );
-}
-
-
sal_Bool SvtLinguConfig::IsReadOnly( const rtl::OUString &rPropertyName ) const
{
return GetConfigItem().IsReadOnly( rPropertyName );
}
-sal_Bool SvtLinguConfig::IsReadOnly( sal_Int32 nPropertyHandle ) const
-{
- return GetConfigItem().IsReadOnly( nPropertyHandle );
-}
-
sal_Bool SvtLinguConfig::GetElementNamesFor(
const rtl::OUString &rNodeName,
uno::Sequence< rtl::OUString > &rElementNames ) const
diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx
index 6bb02fc..6b8ab5d 100644
--- a/unotools/source/config/localisationoptions.cxx
+++ b/unotools/source/config/localisationoptions.cxx
@@ -37,19 +37,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_LOCALISATION OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Localisation"))
#define DEFAULT_AUTOMNEMONIC sal_False
#define DEFAULT_DIALOGSCALE 0
@@ -62,29 +54,13 @@ using namespace ::com::sun::star::uno ;
#define PROPERTYCOUNT 2
-//_________________________________________________________________________________________________________________
-// private declarations!
-//_________________________________________________________________________________________________________________
-
class SvtLocalisationOptions_Impl : public ConfigItem
{
- //-------------------------------------------------------------------------------------------------------------
- // public methods
- //-------------------------------------------------------------------------------------------------------------
-
public:
- //---------------------------------------------------------------------------------------------------------
- // constructor / destructor
- //---------------------------------------------------------------------------------------------------------
-
SvtLocalisationOptions_Impl();
~SvtLocalisationOptions_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
@@ -116,10 +92,6 @@ class SvtLocalisationOptions_Impl : public ConfigItem
virtual void Commit();
- //---------------------------------------------------------------------------------------------------------
- // public interface
- //---------------------------------------------------------------------------------------------------------
-
/*-****************************************************************************************************//**
@short access method to get internal values
@descr These method give us a chance to regulate acces to ouer internal values.
@@ -134,13 +106,7 @@ class SvtLocalisationOptions_Impl : public ConfigItem
*//*-*****************************************************************************************************/
sal_Bool IsAutoMnemonic ( ) const ;
- void SetAutoMnemonic ( sal_Bool bState ) ;
sal_Int32 GetDialogScale ( ) const ;
- void SetDialogScale ( sal_Int32 nScale ) ;
-
- //-------------------------------------------------------------------------------------------------------------
- // private methods
- //-------------------------------------------------------------------------------------------------------------
private:
@@ -159,20 +125,12 @@ class SvtLocalisationOptions_Impl : public ConfigItem
static Sequence< OUString > GetPropertyNames();
- //-------------------------------------------------------------------------------------------------------------
- // private member
- //-------------------------------------------------------------------------------------------------------------
-
private:
sal_Bool m_bAutoMnemonic ;
sal_Int32 m_nDialogScale ;
};
-//_________________________________________________________________________________________________________________
-// definitions
-//_________________________________________________________________________________________________________________
-
//*****************************************************************************************************************
// constructor
//*****************************************************************************************************************
@@ -303,29 +261,11 @@ sal_Bool SvtLocalisationOptions_Impl::IsAutoMnemonic() const
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-void SvtLocalisationOptions_Impl::SetAutoMnemonic( sal_Bool bState )
-{
- m_bAutoMnemonic = bState;
- SetModified();
-}
-
-//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
sal_Int32 SvtLocalisationOptions_Impl::GetDialogScale() const
{
return m_nDialogScale;
}
-//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
-void SvtLocalisationOptions_Impl::SetDialogScale( sal_Int32 nScale )
-{
- m_nDialogScale = nScale;
- SetModified();
-}
-
Sequence< OUString > SvtLocalisationOptions_Impl::GetPropertyNames()
{
// Build static list of configuration key names.
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index beb37ed..1411d79 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <unotools/pathoptions.hxx>
#include <unotools/configitem.hxx>
#include <unotools/configmgr.hxx>
@@ -189,8 +188,6 @@ class SvtPathOptions_Impl
rtl::OUString UsePathVariables( const rtl::OUString& rPath ) const;
::com::sun::star::lang::Locale GetLocale() const { return m_aLocale; }
-
- sal_Bool IsPathReadonly(SvtPathOptions::Pathes ePath)const;
};
// global ----------------------------------------------------------------
@@ -287,26 +284,6 @@ const String& SvtPathOptions_Impl::GetPath( SvtPathOptions::Pathes ePath )
return m_aEmptyString;
}
-// -----------------------------------------------------------------------
-sal_Bool SvtPathOptions_Impl::IsPathReadonly(SvtPathOptions::Pathes ePath)const
-{
- ::osl::MutexGuard aGuard( m_aMutex );
- sal_Bool bReadonly = sal_False;
- if ( ePath < SvtPathOptions::PATH_COUNT )
- {
- Reference<XPropertySet> xPrSet(m_xPathSettings, UNO_QUERY);
- if(xPrSet.is())
- {
- Reference<XPropertySetInfo> xInfo = xPrSet->getPropertySetInfo();
- const char* pA = aPropNames[ePath].pPropName;
- ::rtl::OUString sU = OUString::createFromAscii(pA);
- Property aProperty = xInfo->getPropertyByName(sU);
- bReadonly = 0 != (aProperty.Attributes & PropertyAttribute::READONLY);
- }
- }
- return bReadonly;
-}
-// -----------------------------------------------------------------------
void SvtPathOptions_Impl::SetPath( SvtPathOptions::Pathes ePath, const String& rNewPath )
{
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 787b644..e0846d8 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <unotools/saveopt.hxx>
#include "rtl/instance.hxx"
#include <unotools/configmgr.hxx>
@@ -138,12 +137,9 @@ public:
void SetSaveDocView( sal_Bool b );
void SetSaveRelINet( sal_Bool b );
void SetSaveRelFSys( sal_Bool b );
- void SetSaveUnpacked( sal_Bool b );
void EnablePrettyPrinting( sal_Bool _bDoPP );
void SetWarnAlienFormat( sal_Bool _bDoPP );
void SetLoadDocPrinter( sal_Bool bNew );
- void SetUseSHA1InODF12( sal_Bool bUse );
- void SetUseBlowfishInODF12( sal_Bool bUse );
void SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersion eNew );
sal_Bool IsReadOnly( SvtSaveOptions::EOption eOption ) const;
@@ -241,15 +237,6 @@ void SvtSaveOptions_Impl::SetSaveRelFSys( sal_Bool b )
}
}
-void SvtSaveOptions_Impl::SetSaveUnpacked( sal_Bool b )
-{
- if (!bROSaveUnpacked && bSaveUnpacked!=b)
- {
- bSaveUnpacked = b;
- SetModified();
- }
-}
-
void SvtSaveOptions_Impl::EnablePrettyPrinting( sal_Bool _bDoPP )
{
if (!bRODoPrettyPrinting && bDoPrettyPrinting!=_bDoPP)
@@ -286,24 +273,6 @@ void SvtSaveOptions_Impl::SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersio
}
}
-void SvtSaveOptions_Impl::SetUseSHA1InODF12( sal_Bool bUse )
-{
- if ( !bROUseSHA1InODF12 && bUseSHA1InODF12 != bUse )
- {
- bUseSHA1InODF12 = bUse;
- SetModified();
- }
-}
-
-void SvtSaveOptions_Impl::SetUseBlowfishInODF12( sal_Bool bUse )
-{
- if ( !bROUseBlowfishInODF12 && bUseBlowfishInODF12 != bUse )
- {
- bUseBlowfishInODF12 = bUse;
- SetModified();
- }
-}
-
sal_Bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) const
{
sal_Bool bReadOnly = CFG_READONLY_DEFAULT;
diff --git a/unotools/source/config/startoptions.cxx b/unotools/source/config/startoptions.cxx
index 093a4c5..18653e3 100644
--- a/unotools/source/config/startoptions.cxx
+++ b/unotools/source/config/startoptions.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <unotools/startoptions.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/configitem.hxx>
@@ -36,19 +35,12 @@
#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 DEFAULT_SHOWINTRO sal_True
#define DEFAULT_CONNECTIONURL OUString()
@@ -61,29 +53,13 @@ using namespace ::com::sun::star::uno ;
#define PROPERTYCOUNT 2
-//_________________________________________________________________________________________________________________
-// private declarations!
-//_________________________________________________________________________________________________________________
-
class SvtStartOptions_Impl : public ConfigItem
{
- //-------------------------------------------------------------------------------------------------------------
- // public methods
- //-------------------------------------------------------------------------------------------------------------
-
public:
- //---------------------------------------------------------------------------------------------------------
- // constructor / destructor
- //---------------------------------------------------------------------------------------------------------
-
SvtStartOptions_Impl();
~SvtStartOptions_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
@@ -119,10 +95,6 @@ class SvtStartOptions_Impl : public ConfigItem
virtual void Commit();
- //---------------------------------------------------------------------------------------------------------
- // public interface
- //---------------------------------------------------------------------------------------------------------
-
/*-****************************************************************************************************//**
@short access method to get internal values
@descr These method give us a chance to regulate acces to ouer internal values.
@@ -137,11 +109,6 @@ class SvtStartOptions_Impl : public ConfigItem
*//*-*****************************************************************************************************/
OUString GetConnectionURL( ) const ;
- void SetConnectionURL( const OUString& sURL ) ;
-
- //-------------------------------------------------------------------------------------------------------------
- // private methods
- //-------------------------------------------------------------------------------------------------------------
private:
@@ -161,20 +128,12 @@ class SvtStartOptions_Impl : public ConfigItem
static Sequence< OUString > impl_GetPropertyNames();
- //-------------------------------------------------------------------------------------------------------------
- // private member
- //-------------------------------------------------------------------------------------------------------------
-
private:
sal_Bool m_bShowIntro ; /// cache "ShowIntro" of Start section
OUString m_sConnectionURL ; /// cache "Connection" of Start section
};
-//_________________________________________________________________________________________________________________
-// definitions
-//_________________________________________________________________________________________________________________
-
//*****************************************************************************************************************
// constructor
//*****************************************************************************************************************
@@ -300,15 +259,6 @@ OUString SvtStartOptions_Impl::GetConnectionURL() const
}
//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
-void SvtStartOptions_Impl::SetConnectionURL( const OUString& sURL )
-{
- m_sConnectionURL = sURL;
- SetModified();
-}
-
-//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
Sequence< OUString > SvtStartOptions_Impl::impl_GetPropertyNames()
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index b371084..d0ca931 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/instance.hxx>
@@ -545,12 +544,6 @@ void SvtSysLocaleOptions::SetLocaleConfigString( const OUString& rStr )
pOptions->SetLocaleString( rStr );
}
-const OUString& SvtSysLocaleOptions::GetUILocaleConfigString() const
-{
- MutexGuard aGuard( GetMutex() );
- return pOptions->GetUILocaleString();
-}
-
void SvtSysLocaleOptions::SetUILocaleConfigString( const OUString& rStr )
{
MutexGuard aGuard( GetMutex() );
diff --git a/unusedcode.easy b/unusedcode.easy
index 7053f8a..06c3d85 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -586,19 +586,7 @@ SvXMLUnitConverter::GetCoreMeasureUnit() const
SvXMLUnitConverter::convertEnum(rtl::OUStringBuffer&, unsigned short, SvXMLEnumStringMapEntry const*, char*)
SvXMLUnitConverter::convertMeasureToXML(rtl::OUStringBuffer&, int, short) const
SvpSalInstance::CancelEvent(SalFrame const*, void*, unsigned short)
-SvtAcceleratorConfiguration::GetCommand(com::sun::star::awt::KeyEvent const&)
-SvtAcceleratorConfiguration::GetItems()
-SvtAcceleratorConfiguration::SetItems(std::__debug::list<SvtAcceleratorConfigItem, std::allocator<SvtAcceleratorConfigItem> > const&, bool)
SvtBroadcaster::Forward(SvtBroadcaster&, SfxHint const&)
-SvtCJKOptions::IsEmphasisMarksEnabled() const
-SvtCJKOptions::IsVerticalCallOutEnabled() const
-SvtCommandOptions_Impl::AddCommand(SvtCommandOptions::CmdOption, rtl::OUString const&)
-SvtCommandOptions_Impl::Clear(SvtCommandOptions::CmdOption)
-SvtCommandOptions_Impl::GetList(SvtCommandOptions::CmdOption) const
-SvtDynamicMenuOptions_Impl::AppendItem(EDynamicMenuType, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
-SvtDynamicMenuOptions_Impl::Clear(EDynamicMenuType)
-SvtFontOptions_Impl::EnableReplacementTable(unsigned char)
-SvtFontOptions_Impl::IsReplacementTableEnabled() const
SvtFrameWindow_Impl::ExecuteHdl_Impl(SvtFrameWindow_Impl*, SvtFrameWindow_Impl::SvtExecuteInfo*)
SvtGraphicFill::getGradient1stColor() const
SvtGraphicFill::getGradient2ndColor() const
@@ -622,29 +610,17 @@ SvtGraphicStroke::setMiterLimit(double)
SvtGraphicStroke::setStartArrow(PolyPolygon const&)
SvtGraphicStroke::setStrokeWidth(double)
SvtGraphicStroke::setTransparency(double)
-SvtHistoryOptions_Impl::SetSize(EHistoryType, unsigned int)
SvtIconChoiceCtrl::SvtIconChoiceCtrl(Window*, ResId const&)
SvtIconWindow_Impl::GetSelectedIconText() const
-SvtLinguConfig::IsReadOnly(int) const
-SvtLinguConfig::SetOptions(SvtLinguOptions const&)
SvtListenerIter::First(void* (*)())
SvtListenerIter::GoEnd()
SvtListenerIter::GoPrev()
SvtListenerIter::GoRoot()
SvtListenerIter::Next()
-SvtLocalisationOptions_Impl::SetAutoMnemonic(unsigned char)
-SvtLocalisationOptions_Impl::SetDialogScale(int)
-SvtMiscOptions_Impl::SetPluginsEnabled(unsigned char)
-SvtPathOptions_Impl::IsPathReadonly(SvtPathOptions::Pathes) const
SvtResId::SvtResId(unsigned short, com::sun::star::lang::Locale)
-SvtSaveOptions_Impl::SetSaveUnpacked(unsigned char)
-SvtSaveOptions_Impl::SetUseBlowfishInODF12(unsigned char)
-SvtSaveOptions_Impl::SetUseSHA1InODF12(unsigned char)
SvtScriptedTextHelper::GetText() const
SvtScriptedTextHelper::GetTextHeight() const
SvtScriptedTextHelper::GetTextWidth() const
-SvtStartOptions_Impl::SetConnectionURL(rtl::OUString const&)
-SvtSysLocaleOptions::GetUILocaleConfigString() const
SvtTabAppearanceCfg::SetDragMode(unsigned short)
Svx3DLightControl::Svx3DLightControl(Window*, ResId const&)
Svx3DWin::LinkStubClickLightHdl(void*, void*)
commit 0696c0aa742c57ae93733bd43c694d847c2bcd7e
Author: August Sodora <augsod at gmail.com>
Date: Tue Dec 20 14:45:49 2011 -0500
callcatcher: Remove unused code
diff --git a/unusedcode.easy b/unusedcode.easy
index 825f042..7053f8a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2148,14 +2148,6 @@ vcl::PDFExtOutDevData::SetOutlineItemParent(int, int)
vcl::PDFExtOutDevData::SetOutlineItemText(int, rtl::OUString const&)
vcl::PDFWriter::DrawPixel(Polygon const&, Color const*)
vcl::PDFWriterImpl::drawPolyPolygon(PolyPolygon const&, int, bool)
-vcl::PrintDialog::getCopyCount()
-vcl::RowOrColumn::remove(Window*)
-vcl::RowOrColumn::remove(boost::shared_ptr<vcl::WindowArranger> const&)
-vcl::unotools::xBitmapFromBitmap(com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&, Bitmap const&)
-vcl::unotools::xPolyPolygonFromPolyPolygon(com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&, PolyPolygon const&)
-vcl::unotools::xPolyPolygonFromPolygon(com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&, Polygon const&)
vcl::unx::GtkPrintWrapper::print_operation_set_has_selection(_GtkPrintOperation*, int) const
vcl::unx::GtkPrintWrapper::print_operation_set_support_selection(_GtkPrintOperation*, int) const
void ScCompressedArrayIterator<int, unsigned short>::Follow<unsigned char>(ScCompressedArrayIterator<int, unsigned char> const&)
-writerfilter::TagLogger::attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, rtl::OUString const&)
-writerfilter::TagLogger::chars(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 7aea96b..b754dad 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -295,7 +295,6 @@ namespace vcl
virtual ~PrintDialog();
bool isPrintToFile();
- int getCopyCount();
bool isCollate();
bool isSingleJobs();
diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx
index 5568cc3..46df6af 100644
--- a/vcl/inc/vcl/arrange.hxx
+++ b/vcl/inc/vcl/arrange.hxx
@@ -251,13 +251,11 @@ namespace vcl
// add a managed window at the given index
// an index smaller than zero means add the window at the end
size_t addWindow( Window*, sal_Int32 i_nExpandPrio = 0, const Size& i_rMinSize = Size(), size_t i_nIndex = ~0 );
- void remove( Window* );
size_t addChild( boost::shared_ptr<WindowArranger> const &, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 );
// convenience: use for addChild( new WindowArranger( ... ) ) constructs
size_t addChild( WindowArranger* i_pNewChild, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 )
{ return addChild( boost::shared_ptr<WindowArranger>( i_pNewChild ), i_nExpandPrio, i_nIndex ); }
- void remove( boost::shared_ptr<WindowArranger> const & );
long getBorderWidth() const { return m_nBorderWidth; }
};
diff --git a/vcl/inc/vcl/canvastools.hxx b/vcl/inc/vcl/canvastools.hxx
index 7c9653e..8bb1ffd 100644
--- a/vcl/inc/vcl/canvastools.hxx
+++ b/vcl/inc/vcl/canvastools.hxx
@@ -81,33 +81,9 @@ namespace vcl
{
namespace unotools
{
- // Polygon conversions
- // ===================================================================
-
- /** Create an XPolyPolygon from VCL/Tools polygon
- */
- ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >
- VCL_DLLPUBLIC xPolyPolygonFromPolygon( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice,
- const ::Polygon& inputPolygon );
-
- /** Create an XPolyPolygon from VCL/Tools polyPolygon
- */
- ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >
- VCL_DLLPUBLIC xPolyPolygonFromPolyPolygon( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice,
- const ::PolyPolygon& inputPolyPolygon );
-
// Bitmap conversions
// ===================================================================
- /** Create an XBitmap from VCL Bitmap
- */
- ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >
- VCL_DLLPUBLIC xBitmapFromBitmap( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice,
- const ::Bitmap& inputBitmap );
-
/** Create an XBitmap from VCL BitmapEx
*/
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index b212813..b8dce8d 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -79,48 +79,6 @@ namespace vcl
{
namespace unotools
{
- // #i79917# removed helpers bezierSequenceFromPolygon and
- // pointSequenceFromPolygon here
- // Also all helpers using tools Polygon and PolyPolygon will get mapped to the
- // B2DPolygon helpers for these cases, see comments with the same TaskID below.
- // TODO: Remove those wrapped methods
-
- //---------------------------------------------------------------------------------------
-
- uno::Reference< rendering::XPolyPolygon2D > xPolyPolygonFromPolygon( const uno::Reference< rendering::XGraphicDevice >& xGraphicDevice,
- const ::Polygon& inputPolygon )
- {
- RTL_LOGFILE_CONTEXT( aLog, "::vcl::unotools::xPolyPolygonFromPolygon()" );
-
- // #i79917# map to basegfx
- const basegfx::B2DPolygon aB2DPolygon(inputPolygon.getB2DPolygon());
- return basegfx::unotools::xPolyPolygonFromB2DPolygon(xGraphicDevice, aB2DPolygon);
- }
-
- //---------------------------------------------------------------------------------------
-
- uno::Reference< rendering::XPolyPolygon2D > xPolyPolygonFromPolyPolygon( const uno::Reference< rendering::XGraphicDevice >& xGraphicDevice,
- const ::PolyPolygon& inputPolyPolygon )
- {
- RTL_LOGFILE_CONTEXT( aLog, "::vcl::unotools::xPolyPolygonFromPolyPolygon()" );
-
- // #i79917# map to basegfx
- const basegfx::B2DPolyPolygon aB2DPolyPolygon(inputPolyPolygon.getB2DPolyPolygon());
- return basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(xGraphicDevice, aB2DPolyPolygon);
- }
-
- //---------------------------------------------------------------------------------------
-
- uno::Reference< rendering::XBitmap > xBitmapFromBitmap( const uno::Reference< rendering::XGraphicDevice >& /*xGraphicDevice*/,
- const ::Bitmap& inputBitmap )
- {
- RTL_LOGFILE_CONTEXT( aLog, "::vcl::unotools::xBitmapFromBitmap()" );
-
- return new vcl::unotools::VclCanvasBitmap( BitmapEx( inputBitmap ) );
- }
-
- //---------------------------------------------------------------------------------------
-
uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx( const uno::Reference< rendering::XGraphicDevice >& /*xGraphicDevice*/,
const ::BitmapEx& inputBitmap )
{
@@ -129,8 +87,6 @@ namespace vcl
return new vcl::unotools::VclCanvasBitmap( inputBitmap );
}
- //---------------------------------------------------------------------------------------
-
namespace
{
inline bool operator==( const rendering::IntegerBitmapLayout& rLHS,
diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx
index 11ca774..847abf2 100644
--- a/vcl/source/window/arrange.cxx
+++ b/vcl/source/window/arrange.cxx
@@ -524,38 +524,6 @@ size_t RowOrColumn::addChild( boost::shared_ptr<WindowArranger> const & i_pChild
return nIndex;
}
-void RowOrColumn::remove( Window* i_pWindow )
-{
- if( i_pWindow )
- {
- for( std::vector< WindowArranger::Element >::iterator it = m_aElements.begin();
- it != m_aElements.end(); ++it )
- {
- if( it->m_pElement == i_pWindow )
- {
- m_aElements.erase( it );
- return;
- }
- }
- }
-}
-
-void RowOrColumn::remove( boost::shared_ptr<WindowArranger> const & i_pChild )
-{
- if( i_pChild )
- {
- for( std::vector< WindowArranger::Element >::iterator it = m_aElements.begin();
- it != m_aElements.end(); ++it )
- {
- if( it->m_pChild == i_pChild )
- {
- m_aElements.erase( it );
- return;
- }
- }
- }
-}
-
// ----------------------------------------
// vcl::LabeledElement
//-----------------------------------------
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index b1c9b4b..0609683 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1028,11 +1028,6 @@ bool PrintDialog::isPrintToFile()
return maOptionsPage.maToFileBox.IsChecked();
}
-int PrintDialog::getCopyCount()
-{
- return static_cast<int>(maJobPage.maCopyCountField.GetValue());
-}
-
bool PrintDialog::isCollate()
{
return maJobPage.maCopyCountField.GetValue() > 1 ? maJobPage.maCollateBox.IsChecked() : sal_False;
commit e8f980d10cf95b8bced1ca18a55b2a4784f6dcc9
Author: August Sodora <augsod at gmail.com>
Date: Tue Dec 20 14:22:28 2011 -0500
Remove unused code
diff --git a/writerfilter/inc/resourcemodel/TagLogger.hxx b/writerfilter/inc/resourcemodel/TagLogger.hxx
index 2a13487..44dc901 100644
--- a/writerfilter/inc/resourcemodel/TagLogger.hxx
+++ b/writerfilter/inc/resourcemodel/TagLogger.hxx
@@ -74,8 +74,6 @@ namespace writerfilter
void unoPropertySet(uno::Reference<beans::XPropertySet> rPropSet);
#endif
void attribute(const std::string & name, const std::string & value);
- void attribute(const std::string & name, const ::rtl::OUString & value);
- void chars(const std::string & chars);
#ifdef DEBUG_CONTEXT_HANDLER
void propertySet(writerfilter::Reference<Properties>::Pointer_t props,
diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx
index 6a0795c..dcdd461 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -166,18 +166,6 @@ namespace writerfilter
xmlFree( xmlName );
}
- void TagLogger::attribute(const string & name, const ::rtl::OUString & value)
- {
- attribute( name, OUStringToOString( value, RTL_TEXTENCODING_ASCII_US ).getStr() );
- }
-
- void TagLogger::chars(const string & rChars)
- {
- xmlChar* xmlChars = xmlCharStrdup( rChars.c_str() );
- xmlTextWriterWriteString( pWriter, xmlChars );
- xmlFree( xmlChars );
- }
-
#ifdef DEBUG_CONTEXT_HANDLER
class PropertySetDumpHandler : public Properties
{
More information about the Libreoffice-commits
mailing list