diff options
22 files changed, 20 insertions, 191 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); 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 diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx index f2ee991330cb..607db4956b26 100644 --- a/forms/source/component/EventThread.hxx +++ b/forms/source/component/EventThread.hxx @@ -96,9 +96,9 @@ public: // css::lang::XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource ) override; - // Resolve ambiguity: both OWeakObject and OObject have these memory operators - void * operator new( size_t size ) throw() { return osl::Thread::operator new(size); } - void operator delete( void * p ) throw() { osl::Thread::operator delete(p); } + // Resolve ambiguity: both OWeakObject and osl::Thread have these memory operators + using osl::Thread::operator new; + using osl::Thread::operator delete; private: void impl_clearEventQueue(); diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 200748acab22..cec040e8c869 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -80,8 +80,6 @@ protected: static WeakReference< XNumberFormatsSupplier > s_xDefaultFormatsSupplier; public: static Reference< XNumberFormatsSupplier > get( const Reference< XComponentContext >& _rxORB ); - using SvNumberFormatsSupplierObj::operator new; - using SvNumberFormatsSupplierObj::operator delete; protected: StandardFormatsSupplier(const Reference< XComponentContext >& _rxFactory,LanguageType _eSysLanguage); virtual ~StandardFormatsSupplier() override; 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 diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index 746ece2fa2dc..b633303b30e9 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -374,18 +374,6 @@ XPropertyList::CreatePropertyListFromURL( XPropertyListType t, return pList; } -// catch people being silly with ref counting ... - -void* XPropertyList::operator new (size_t nCount) -{ - return rtl_allocateMemory( nCount ); -} - -void XPropertyList::operator delete(void *pPtr) -{ - return rtl_freeMemory( pPtr ); -} - static struct { XPropertyListType t; const char *pExt; diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index d92f682dd2e7..0893022328ce 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -235,9 +235,6 @@ public: //XPropertySet virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; - - void * operator new( size_t ) throw(); - void operator delete( void * ) throw(); }; typedef cppu::ImplInheritanceHelper @@ -266,9 +263,6 @@ public: // XEventsSupplier virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override; - - void * operator new( size_t ) throw(); - void operator delete( void * ) throw(); }; typedef cppu::ImplInheritanceHelper @@ -307,8 +301,6 @@ public: // XEventsSupplier virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override; - void * operator new( size_t ) throw(); - void operator delete( void * ) throw(); }; class SwXOLEListener : public cppu::WeakImplHelper<css::util::XModifyListener>, diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 3d1577d52d0f..131868206464 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -450,10 +450,6 @@ public: css::uno::Reference< css::uno::XInterface > const & xLastResult); SwDocShell* GetDocShell() {return pDocShell;} - - void * operator new( size_t ) throw(); - void operator delete( void * ) throw(); - }; class SwXLinkTargetSupplier : public cppu::WeakImplHelper diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx index 900fda37d0c9..5d7231b1b4d3 100644 --- a/sw/source/core/inc/observablethread.hxx +++ b/sw/source/core/inc/observablethread.hxx @@ -46,11 +46,9 @@ class ObservableThread : public osl::Thread, void SetListener( std::weak_ptr< IFinishedThreadListener > const & pThreadListener, const oslInterlockedCount nThreadID ); - static void * operator new(std::size_t size) - { return SimpleReferenceObject::operator new(size); } - - static void operator delete(void * pointer) - { SimpleReferenceObject::operator delete(pointer); } + // resolve ambiguity + using SimpleReferenceObject::operator new; + using SimpleReferenceObject::operator delete; protected: diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index c5576b90add4..8e29518d5070 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -3222,16 +3222,6 @@ uno::Sequence< OUString > SwXTextFrame::getSupportedServiceNames() return aRet; } -void * SwXTextFrame::operator new( size_t t) throw() -{ - return SwXTextFrameBaseClass::operator new( t); -} - -void SwXTextFrame::operator delete( void * p) throw() -{ - SwXTextFrameBaseClass::operator delete(p); -} - uno::Reference<container::XNameReplace > SAL_CALL SwXTextFrame::getEvents() { return new SwFrameEventDescriptor( *this ); @@ -3303,16 +3293,6 @@ uno::Sequence< OUString > SwXTextGraphicObject::getSupportedServiceNames() return aRet; } -void * SwXTextGraphicObject::operator new( size_t t) throw() -{ - return SwXTextGraphicObjectBaseClass::operator new(t); -} - -void SwXTextGraphicObject::operator delete( void * p) throw() -{ - SwXTextGraphicObjectBaseClass::operator delete(p); -} - uno::Reference<container::XNameReplace> SAL_CALL SwXTextGraphicObject::getEvents() { @@ -3452,16 +3432,6 @@ uno::Sequence< OUString > SwXTextEmbeddedObject::getSupportedServiceNames() return aRet; } -void * SwXTextEmbeddedObject::operator new( size_t t) throw() -{ - return SwXTextEmbeddedObjectBaseClass::operator new(t); -} - -void SwXTextEmbeddedObject::operator delete( void * p) throw() -{ - SwXTextEmbeddedObjectBaseClass::operator delete(p); -} - uno::Reference<container::XNameReplace> SAL_CALL SwXTextEmbeddedObject::getEvents() { diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 0b39cd08a47d..ee6165166310 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3724,16 +3724,6 @@ void SAL_CALL SwXTextDocument::paintTile( const ::css::uno::Any& Parent, ::sal_I #endif } -void * SwXTextDocument::operator new( size_t t) throw() -{ - return SwXTextDocumentBaseClass::operator new(t); -} - -void SwXTextDocument::operator delete( void * p) throw() -{ - SwXTextDocumentBaseClass::operator delete(p); -} - /** * retrieve languages already used in current document */ |