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>

8 files changed, 0 insertions, 72 deletions

diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx
index 375f6ce9dc5a..a60f44e2bb8b 100644
--- a/connectivity/source/inc/OColumn.hxx
+++ b/connectivity/source/inc/OColumn.hxx
@@ -95,15 +95,6 @@ namespace connectivity
                 m_ColumnLabel = _aColumnName;
         }
 
-        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* )
-            {  }
-
         bool isAutoIncrement()              const { return m_AutoIncrement; }
         bool isCaseSensitive()              const { return m_CaseSensitive; }
         bool isSearchable()                 const { return m_Searchable; }
diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx
index 002a5a7c067c..65163085cf20 100644
--- a/connectivity/source/inc/OTypeInfo.hxx
+++ b/connectivity/source/inc/OTypeInfo.hxx
@@ -43,15 +43,6 @@ namespace connectivity
                 ,nType( css::sdbc::DataType::OTHER)
         {}
 
-        static void * operator new( size_t nSize )
-            { return ::rtl_allocateMemory( nSize ); }
-        static void * operator new( size_t /*nSize*/,void* _pHint )
-            { return _pHint; }
-        static void operator delete( void * pMem )
-            { ::rtl_freeMemory( pMem ); }
-        static void operator delete( void * /*pMem*/,void* /*_pHint*/ )
-            {  }
-
         bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; }
         bool operator != (const OTypeInfo& lh) const { return lh.nType != nType; }
     };
diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx
index 4cd5613b7bd2..f1911b6c03f4 100644
--- a/connectivity/source/inc/TKeyValue.hxx
+++ b/connectivity/source/inc/TKeyValue.hxx
@@ -34,15 +34,6 @@ namespace connectivity
 
         ~OKeyValue();
 
-        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* )
-            {  }
-
         static OKeyValue* createKeyValue(sal_Int32 nVal);
         //  static OKeyValue* createEmptyKeyValue();
 
diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx
index 6e177c877f54..373e87ea3d7b 100644
--- a/connectivity/source/inc/TSkipDeletedSet.hxx
+++ b/connectivity/source/inc/TSkipDeletedSet.hxx
@@ -41,15 +41,6 @@ namespace connectivity
         OSkipDeletedSet(IResultSetHelper* _pHelper);
         ~OSkipDeletedSet();
 
-        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* )
-            {  }
-
         /**
             skipDeleted moves the resultset to the position defined by the parameters
             it guarantees that the row isn't deleted
diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx
index 5429f3a1087d..e03910ff5ac4 100644
--- a/connectivity/source/inc/TSortIndex.hxx
+++ b/connectivity/source/inc/TSortIndex.hxx
@@ -63,16 +63,6 @@ namespace connectivity
 
         ~OSortIndex();
 
-        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* )
-            {  }
-
-
         /**
             AddKeyValue appends a new value.
             @param
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index ea33b682a8e7..bf0bf810299d 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -45,14 +45,6 @@ namespace connectivity
         public:
             OSQLAnalyzer(OConnection* _pConnection);
             ~OSQLAnalyzer();
-            static void * operator new( size_t nSize )
-                { return ::rtl_allocateMemory( nSize ); }
-            static void * operator new( size_t /*nSize*/,void* _pHint )
-                { return _pHint; }
-            static void operator delete( void * pMem )
-                { ::rtl_freeMemory( pMem ); }
-            static void operator delete( void * /*pMem*/,void* /*_pHint*/ )
-                {  }
 
             OConnection* getConnection() const { return m_pConnection; }
             void bindEvaluationRow(OValueRefRow const & _pRow); // Bind an evaluation row to the restriction
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index d83ede26aed0..da0670f4e1da 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -52,16 +52,6 @@ namespace connectivity
             //and same issue for the assignment operators
             OCode& operator=(const OCode&) = default;
             OCode& operator=(OCode&&) = default;
-
-            static void * operator new( size_t nSize )
-                { return ::rtl_allocateMemory( nSize ); }
-            static void * operator new( size_t /*nSize*/,void* _pHint )
-                { return _pHint; }
-            static void operator delete( void * pMem )
-                { ::rtl_freeMemory( pMem ); }
-            static void operator delete( void * /*pMem*/,void* /*_pHint*/ )
-                {  }
-
         };
 
 
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index 1485060873a1..bc1b452e1915 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -48,14 +48,6 @@ namespace connectivity
 
             virtual ~OPredicateCompiler() override;
 
-            static void * operator new( size_t nSize )
-                { return ::rtl_allocateMemory( nSize ); }
-            static void * operator new( size_t /*nSize*/,void* _pHint )
-                { return _pHint; }
-            static void operator delete( void * pMem )
-                { ::rtl_freeMemory( pMem ); }
-            static void operator delete( void * /*pMem*/,void* /*_pHint*/ )
-                {  }
             void dispose();
 
             void start(connectivity::OSQLParseNode const * pSQLParseNode);