diff options
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/unoframe.hxx | 12 | ||||
-rw-r--r-- | sw/inc/unotxdoc.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/unocore/unoframe.cxx | 12 | ||||
-rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 4 |
4 files changed, 16 insertions, 16 deletions
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index 0fcff03dae77..ac0158c54c5f 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -237,8 +237,8 @@ public: //XPropertySet virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; - void * SAL_CALL operator new( size_t ) throw(); - void SAL_CALL operator delete( void * ) throw(); + void * operator new( size_t ) throw(); + void operator delete( void * ) throw(); }; typedef cppu::ImplInheritanceHelper @@ -268,8 +268,8 @@ public: // XEventsSupplier virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override; - void * SAL_CALL operator new( size_t ) throw(); - void SAL_CALL operator delete( void * ) throw(); + void * operator new( size_t ) throw(); + void operator delete( void * ) throw(); }; class SwOLENode; @@ -309,8 +309,8 @@ public: // XEventsSupplier virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override; - void * SAL_CALL operator new( size_t ) throw(); - void SAL_CALL operator delete( void * ) throw(); + 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 3f202c88ae54..4e2161af805b 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -447,8 +447,8 @@ public: SwDocShell* GetDocShell() {return pDocShell;} - void * SAL_CALL operator new( size_t ) throw(); - void SAL_CALL operator delete( void * ) throw(); + void * operator new( size_t ) throw(); + void operator delete( void * ) throw(); }; diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 76ea5752dc97..7ff0c80d95c0 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -3351,12 +3351,12 @@ uno::Sequence< OUString > SwXTextFrame::getSupportedServiceNames() return aRet; } -void * SAL_CALL SwXTextFrame::operator new( size_t t) throw() +void * SwXTextFrame::operator new( size_t t) throw() { return SwXTextFrameBaseClass::operator new( t); } -void SAL_CALL SwXTextFrame::operator delete( void * p) throw() +void SwXTextFrame::operator delete( void * p) throw() { SwXTextFrameBaseClass::operator delete(p); } @@ -3432,12 +3432,12 @@ uno::Sequence< OUString > SwXTextGraphicObject::getSupportedServiceNames() return aRet; } -void * SAL_CALL SwXTextGraphicObject::operator new( size_t t) throw() +void * SwXTextGraphicObject::operator new( size_t t) throw() { return SwXTextGraphicObjectBaseClass::operator new(t); } -void SAL_CALL SwXTextGraphicObject::operator delete( void * p) throw() +void SwXTextGraphicObject::operator delete( void * p) throw() { SwXTextGraphicObjectBaseClass::operator delete(p); } @@ -3581,12 +3581,12 @@ uno::Sequence< OUString > SwXTextEmbeddedObject::getSupportedServiceNames() return aRet; } -void * SAL_CALL SwXTextEmbeddedObject::operator new( size_t t) throw() +void * SwXTextEmbeddedObject::operator new( size_t t) throw() { return SwXTextEmbeddedObjectBaseClass::operator new(t); } -void SAL_CALL SwXTextEmbeddedObject::operator delete( void * p) throw() +void SwXTextEmbeddedObject::operator delete( void * p) throw() { SwXTextEmbeddedObjectBaseClass::operator delete(p); } diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 7a734e61112a..1143d21d914b 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3638,12 +3638,12 @@ void SAL_CALL SwXTextDocument::paintTile( const ::css::uno::Any& Parent, ::sal_I #endif } -void * SAL_CALL SwXTextDocument::operator new( size_t t) throw() +void * SwXTextDocument::operator new( size_t t) throw() { return SwXTextDocumentBaseClass::operator new(t); } -void SAL_CALL SwXTextDocument::operator delete( void * p) throw() +void SwXTextDocument::operator delete( void * p) throw() { SwXTextDocumentBaseClass::operator delete(p); } |