diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-16 16:54:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-17 09:09:33 +0200 |
| commit | 9a831a6c19a30869782cfeb17f1c649a4ce4d9d9 (patch) | |
| tree | 690a29bf99b90c18b2b7f8ce7829a9b932a2f0fc /dbaccess | |
| parent | b3f094c2573de12bf3d386f19b924b536cb89af0 (diff) | |
remove no longer necessary operator new/delete overrides
and use "using" statements for the places where the overrides were
resolving ambiguities
Change-Id: Icb1d1a41f19e00f28a19947aa2c40bd5778fff94
Reviewed-on: https://gerrit.libreoffice.org/52993
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/inc/sbamultiplex.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx index 51caf74e8e4d..055d4c034271 100644 --- a/dbaccess/source/ui/inc/sbamultiplex.hxx +++ b/dbaccess/source/ui/inc/sbamultiplex.hxx @@ -83,10 +83,10 @@ namespace dbaui #define DECLARE_MULTIPLEXER_BOOL_METHOD(methodname, eventtype) \ virtual sal_Bool SAL_CALL methodname(const eventtype& e) override; \ - #define END_DECLARE_LISTENER_MULTIPLEXER() \ - /* resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators */ \ - void * operator new( size_t size ) throw() { return OSbaWeakSubObject::operator new(size); } \ - void operator delete( void * p ) throw() { OSbaWeakSubObject::operator delete(p); } \ + #define END_DECLARE_LISTENER_MULTIPLEXER() \ + /* resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators */ \ + using OSbaWeakSubObject::operator new; \ + using OSbaWeakSubObject::operator delete; \ }; \ // implementation of a listener multiplexer class |