summaryrefslogtreecommitdiff
path: root/include/svx
diff options
context:
space:
mode:
Diffstat (limited to 'include/svx')
-rw-r--r--include/svx/fmgridif.hxx20
-rw-r--r--include/svx/unomod.hxx2
-rw-r--r--include/svx/unoshape.hxx4
3 files changed, 13 insertions, 13 deletions
diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index 0982c0dd38f1..df3c33845b1e 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -83,8 +83,8 @@ public:
virtual void SAL_CALL modified(const css::lang::EventObject& Source) override;
// resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
- void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
- void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
+ void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
+ void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
};
@@ -108,8 +108,8 @@ public:
virtual void SAL_CALL updated(const css::lang::EventObject &) override;
// resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
- void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
- void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
+ void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
+ void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
};
@@ -132,8 +132,8 @@ public:
virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) override;
// resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
- void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
- void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
+ void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
+ void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
};
@@ -156,8 +156,8 @@ public:
virtual void SAL_CALL columnChanged( const css::lang::EventObject& _event ) override;
// resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
- void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
- void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
+ void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
+ void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
};
@@ -181,8 +181,8 @@ public:
virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) override;
// resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
- void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
- void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
+ void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
+ void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
};
diff --git a/include/svx/unomod.hxx b/include/svx/unomod.hxx
index e139035396c3..805f6c040b7e 100644
--- a/include/svx/unomod.hxx
+++ b/include/svx/unomod.hxx
@@ -41,7 +41,7 @@ public:
/// @throws css::uno::Exception
/// @throws css::uno::RuntimeException
- static css::uno::Reference< css::uno::XInterface > SAL_CALL createTextField( const OUString& aServiceSpecifier );
+ static css::uno::Reference< css::uno::XInterface > createTextField( const OUString& aServiceSpecifier );
// internal
static css::uno::Sequence< OUString >
concatServiceNames( css::uno::Sequence< OUString >& rServices1,
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index e9475788c84a..ba28d311dd5d 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -216,8 +216,8 @@ public:
sal_uInt32 getShapeKind() const;
// styles need this
- static bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel const * pModel );
- static bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet );
+ static bool SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel const * pModel );
+ static bool SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet );
/** same as SetFillAttribute but for property names instead of which ids,
and the property found is returned instead of set at the object