summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-12-21 09:26:31 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-12-21 09:30:20 +0000
commitc1c3ef64bca25183979f666aef51ab2854d628d8 (patch)
tree03a9e9518dcb9bb80833e79400b98dcbc80bfad3 /unotools
parent725f7d0171985ff858af2436c553b4906bd060f6 (diff)
callcatcher: remove some unused code
Diffstat (limited to 'unotools')
-rw-r--r--unotools/inc/unotools/accelcfg.hxx3
-rw-r--r--unotools/source/config/accelcfg.cxx16
-rw-r--r--unotools/source/config/lingucfg.cxx25
3 files changed, 6 insertions, 38 deletions
diff --git a/unotools/inc/unotools/accelcfg.hxx b/unotools/inc/unotools/accelcfg.hxx
index d18076b15c89..04a105ce9b06 100644
--- a/unotools/inc/unotools/accelcfg.hxx
+++ b/unotools/inc/unotools/accelcfg.hxx
@@ -67,9 +67,6 @@ public:
// save the configuration to a stream, f.e. into a document
bool Commit( SvStream& rStream );
-
- // sets a single configuration item
- void SetCommand( const SvtAcceleratorConfigItem& rItem );
};
#endif
diff --git a/unotools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx
index f780df1f3442..61209f7ff22d 100644
--- a/unotools/source/config/accelcfg.cxx
+++ b/unotools/source/config/accelcfg.cxx
@@ -202,23 +202,9 @@ SvtAcceleratorConfiguration::~SvtAcceleratorConfiguration()
}
}
-void SvtAcceleratorConfiguration::SetCommand( const SvtAcceleratorConfigItem& rItem )
-{
- std::list< SvtAcceleratorConfigItem>::iterator p;
- for ( p = pImp->aList.begin(); p != pImp->aList.end(); ++p )
- if ( p->nCode == rItem.nCode && p->nModifier == rItem.nModifier )
- {
- p->aCommand = rItem.aCommand;
- return;
- }
-
- pImp->aList.push_back( rItem );
-
-}
-
String SvtAcceleratorConfiguration::GetStreamName()
{
- return String::CreateFromAscii("KeyBindings.xml");
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KeyBindings.xml"));
}
SvStream* SvtAcceleratorConfiguration::GetDefaultStream( StreamMode nMode )
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index eb4b38164935..27516fbe14d2 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -183,8 +183,7 @@ public:
sal_Bool SetProperty( sal_Int32 nPropertyHandle,
const com::sun::star::uno::Any &rValue );
- sal_Bool GetOptions( SvtLinguOptions &rOptions ) const;
- sal_Bool SetOptions( const SvtLinguOptions &rOptions );
+ const SvtLinguOptions& GetOptions() const;
sal_Bool IsReadOnly( const rtl::OUString &rPropertyName ) const;
sal_Bool IsReadOnly( sal_Int32 nPropertyHandle ) const;
@@ -556,27 +555,12 @@ sal_Bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno::
return bSucc;
}
-
-sal_Bool SvtLinguConfigItem::GetOptions( SvtLinguOptions &rOptions ) const
+const SvtLinguOptions& SvtLinguConfigItem::GetOptions() const
{
osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get());
-
- rOptions = aOpt;
- return sal_True;
+ return aOpt;
}
-
-sal_Bool SvtLinguConfigItem::SetOptions( const SvtLinguOptions &rOptions )
-{
- osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get());
-
- aOpt = rOptions;
- SetModified();
- NotifyListeners(0);
- return sal_True;
-}
-
-
sal_Bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProperyNames )
{
osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get());
@@ -906,7 +890,8 @@ sal_Bool SvtLinguConfig::SetProperty( sal_Int32 nPropertyHandle, const uno::Any
sal_Bool SvtLinguConfig::GetOptions( SvtLinguOptions &rOptions ) const
{
- return GetConfigItem().GetOptions( rOptions );
+ rOptions = GetConfigItem().GetOptions();
+ return sal_True;
}
sal_Bool SvtLinguConfig::IsReadOnly( const rtl::OUString &rPropertyName ) const