summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/unoframe.hxx8
-rw-r--r--sw/inc/unotxdoc.hxx4
-rw-r--r--sw/source/core/inc/observablethread.hxx8
-rw-r--r--sw/source/core/unocore/unoframe.cxx30
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx10
5 files changed, 3 insertions, 57 deletions
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
*/