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>

5 files changed, 10 insertions, 41 deletions

diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx
index 65302f814c72..86a94273d352 100644
--- a/include/connectivity/FValue.hxx
+++ b/include/connectivity/FValue.hxx
@@ -278,15 +278,6 @@ namespace connectivity
             free();
         }
 
-        static void * operator new( size_t nSize )
-            { return ::rtl_allocateMemory( nSize ); }
-        static void * operator new( size_t,void* _pHint )
-            { return _pHint; }
-        static void operator delete( void * pMem )
-            { ::rtl_freeMemory( pMem ); }
-        static void operator delete( void *,void* )
-            {  }
-
         ORowSetValue& operator=(const ORowSetValue& _rRH);
         ORowSetValue& operator=(ORowSetValue&& _rRH);
 
diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index 2dad97b64ab2..d10bc71ea81d 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
@@ -158,15 +158,6 @@ namespace connectivity
             const OSQLParser& _rParser );
         ~OSQLParseTreeIterator();
 
-        static void * operator new( size_t nSize )
-            { return ::rtl_allocateMemory( nSize ); }
-        static void * operator new( size_t,void* _pHint )
-            { return _pHint; }
-        static void operator delete( void * pMem )
-            { ::rtl_freeMemory( pMem ); }
-        static void operator delete( void *,void* )
-            {  }
-
         void dispose();
         bool isCaseSensitive() const;
         // The parse tree to be analysed/traversed:
diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx
index 12addf24a2be..de0f0faff8f1 100644
--- a/include/connectivity/sqlscan.hxx
+++ b/include/connectivity/sqlscan.hxx
@@ -44,15 +44,6 @@ namespace connectivity
         OSQLScanner();
         virtual ~OSQLScanner();
 
-        static void * operator new( size_t nSize )
-            { return ::rtl_allocateMemory( nSize ); }
-        static void * operator new( size_t,void* _pHint )
-            { return _pHint; }
-        static void operator delete( void * pMem )
-            { ::rtl_freeMemory( pMem ); }
-        static void operator delete( void *,void* )
-            {  }
-
         sal_Int32 SQLyygetc();
         void SQLyyerror(char const *fmt);
         IParseContext::InternationalKeyCode getInternationalTokenID(const char* sToken) const;
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;
 };
 
 
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index e83155a0f5de..7208e57a5689 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -157,10 +157,6 @@ class XGradientList ; typedef rtl::Reference< class XGradientList > XGradientLis
 
 class SVX_DLLPUBLIC XPropertyList : public cppu::OWeakObject
 {
-private:
-    SAL_DLLPRIVATE void* operator new(size_t);
-protected:
-    void operator delete(void *);
 protected:
     XPropertyListType   meType;
     OUString            maName; // not persistent