6 files changed, 21 insertions, 21 deletions
diff --git a/fpicker/source/aqua/FPentry.mm b/fpicker/source/aqua/FPentry.mm
index 012d219bdaf8..f56c7819fb86 100644
--- a/fpicker/source/aqua/FPentry.mm
+++ b/fpicker/source/aqua/FPentry.mm
@@ -33,12 +33,12 @@ using namespace ::com::sun::star::registry;
 using namespace ::cppu;
 
 
-static Reference< XInterface > SAL_CALL createFileInstance( const Reference< XMultiServiceFactory >&  )
+static Reference< XInterface > createFileInstance( const Reference< XMultiServiceFactory >&  )
 {
     return Reference< XInterface >( *new SalAquaFilePicker );
 }
 
-static Reference< XInterface > SAL_CALL createFolderInstance(
+static Reference< XInterface > createFolderInstance(
     const Reference< XMultiServiceFactory >& rServiceManager )
 {
     return Reference< XInterface >(
@@ -48,7 +48,7 @@ static Reference< XInterface > SAL_CALL createFolderInstance(
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_aqua_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* fps_aqua_component_getFactory(
     const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
 {
     void* pRet = nullptr;
diff --git a/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx
index 90c4604b01d2..fdd025ef4e5a 100644
--- a/fpicker/source/aqua/FilterHelper.hxx
+++ b/fpicker/source/aqua/FilterHelper.hxx
@@ -83,19 +83,19 @@ public:
     //XFilterManager delegates
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter );
+    void appendFilter( const OUString& aTitle, const OUString& aFilter );
 
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL setCurrentFilter( const OUString& aTitle );
+    void setCurrentFilter( const OUString& aTitle );
 
     /// @throws css::uno::RuntimeException
-    OUString SAL_CALL getCurrentFilter(  );
+    OUString getCurrentFilter(  );
 
     //XFilterGroupManager delegates
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters );
+    void appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters );
 
 
     //accessor
diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm
index 47eeaca0a7c5..63e578873292 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -281,14 +281,14 @@ void FilterHelper::setCurrentFilter( const ::rtl::OUString& aTitle )
     SetCurFilter(aTitle);
 }
 
-::rtl::OUString SAL_CALL FilterHelper::getCurrentFilter(  )
+::rtl::OUString FilterHelper::getCurrentFilter(  )
 {
     ::rtl::OUString sReturn = m_aCurrentFilter;
 
     return sReturn;
 }
 
-void SAL_CALL FilterHelper::appendFilterGroup( const ::rtl::OUString& /* sGroupTitle */, const css::uno::Sequence< css::beans::StringPair >& aFilters )
+void FilterHelper::appendFilterGroup( const ::rtl::OUString& /* sGroupTitle */, const css::uno::Sequence< css::beans::StringPair >& aFilters )
 {
     SolarMutexGuard aGuard;
 
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index 22d7a7d52428..93edde1a5b6f 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -111,7 +111,7 @@ public:
 
     using cppu::WeakComponentImplHelperBase::disposing;
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent );
+    virtual void disposing( const css::lang::EventObject& aEvent );
 
     // XServiceInfo
 
@@ -123,11 +123,11 @@ public:
 
     // FilePicker Event functions
 
-   void SAL_CALL fileSelectionChanged( css::ui::dialogs::FilePickerEvent aEvent );
-   void SAL_CALL directoryChanged( css::ui::dialogs::FilePickerEvent aEvent );
+   void fileSelectionChanged( css::ui::dialogs::FilePickerEvent aEvent );
+   void directoryChanged( css::ui::dialogs::FilePickerEvent aEvent );
    // OUString SAL_CALL helpRequested( css::ui::dialogs::FilePickerEvent aEvent ) const;
-   void SAL_CALL controlStateChanged( css::ui::dialogs::FilePickerEvent aEvent );
-   void SAL_CALL dialogSizeChanged( );
+   void controlStateChanged( css::ui::dialogs::FilePickerEvent aEvent );
+   void dialogSizeChanged( );
 
    AquaFilePickerDelegate * getDelegate() {
        return m_pDelegate;
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index af0b1712fc69..761198bdcbf0 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -62,7 +62,7 @@ using namespace ::com::sun::star::uno;
 
 namespace
 {
-    uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
+    uno::Sequence<rtl::OUString> FilePicker_getSupportedServiceNames()
     {
         uno::Sequence<rtl::OUString> aRet(3);
         aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
@@ -468,7 +468,7 @@ void SAL_CALL SalAquaFilePicker::cancel()
 
 #pragma mark XEventListener
 
-void SAL_CALL SalAquaFilePicker::disposing( const lang::EventObject& aEvent )
+void SalAquaFilePicker::disposing( const lang::EventObject& aEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -497,25 +497,25 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSupportedServiceName
 
 #pragma mark Misc/Private
 
-void SAL_CALL SalAquaFilePicker::fileSelectionChanged( FilePickerEvent aEvent )
+void SalAquaFilePicker::fileSelectionChanged( FilePickerEvent aEvent )
 {
     if (m_xListener.is())
         m_xListener->fileSelectionChanged( aEvent );
 }
 
-void SAL_CALL SalAquaFilePicker::directoryChanged( FilePickerEvent aEvent )
+void SalAquaFilePicker::directoryChanged( FilePickerEvent aEvent )
 {
     if (m_xListener.is())
         m_xListener->directoryChanged( aEvent );
 }
 
-void SAL_CALL SalAquaFilePicker::controlStateChanged( FilePickerEvent aEvent )
+void SalAquaFilePicker::controlStateChanged( FilePickerEvent aEvent )
 {
     if (m_xListener.is())
         m_xListener->controlStateChanged( aEvent );
 }
 
-void SAL_CALL SalAquaFilePicker::dialogSizeChanged()
+void SalAquaFilePicker::dialogSizeChanged()
 {
     if (m_xListener.is())
         m_xListener->dialogSizeChanged();
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index 8ab74dba6d00..51da7ede79b9 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -50,7 +50,7 @@ using namespace ::com::sun::star::uno;
 namespace
 {
     // controlling event notifications
-    uno::Sequence<rtl::OUString> SAL_CALL FolderPicker_getSupportedServiceNames()
+    uno::Sequence<rtl::OUString> FolderPicker_getSupportedServiceNames()
     {
         uno::Sequence<rtl::OUString> aRet(2);
         aRet[0] = "com.sun.star.ui.dialogs.SystemFolderPicker";