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>

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