summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configmgr/source/components.hxx2
-rw-r--r--sdext/source/minimizer/configurationaccess.hxx2
-rw-r--r--sot/source/sdstor/stgcache.hxx2
-rw-r--r--sot/source/sdstor/stgio.cxx2
-rw-r--r--sot/source/sdstor/stgstrms.cxx14
-rw-r--r--stoc/source/inspect/introspection.cxx12
-rw-r--r--stoc/source/invocation/invocation.cxx4
-rw-r--r--stoc/source/security/file_policy.cxx4
-rw-r--r--stoc/source/typeconv/convert.cxx6
-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
16 files changed, 47 insertions, 47 deletions
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index 6dd7d1d3ec5c..249507efeb95 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -119,7 +119,7 @@ public:
~Components();
private:
- void parseFileLeniently(
+ static void parseFileLeniently(
FileParser * parseFile, OUString const & url, int layer,
Data & data, Partial const * partial, Modifications * modifications,
Additions * additions);
diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx
index 5157ef60bbbf..d8f6c01d8148 100644
--- a/sdext/source/minimizer/configurationaccess.hxx
+++ b/sdext/source/minimizer/configurationaccess.hxx
@@ -120,7 +120,7 @@ class ConfigurationAccess
void LoadStrings();
void LoadConfiguration();
css::uno::Reference< css::uno::XInterface > OpenConfiguration( bool bReadOnly );
- css::uno::Reference< css::uno::XInterface > GetConfigurationNode(
+ static css::uno::Reference< css::uno::XInterface > GetConfigurationNode(
const css::uno::Reference< css::uno::XInterface >& xRoot, const OUString& sPathToNode );
};
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index 6b5970dab54a..bef0c76bd49b 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -87,7 +87,7 @@ public:
// two routines for accessing FAT pages
// Assume that the data is a FAT page and get/put FAT data.
void SetToPage ( const rtl::Reference< StgPage >& rPage, short nOff, sal_Int32 nVal );
- inline sal_Int32 GetFromPage ( const rtl::Reference< StgPage >& rPage, short nOff );
+ static inline sal_Int32 GetFromPage ( const rtl::Reference< StgPage >& rPage, short nOff );
void SetDirty ( const rtl::Reference< StgPage > &rPage );
bool SetSize( sal_Int32 nPages );
rtl::Reference< StgPage > Find( sal_Int32 ); // find a cached page
diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx
index 953bee3c4cb0..b9671bf0f33c 100644
--- a/sot/source/sdstor/stgio.cxx
+++ b/sot/source/sdstor/stgio.cxx
@@ -177,7 +177,7 @@ EasyFat::EasyFat( StgIo& rIo, StgStrm* pFatStream, sal_Int32 nPSize )
pPage = rIo.Get( nPhysPage, true );
}
- pFat[ nPage ] = rIo.GetFromPage( pPage, short( nPage % nFatPageSize ) );
+ pFat[ nPage ] = StgCache::GetFromPage( pPage, short( nPage % nFatPageSize ) );
pFree[ nPage ] = true;
}
}
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index e90e823ccae3..cd99b76f7388 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -73,7 +73,7 @@ sal_Int32 StgFAT::GetNextPage( sal_Int32 nPg )
if( nPg >= 0 )
{
rtl::Reference< StgPage > pPg = GetPhysPage( nPg << 2 );
- nPg = pPg.is() ? rStrm.GetIo().GetFromPage( pPg, nOffset >> 2 ) : STG_EOF;
+ nPg = pPg.is() ? StgCache::GetFromPage( pPg, nOffset >> 2 ) : STG_EOF;
}
return nPg;
}
@@ -103,7 +103,7 @@ sal_Int32 StgFAT::FindBlock( sal_Int32& nPgs )
if( !pPg.is() )
return STG_EOF;
}
- sal_Int32 nCur = rStrm.GetIo().GetFromPage( pPg, nEntry );
+ sal_Int32 nCur = StgCache::GetFromPage( pPg, nEntry );
if( nCur == STG_FREE )
{
// count the size of this area
@@ -291,7 +291,7 @@ bool StgFAT::FreePages( sal_Int32 nStart, bool bAll )
rtl::Reference< StgPage > pPg = GetPhysPage( nStart << 2 );
if( !pPg.is() )
return false;
- nStart = rStrm.GetIo().GetFromPage( pPg, nOffset >> 2 );
+ nStart = StgCache::GetFromPage( pPg, nOffset >> 2 );
// The first released page is either set to EOF or FREE
rStrm.GetIo().SetToPage( pPg, nOffset >> 2, bAll ? STG_FREE : STG_EOF );
bAll = true;
@@ -644,13 +644,13 @@ sal_Int32 StgFATStrm::GetPage( short nOff, bool bMake, sal_uInt16 *pnMasterAlloc
pMaster = rIo.Get( nFAT, true );
if ( pMaster.is() )
{
- nFAT = rIo.GetFromPage( pMaster, nMasterCount );
+ nFAT = StgCache::GetFromPage( pMaster, nMasterCount );
pOldPage = pMaster;
}
}
}
if( pMaster.is() )
- return rIo.GetFromPage( pMaster, nOff );
+ return StgCache::GetFromPage( pMaster, nOff );
rIo.SetError( SVSTREAM_GENERALERROR );
return STG_EOF;
}
@@ -686,7 +686,7 @@ bool StgFATStrm::SetPage( short nOff, sal_Int32 nNewPage )
}
pMaster = rIo.Get( nFAT, true );
if ( pMaster.is() )
- nFAT = rIo.GetFromPage( pMaster, nMasterCount );
+ nFAT = StgCache::GetFromPage( pMaster, nMasterCount );
}
if( pMaster.is() )
rIo.SetToPage( pMaster, nOff, nNewPage );
@@ -789,7 +789,7 @@ bool StgFATStrm::SetSize( sal_Int32 nBytes )
}
rtl::Reference< StgPage > pPage = rIo.Get( nFAT, true );
if( !pPage.is() ) return false;
- nFAT = rIo.GetFromPage( pPage, (nPageSize >> 2 ) - 1 );
+ nFAT = StgCache::GetFromPage( pPage, (nPageSize >> 2 ) - 1 );
}
nOld++;
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index c5d68e0fd8ad..da6b0a7be99a 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -219,7 +219,7 @@ class IntrospectionAccessStatic_Impl: public salhelper::SimpleReferenceObject
sal_Int32*& rpPropertyConceptArray,
sal_Int32 iNextIndex
);
- void checkInterfaceArraySize( Sequence< Reference<XInterface> >& rSeq, Reference<XInterface>*& rpInterfaceArray,
+ static void checkInterfaceArraySize( Sequence< Reference<XInterface> >& rSeq, Reference<XInterface>*& rpInterfaceArray,
sal_Int32 iNextIndex );
public:
@@ -1845,7 +1845,7 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect(
rLowerToExactNameMap[ toLower( aPropName ) ] = aPropName;
// Field merken
- pAccess->checkInterfaceArraySize( pAccess->aInterfaceSeq1,
+ IntrospectionAccessStatic_Impl::checkInterfaceArraySize( pAccess->aInterfaceSeq1,
pInterfaces1, rPropCount );
pInterfaces1[ rPropCount ] = xField;
@@ -2010,7 +2010,7 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect(
rLowerToExactNameMap[ toLower( aPropName ) ] = aPropName;
// get-Methode merken
- pAccess->checkInterfaceArraySize( pAccess->aInterfaceSeq1,
+ IntrospectionAccessStatic_Impl::checkInterfaceArraySize( pAccess->aInterfaceSeq1,
pInterfaces1, rPropCount );
pInterfaces1[ rPropCount ] = rxMethod_i;
@@ -2071,7 +2071,7 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect(
rProp.Attributes &= ~READONLY;
// set-Methode merken
- pAccess->checkInterfaceArraySize( pAccess->aInterfaceSeq2,
+ IntrospectionAccessStatic_Impl::checkInterfaceArraySize( pAccess->aInterfaceSeq2,
pInterfaces2, rPropCount );
pInterfaces2[ rPropCount ] = rxMethod_k;
}
@@ -2228,7 +2228,7 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect(
rLowerToExactNameMap[ toLower( aPropName ) ] = aPropName;
// set-Methode merken
- pAccess->checkInterfaceArraySize( pAccess->aInterfaceSeq2,
+ IntrospectionAccessStatic_Impl::checkInterfaceArraySize( pAccess->aInterfaceSeq2,
pInterfaces2, rPropCount );
pInterfaces2[ rPropCount ] = rxMethod_i;
@@ -2449,7 +2449,7 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect(
rLowerToExactNameMap[ toLower( aPropName ) ] = aPropName;
// Field merken
- pAccess->checkInterfaceArraySize( pAccess->aInterfaceSeq1,
+ IntrospectionAccessStatic_Impl::checkInterfaceArraySize( pAccess->aInterfaceSeq1,
pInterfaces1, rPropCount );
pInterfaces1[ rPropCount ] = xField;
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index c08dff06cf31..5a29982b6cef 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -204,8 +204,8 @@ private:
void getInfoSequenceImpl( Sequence< OUString >* pStringSeq, Sequence< InvocationInfo >* pInfoSeq );
void fillInfoForNameAccess( InvocationInfo& rInfo, const OUString& aName );
- void fillInfoForProperty( InvocationInfo& rInfo, const Property& rProp );
- void fillInfoForMethod( InvocationInfo& rInfo, const Reference< XIdlMethod > xMethod );
+ static void fillInfoForProperty( InvocationInfo& rInfo, const Property& rProp );
+ static void fillInfoForMethod( InvocationInfo& rInfo, const Reference< XIdlMethod > xMethod );
Reference<XTypeConverter> xTypeConverter;
Reference<XIntrospection> xIntrospection;
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index fdbb5fc8dfaf..68d87dd31641 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -160,11 +160,11 @@ class PolicyReader
inline void back( sal_Unicode c )
{ m_back = c; }
- inline bool isWhiteSpace( sal_Unicode c ) const
+ static inline bool isWhiteSpace( sal_Unicode c )
{ return (' ' == c || '\t' == c || '\n' == c || '\r' == c); }
void skipWhiteSpace();
- inline bool isCharToken( sal_Unicode c ) const
+ static inline bool isCharToken( sal_Unicode c )
{ return (';' == c || ',' == c || '{' == c || '}' == c); }
public:
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 426cc0525441..7b013674f996 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -240,10 +240,10 @@ static bool getHyperValue( sal_Int64 & rnVal, const OUString & rStr )
class TypeConverter_Impl : public WeakImplHelper2< XTypeConverter, XServiceInfo >
{
// ...misc helpers...
- sal_Int64 toHyper(
+ static sal_Int64 toHyper(
const Any& rAny, sal_Int64 min = SAL_INT64_MIN, sal_uInt64 max = SAL_UINT64_MAX )
throw( CannotConvertException );
- double toDouble( const Any& rAny, double min = -DBL_MAX, double max = DBL_MAX ) const
+ static double toDouble( const Any& rAny, double min = -DBL_MAX, double max = DBL_MAX )
throw( CannotConvertException );
public:
@@ -404,7 +404,7 @@ sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, sal_Int64 min, sal_uInt6
}
-double TypeConverter_Impl::toDouble( const Any& rAny, double min, double max ) const
+double TypeConverter_Impl::toDouble( const Any& rAny, double min, double max )
throw( CannotConvertException )
{
double fRet;
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 ] =
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 12:28:22 +0000