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, 10 insertions, 10 deletions

diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index fbec6ea6435f..546b4442cbd3 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -84,8 +84,8 @@ public:
     virtual void SAL_CALL modified(const css::lang::EventObject& Source) override;
 
 // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
-    void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
-    void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
+    using OWeakSubObject::operator new;
+    using OWeakSubObject::operator delete;
 };
 
 
@@ -109,8 +109,8 @@ public:
     virtual void SAL_CALL updated(const css::lang::EventObject &) override;
 
 // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
-    void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
-    void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
+    using OWeakSubObject::operator new;
+    using OWeakSubObject::operator delete;
 };
 
 
@@ -133,8 +133,8 @@ public:
     virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) override;
 
 // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
-    void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
-    void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
+    using OWeakSubObject::operator new;
+    using OWeakSubObject::operator delete;
 };
 
 
@@ -157,8 +157,8 @@ public:
     virtual void SAL_CALL columnChanged( const css::lang::EventObject& _event ) override;
 
 // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
-    void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
-    void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
+    using OWeakSubObject::operator new;
+    using OWeakSubObject::operator delete;
 };
 
 
@@ -182,8 +182,8 @@ public:
     virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) override;
 
 // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
-    void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
-    void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
+    using OWeakSubObject::operator new;
+    using OWeakSubObject::operator delete;
 };