loplugin:staticmethods

Change-Id: I1f6c6d13697aa397067478d6b07429120106e6bd

6 files changed, 16 insertions, 16 deletions

diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx
index b27ab2be31b7..56f6155db466 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.hxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx
@@ -135,11 +135,11 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase
 
     private:
         /** Check if LDAP is configured */
-        bool readLdapConfiguration(
+        static bool readLdapConfiguration(
             uno::Reference<uno::XComponentContext> const & context,
             LdapDefinition * definition, OUString * loggedOnUser);
 
-        bool getLdapStringParam(uno::Reference<container::XNameAccess>& xAccess,
+        static bool getLdapStringParam(uno::Reference<container::XNameAccess>& xAccess,
                                 const OUString& aLdapSetting,
                                 OUString& aServerParameter);
 
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 55ac2af908ab..ef98f37df8ea 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -136,7 +136,7 @@ protected:
     std::vector<NPStream*>              m_aNPWrapStreams;
     std::vector<ConnectorInstance*>     m_aInstances;
 
-    sal_uLong   FillBuffer( char*&, const char*, sal_uLong, va_list );
+    static sal_uLong   FillBuffer( char*&, const char*, sal_uLong, va_list );
 public:
     PluginConnector( int nSocket );
     virtual ~PluginConnector();
@@ -155,7 +155,7 @@ public:
 
     std::vector<NPStream*>& getStreamList() { return m_aNPWrapStreams; }
 
-    NPError GetNPError( MediatorMessage* pMes )
+    static NPError GetNPError( MediatorMessage* pMes )
     {
         NPError* pErr = static_cast<NPError*>(pMes->GetBytes());
         NPError aErr = *pErr;
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index 9721a55ffdf8..16329c9059c7 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -103,7 +103,7 @@ static NPError l_NPN_DestroyStream( NPP instance, NPStream* stream, NPError reas
     delete [] stream->url;
     delete stream;
     // returns NPError
-    NPError aRet = pConnector->GetNPError( pMes );
+    NPError aRet = PluginConnector::GetNPError( pMes );
     delete pMes;
     return aRet;
 }
@@ -141,7 +141,7 @@ static NPError l_NPN_GetURL( NPP instance, const char* url, const char* window )
         return NPERR_GENERIC_ERROR;
 
     // returns NPError
-    NPError aRet = pConnector->GetNPError( pMes );
+    NPError aRet = PluginConnector::GetNPError( pMes );
     SAL_WARN_IF(aRet, "extensions.plugin", "geturl returns " << aRet);
     delete pMes;
     return aRet;
@@ -168,7 +168,7 @@ static NPError l_NPN_GetURLNotify( NPP instance, const char* url, const char* ta
         return NPERR_GENERIC_ERROR;
 
     // returns NPError
-    NPError aRet = pConnector->GetNPError( pMes );
+    NPError aRet = PluginConnector::GetNPError( pMes );
     delete pMes;
     return aRet;
 }
@@ -192,7 +192,7 @@ static NPError l_NPN_NewStream( NPP instance, NPMIMEType type, const char* targe
         return NPERR_GENERIC_ERROR;
 
     // returns a new NPStream and an error
-    NPError aRet = pConnector->GetNPError( pMes );
+    NPError aRet = PluginConnector::GetNPError( pMes );
     if( ! aRet )
     {
         NPStream* pStream = new NPStream;
@@ -229,7 +229,7 @@ static NPError l_NPN_PostURLNotify( NPP instance, const char* url, const char* t
     if( ! pMes )
         return NPERR_GENERIC_ERROR;
 
-    NPError aRet = pConnector->GetNPError( pMes );
+    NPError aRet = PluginConnector::GetNPError( pMes );
     delete pMes;
     return aRet;
 }
@@ -252,7 +252,7 @@ static NPError l_NPN_PostURL( NPP instance, const char* url, const char* window,
     if( ! pMes )
         return NPERR_GENERIC_ERROR;
 
-    NPError aRet = pConnector->GetNPError( pMes );
+    NPError aRet = PluginConnector::GetNPError( pMes );
     delete pMes;
     return aRet;
 }
@@ -293,7 +293,7 @@ static NPError l_NPN_RequestRead( NPStream* stream, NPByteRange* rangeList )
         return NPERR_GENERIC_ERROR;
     }
 
-    NPError aRet = pConnector->GetNPError( pMes );
+    NPError aRet = PluginConnector::GetNPError( pMes );
     delete [] pArray;
     delete pMes;
     return aRet;
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 15cc6c8614d9..ff448c2e881c 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -254,7 +254,7 @@ protected:
 private:
 
     /* Used to avoid dialup login windows (on platforms we know how to double this) */
-    inline bool hasInternetConnection() const
+    static inline bool hasInternetConnection()
     {
 #ifdef WNT
         return WNT_hasInternetConnection();
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 9e69e8226e89..28eb58ea2ddd 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -607,7 +607,7 @@ void UpdateHandler::updateState( UpdateState eState )
 
 
 OUString UpdateHandler::loadString( const uno::Reference< resource::XResourceBundle >& rBundle,
-                                         sal_Int32 nResourceId ) const
+                                         sal_Int32 nResourceId )
 {
     OUString sString;
     OUString sKey = "string:" + OUString::number( nResourceId );
diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx
index 26d5346c8c80..59be1d362c77 100644
--- a/extensions/source/update/check/updatehdl.hxx
+++ b/extensions/source/update/check/updatehdl.hxx
@@ -143,9 +143,9 @@ private:
     void                    enableControls( short nCtrlState );
     void                    setDownloadBtnLabel( bool bAppendDots );
     void                    loadStrings();
-    OUString           loadString( const com::sun::star::uno::Reference< com::sun::star::resource::XResourceBundle >& xBundle,
-                                        sal_Int32 nResourceId ) const;
-    OUString           substVariables( const OUString &rSource ) const;
+    static OUString         loadString( const com::sun::star::uno::Reference< com::sun::star::resource::XResourceBundle >& xBundle,
+                                        sal_Int32 nResourceId );
+    OUString                substVariables( const OUString &rSource ) const;
     static void             setProperty( com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > &rProps,
                                          const int nIndex, const OUString &rPropName, const com::sun::star::uno::Any &rPropValue )
                                          { rProps[ nIndex ].Name = rPropName; rProps[ nIndex ].Value = rPropValue; }