diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /extensions/source/plugin/inc/plugin/unx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'extensions/source/plugin/inc/plugin/unx')
-rw-r--r-- | extensions/source/plugin/inc/plugin/unx/mediator.hxx | 4 | ||||
-rw-r--r-- | extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 2 | ||||
-rw-r--r-- | extensions/source/plugin/inc/plugin/unx/sysplug.hxx | 22 |
3 files changed, 14 insertions, 14 deletions
diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx index c06e1390332b..b44a918bc1ba 100644 --- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx +++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx @@ -138,8 +138,8 @@ private: MediatorListener( Mediator* ); virtual ~MediatorListener(); - virtual void run() SAL_OVERRIDE; - virtual void onTerminated() SAL_OVERRIDE; + virtual void run() override; + virtual void onTerminated() override; }; #endif // INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_UNX_MEDIATOR_HXX diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx index 92e080860030..07932960f91f 100644 --- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx +++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx @@ -143,7 +143,7 @@ public: PluginConnector( int nSocket ); virtual ~PluginConnector(); - virtual MediatorMessage* WaitForAnswer( sal_uLong nMessageID ) SAL_OVERRIDE; + virtual MediatorMessage* WaitForAnswer( sal_uLong nMessageID ) override; MediatorMessage* Transact( const char*, sal_uLong, ... ); MediatorMessage* Transact( sal_uInt32, ... ); void Respond( sal_uLong nID, char*, sal_uLong, ... ); diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx index b1ccb1e1283d..03772a62ae2b 100644 --- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx @@ -48,27 +48,27 @@ public: virtual ~UnxPluginComm(); using PluginComm::NPP_Destroy; - virtual NPError NPP_Destroy( NPP instance, NPSavedData** save ) SAL_OVERRIDE; + virtual NPError NPP_Destroy( NPP instance, NPSavedData** save ) override; virtual NPError NPP_DestroyStream( NPP instance, NPStream* stream, - NPError reason ) SAL_OVERRIDE; - virtual NPError NPP_Initialize() SAL_OVERRIDE; + NPError reason ) override; + virtual NPError NPP_Initialize() override; virtual NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, - char* argn[], char* argv[], NPSavedData *saved ) SAL_OVERRIDE; + char* argn[], char* argv[], NPSavedData *saved ) override; virtual NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream* stream, - NPBool seekable, uint16_t* stype ) SAL_OVERRIDE; + NPBool seekable, uint16_t* stype ) override; using PluginComm::NPP_SetWindow; - virtual NPError NPP_SetWindow( NPP instance, NPWindow* window ) SAL_OVERRIDE; - virtual void NPP_Shutdown() SAL_OVERRIDE; + virtual NPError NPP_SetWindow( NPP instance, NPWindow* window ) override; + virtual void NPP_Shutdown() override; virtual void NPP_StreamAsFile( NPP instance, NPStream* stream, - const char* fname ) SAL_OVERRIDE; + const char* fname ) override; virtual void NPP_URLNotify( NPP instance, const char* url, NPReason reason, - void* notifyData ) SAL_OVERRIDE; + void* notifyData ) override; virtual int32_t NPP_Write( NPP instance, NPStream* stream, int32_t offset, - int32_t len, void* buffer ) SAL_OVERRIDE; - virtual int32_t NPP_WriteReady( NPP instance, NPStream* stream ) SAL_OVERRIDE; + int32_t len, void* buffer ) override; + virtual int32_t NPP_WriteReady( NPP instance, NPStream* stream ) override; static bool getPluginappPath(OString * path); }; |