summaryrefslogtreecommitdiff
path: root/stoc/source
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 /stoc/source
parentaa1b911b64641bbf29991af7c6f7798739aba667 (diff)
loplugin:staticmethods
Change-Id: I3ae555fd9f0dc3c11ea301ee1cb2c799fbec820d
Diffstat (limited to 'stoc/source')
-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
4 files changed, 13 insertions, 13 deletions
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;