summaryrefslogtreecommitdiffstats
path: root/include/svx
diff options
context:
space:
mode:
Diffstat (limited to 'include/svx')
-rw-r--r--include/svx/AccessibleControlShape.hxx4
-rw-r--r--include/svx/AccessibleTextHelper.hxx2
-rw-r--r--include/svx/fmgridcl.hxx2
-rw-r--r--include/svx/unoshape.hxx18
4 files changed, 13 insertions, 13 deletions
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index 5b20b105ef1e..cfac0bebfe03 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -83,8 +83,8 @@ public:
const AccessibleShapeTreeInfo& rShapeTreeInfo);
virtual ~AccessibleControlShape( ) override;
- const css::uno::Reference< css::beans::XPropertySet >& SAL_CALL GetControlModel( ) { return m_xControlModel;} ;
- AccessibleControlShape* SAL_CALL GetLabeledByControlShape();
+ const css::uno::Reference< css::beans::XPropertySet >& GetControlModel( ) { return m_xControlModel;} ;
+ AccessibleControlShape* GetLabeledByControlShape();
private:
//--- XAccessibleComponent -------------------------------
diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx
index 3a8f04f523ee..d80050375e68 100644
--- a/include/svx/AccessibleTextHelper.hxx
+++ b/include/svx/AccessibleTextHelper.hxx
@@ -350,7 +350,7 @@ namespace accessibility
@attention Don't call with locked mutexes. You may hold
the solar mutex, but this method acquires it anyway.
*/
- css::uno::Reference< css::accessibility::XAccessible > SAL_CALL GetAt( const css::awt::Point& aPoint );
+ css::uno::Reference< css::accessibility::XAccessible > GetAt( const css::awt::Point& aPoint );
private:
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index f82899aca673..d85c639a46c1 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -109,7 +109,7 @@ public:
virtual void KeyInput( const KeyEvent& rKEvt ) override;
// css::beans::XPropertyChangeListener
- void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt);
+ void propertyChange(const css::beans::PropertyChangeEvent& evt);
// css::form::XPositioningListener
void positioned();
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 7f6b618e8f25..e9475788c84a 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -148,7 +148,7 @@ protected:
css::uno::Any GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertySimpleEntry* pMap ) const;
- bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName );
+ bool SetFillAttribute( sal_Int32 nWID, const OUString& rName );
/** called from the XActionLockable interface methods on initial locking */
virtual void lock();
@@ -228,34 +228,34 @@ public:
// access methods for master objects
/// @throws css::uno::RuntimeException
- css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL _getPropertySetInfo( );
+ css::uno::Reference< css::beans::XPropertySetInfo > _getPropertySetInfo( );
/// @throws css::beans::UnknownPropertyException
/// @throws css::beans::PropertyVetoException
/// @throws css::lang::IllegalArgumentException
/// @throws css::lang::WrappedTargetException
/// @throws css::uno::RuntimeException
- void SAL_CALL _setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue );
+ void _setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue );
/// @throws css::beans::UnknownPropertyException
/// @throws css::lang::WrappedTargetException
/// @throws css::uno::RuntimeException
- css::uno::Any SAL_CALL _getPropertyValue( const OUString& PropertyName );
+ css::uno::Any _getPropertyValue( const OUString& PropertyName );
/// @throws css::beans::UnknownPropertyException
/// @throws css::uno::RuntimeException
- css::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName );
+ css::beans::PropertyState _getPropertyState( const OUString& PropertyName );
/// @throws css::beans::UnknownPropertyException
/// @throws css::uno::RuntimeException
- void SAL_CALL _setPropertyToDefault( const OUString& PropertyName );
+ void _setPropertyToDefault( const OUString& PropertyName );
/// @throws css::beans::UnknownPropertyException
/// @throws css::lang::WrappedTargetException
/// @throws css::uno::RuntimeException
- css::uno::Any SAL_CALL _getPropertyDefault( const OUString& aPropertyName );
+ css::uno::Any _getPropertyDefault( const OUString& aPropertyName );
/// @throws css::uno::RuntimeException
- css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames();
+ css::uno::Sequence< OUString > _getSupportedServiceNames();
/// @throws css::uno::RuntimeException
- css::uno::Sequence< css::uno::Type > SAL_CALL _getTypes( );
+ css::uno::Sequence< css::uno::Type > _getTypes( );
void setMaster( SvxShapeMaster* pMaster );