summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-01 14:24:26 +0200
committerNoel Grandin <noel@peralex.com>2015-04-02 09:38:29 +0200
commit1a18cafecb06a76e872f5f1a9434160ea8ffd881 (patch)
tree192d5fc8c69eca2f8ead62b2678c37a4c6acd515 /unotools
parentaa1b911b64641bbf29991af7c6f7798739aba667 (diff)
loplugin:staticmethods
Change-Id: I3ae555fd9f0dc3c11ea301ee1cb2c799fbec820d
Diffstat (limited to 'unotools')
-rw-r--r--unotools/source/config/bootstrap.cxx8
-rw-r--r--unotools/source/config/compatibility.cxx4
-rw-r--r--unotools/source/config/dynamicmenuoptions.cxx6
-rw-r--r--unotools/source/config/itemholder1.hxx4
-rw-r--r--unotools/source/config/misccfg.cxx2
-rw-r--r--unotools/source/config/moduleoptions.cxx18
-rw-r--r--unotools/source/config/searchopt.cxx4
7 files changed, 23 insertions, 23 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index 63889f765d99..9a1a8985b964 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -106,7 +106,7 @@ namespace utl
// access helper
OUString getBootstrapValue(OUString const& _sName, OUString const& _sDefault) const;
- bool getVersionValue(OUString const& _sName, OUString& _rValue, OUString const& _sDefault) const;
+ static bool getVersionValue(OUString const& _sName, OUString& _rValue, OUString const& _sDefault);
OUString getImplName() const { return m_aImplName; }
@@ -554,7 +554,7 @@ OUString Bootstrap::getBuildVersion(OUString const& _sDefault)
OUString sBuildVersion;
// read BuildVersion from version.ini (versionrc)
- data().getVersionValue( csBuildVersionItem, sBuildVersion, _sDefault );
+ utl::Bootstrap::Impl::getVersionValue( csBuildVersionItem, sBuildVersion, _sDefault );
return sBuildVersion;
}
@@ -564,7 +564,7 @@ OUString Bootstrap::getBuildIdData(OUString const& _sDefault)
OUString sBuildId;
// read buildid from version.ini (versionrc), if it doesn't exist or buildid is empty
- if ( !data().getVersionValue( csBuildIdItem, sBuildId, _sDefault ) ||
+ if ( !utl::Bootstrap::Impl::getVersionValue( csBuildIdItem, sBuildId, _sDefault ) ||
sBuildId.isEmpty() )
// read buildid from bootstrap.ini (bootstraprc)
sBuildId = data().getBootstrapValue( csBuildIdItem, _sDefault );
@@ -734,7 +734,7 @@ OUString Bootstrap::Impl::getBootstrapValue(OUString const& _sName, OUString con
return sResult;
}
-bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rValue, OUString const& _sDefault) const
+bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rValue, OUString const& _sDefault)
{
// try to open version.ini (versionrc)
OUString uri;
diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index 71ed62143971..3578837c1a01 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -294,8 +294,8 @@ class SvtCompatibilityOptions_Impl : public ConfigItem
@return A list of configuration key names is returned.
*//*-*****************************************************************************************************/
- void impl_ExpandPropertyNames( const Sequence< OUString >& lSource,
- Sequence< OUString >& lDestination );
+ static void impl_ExpandPropertyNames( const Sequence< OUString >& lSource,
+ Sequence< OUString >& lDestination );
// private member
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index 1fac5954c420..f9f835b8c543 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -229,9 +229,9 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
@return A list of configuration key names is returned.
*//*-*****************************************************************************************************/
- void impl_SortAndExpandPropertyNames( const Sequence< OUString >& lSource ,
- Sequence< OUString >& lDestination ,
- const OUString& sSetNode );
+ static void impl_SortAndExpandPropertyNames( const Sequence< OUString >& lSource ,
+ Sequence< OUString >& lDestination ,
+ const OUString& sSetNode );
// private member
diff --git a/unotools/source/config/itemholder1.hxx b/unotools/source/config/itemholder1.hxx
index f42ba8878dc7..8cb17296df17 100644
--- a/unotools/source/config/itemholder1.hxx
+++ b/unotools/source/config/itemholder1.hxx
@@ -51,8 +51,8 @@ class ItemHolder1 : private ItemHolderMutexBase
void impl_addItem(EItem eItem);
void impl_releaseAllItems();
- void impl_newItem(TItemInfo& rItem);
- void impl_deleteItem(TItemInfo& rItem);
+ static void impl_newItem(TItemInfo& rItem);
+ static void impl_deleteItem(TItemInfo& rItem);
};
// namespaces
diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index f2b7e428f231..1e33b09ad38e 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.cxx
@@ -44,7 +44,7 @@ private:
bool bNotFound;
sal_Int32 nYear2000; // two digit year representation
- const com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+ static const com::sun::star::uno::Sequence<OUString> GetPropertyNames();
void Load();
virtual void ImplCommit() SAL_OVERRIDE;
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 64ccf8a17e93..679e01a9c6a6 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -293,15 +293,15 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem
// public interface
- bool IsModuleInstalled ( SvtModuleOptions::EModule eModule ) const;
+ bool IsModuleInstalled ( SvtModuleOptions::EModule eModule ) const;
::com::sun::star::uno::Sequence < OUString > GetAllServiceNames();
- OUString GetFactoryName ( SvtModuleOptions::EFactory eFactory ) const;
- OUString GetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory ) const;
- OUString GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory eFactory ) const;
- OUString GetFactoryDefaultFilter ( SvtModuleOptions::EFactory eFactory ) const;
- bool IsDefaultFilterReadonly( SvtModuleOptions::EFactory eFactory ) const;
+ OUString GetFactoryName ( SvtModuleOptions::EFactory eFactory ) const;
+ OUString GetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory ) const;
+ static OUString GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory eFactory );
+ OUString GetFactoryDefaultFilter ( SvtModuleOptions::EFactory eFactory ) const;
+ bool IsDefaultFilterReadonly( SvtModuleOptions::EFactory eFactory ) const;
sal_Int32 GetFactoryIcon ( SvtModuleOptions::EFactory eFactory ) const;
- static bool ClassifyFactoryByName ( const OUString& sName ,
+ static bool ClassifyFactoryByName ( const OUString& sName ,
SvtModuleOptions::EFactory& eFactory );
void SetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory ,
const OUString& sTemplate );
@@ -589,7 +589,7 @@ OUString SvtModuleOptions_Impl::GetFactoryStandardTemplate( SvtModuleOptions::EF
return sFile;
}
-OUString SvtModuleOptions_Impl::GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory eFactory ) const
+OUString SvtModuleOptions_Impl::GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory eFactory )
{
// Attention: Hard configured yet ... because it's not fine to make changes possible by xml file yet.
// But it's good to plan further possibilities!
@@ -965,7 +965,7 @@ OUString SvtModuleOptions::GetFactoryStandardTemplate( EFactory eFactory ) const
OUString SvtModuleOptions::GetFactoryEmptyDocumentURL( EFactory eFactory ) const
{
::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() );
- return m_pDataContainer->GetFactoryEmptyDocumentURL( eFactory );
+ return SvtModuleOptions_Impl::GetFactoryEmptyDocumentURL( eFactory );
}
OUString SvtModuleOptions::GetFactoryDefaultFilter( EFactory eFactory ) const
diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index 76154d8723ee..2df1103c734f 100644
--- a/unotools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.cxx
@@ -53,7 +53,7 @@ protected:
bool Load();
bool Save();
- Sequence< OUString > GetPropertyNames() const;
+ static Sequence< OUString > GetPropertyNames();
public:
SvtSearchOptions_Impl();
@@ -116,7 +116,7 @@ void SvtSearchOptions_Impl::SetModified( bool bVal )
}
}
-Sequence< OUString > SvtSearchOptions_Impl::GetPropertyNames() const
+Sequence< OUString > SvtSearchOptions_Impl::GetPropertyNames()
{
static const char* aPropNames[ MAX_FLAGS_OFFSET + 1 ] =
{