summaryrefslogtreecommitdiff
path: root/extensions/source/plugin
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-01 12:14:22 +0200
committerNoel Grandin <noel@peralex.com>2015-04-02 09:38:29 +0200
commitaa1b911b64641bbf29991af7c6f7798739aba667 (patch)
tree49f367d26ca57cc7a84dcdcca90613d6b46fed1f /extensions/source/plugin
parentf70d8277941ada544736abdb72548fb16e0d992d (diff)
loplugin:staticmethods
Change-Id: I1f6c6d13697aa397067478d6b07429120106e6bd
Diffstat (limited to 'extensions/source/plugin')
-rw-r--r--extensions/source/plugin/inc/plugin/unx/plugcon.hxx4
-rw-r--r--extensions/source/plugin/unx/npnapi.cxx14
2 files changed, 9 insertions, 9 deletions
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;