diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-16 16:54:25 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-17 09:09:33 +0200 |
commit | 9a831a6c19a30869782cfeb17f1c649a4ce4d9d9 (patch) | |
tree | 690a29bf99b90c18b2b7f8ce7829a9b932a2f0fc /forms | |
parent | b3f094c2573de12bf3d386f19b924b536cb89af0 (diff) |
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>
Diffstat (limited to 'forms')
-rw-r--r-- | forms/source/component/EventThread.hxx | 6 | ||||
-rw-r--r-- | forms/source/component/FormattedField.cxx | 2 |
2 files changed, 3 insertions, 5 deletions
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; |