loplugin:salcall (clang-cl)

Change-Id: I31018af8d992c9496f01a72925e24d9b362e340d
Reviewed-on: https://gerrit.libreoffice.org/46204
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

13 files changed, 79 insertions, 79 deletions

diff --git a/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx
index a1afc6c581eb..07b9a9cea3ef 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.cxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.cxx
@@ -45,7 +45,7 @@ CFilterContainer::CFilterContainer( sal_Int32 initSize ) :
 
 // add a name/filter pair
 
-bool SAL_CALL CFilterContainer::addFilter(
+bool CFilterContainer::addFilter(
     const OUString& aName, const OUString& aFilter, bool bAllowDuplicates )
 {
     // check if the filter is already in the container
@@ -73,7 +73,7 @@ bool SAL_CALL CFilterContainer::addFilter(
 // Precondition: the container is not empty
 //               there is a filter identified by the given name
 
-bool SAL_CALL CFilterContainer::delFilter( const OUString& aName )
+bool CFilterContainer::delFilter( const OUString& aName )
 {
     OSL_ASSERT( !m_vFilters.empty() );
 
@@ -89,14 +89,14 @@ bool SAL_CALL CFilterContainer::delFilter( const OUString& aName )
 
 // return the number of filters currently in the container
 
-sal_Int32 SAL_CALL CFilterContainer::numFilter( )
+sal_Int32 CFilterContainer::numFilter( )
 {
     return m_vFilters.size( );
 }
 
 // clear all entries
 
-void SAL_CALL CFilterContainer::empty()
+void CFilterContainer::empty()
 {
     m_vFilters.clear( );
 }
@@ -105,7 +105,7 @@ void SAL_CALL CFilterContainer::empty()
 // Precondition: the container is not empty
 //               there is a filter identified by the name
 
-bool SAL_CALL CFilterContainer::getFilter( const OUString& aName, OUString& theFilter ) const
+bool CFilterContainer::getFilter( const OUString& aName, OUString& theFilter ) const
 {
     OSL_PRECOND( !m_vFilters.empty() , "Empty filter container" );
 
@@ -125,7 +125,7 @@ bool SAL_CALL CFilterContainer::getFilter( const OUString& aName, OUString& theF
     return pos > -1;
 }
 
-bool SAL_CALL CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFilter ) const
+bool CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFilter ) const
 {
     bool bRet = true;
 
@@ -142,14 +142,14 @@ bool SAL_CALL CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFilter
     return bRet;
 }
 
-sal_Int32 SAL_CALL CFilterContainer::getFilterPos( const OUString& aName ) const
+sal_Int32 CFilterContainer::getFilterPos( const OUString& aName ) const
 {
     return getFilterTagPos( aName );
 }
 
 // returns the index of the filter identified by name
 
-sal_Int32 SAL_CALL CFilterContainer::getFilterTagPos( const OUString& aName ) const
+sal_Int32 CFilterContainer::getFilterTagPos( const OUString& aName ) const
 {
     if ( !m_vFilters.empty() )
     {
@@ -167,7 +167,7 @@ sal_Int32 SAL_CALL CFilterContainer::getFilterTagPos( const OUString& aName ) co
 
 // starts enumerating the filter in the container
 
-void SAL_CALL CFilterContainer::beginEnumFilter( )
+void CFilterContainer::beginEnumFilter( )
 {
     m_iter = m_vFilters.begin( );
     m_bIterInitialized = true;
@@ -175,7 +175,7 @@ void SAL_CALL CFilterContainer::beginEnumFilter( )
 
 // returns true if another filter has been retrieved
 
-bool SAL_CALL CFilterContainer::getNextFilter( FILTER_ENTRY_T& nextFilterEntry )
+bool CFilterContainer::getNextFilter( FILTER_ENTRY_T& nextFilterEntry )
 {
     OSL_ASSERT( m_bIterInitialized );
 
@@ -189,12 +189,12 @@ bool SAL_CALL CFilterContainer::getNextFilter( FILTER_ENTRY_T& nextFilterEntry )
     return bRet;
 }
 
-void SAL_CALL CFilterContainer::setCurrentFilter( const OUString& aName )
+void CFilterContainer::setCurrentFilter( const OUString& aName )
 {
     m_sCurrentFilter = aName;
 }
 
-OUString SAL_CALL CFilterContainer::getCurrentFilter() const
+OUString CFilterContainer::getCurrentFilter() const
 {
     return m_sCurrentFilter;
 }
diff --git a/fpicker/source/win32/filepicker/FilterContainer.hxx b/fpicker/source/win32/filepicker/FilterContainer.hxx
index 18edcf5df25e..450072fecf88 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.hxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.hxx
@@ -43,42 +43,42 @@ public:
     // returns true if the filter was successfully added
     // returns false if duplicates are not allowed and
     // the filter is already in the container
-    bool SAL_CALL addFilter(
+    bool addFilter(
         const OUString& aName,
         const OUString& aFilter,
         bool bAllowDuplicates = false );
 
     // delete the specified filter returns true on
     // success and false if the filter was not found
-    bool SAL_CALL delFilter( const OUString& aName );
+    bool delFilter( const OUString& aName );
 
     // the number of filter already added
-    sal_Int32 SAL_CALL numFilter( );
+    sal_Int32 numFilter( );
 
     // clear all entries
-    void SAL_CALL empty( );
+    void empty( );
 
     // retrieve a filter from the container both methods
     // return true on success and false if the specified
     // filter was not found
-    bool SAL_CALL getFilter( const OUString& aName, OUString& theFilter ) const;
-    bool SAL_CALL getFilter( sal_Int32 aIndex, OUString& theFilter ) const;
+    bool getFilter( const OUString& aName, OUString& theFilter ) const;
+    bool getFilter( sal_Int32 aIndex, OUString& theFilter ) const;
 
     // returns the position of the specified filter or -1
     // if the filter was not found
-    sal_Int32 SAL_CALL getFilterPos( const OUString& aName ) const;
+    sal_Int32 getFilterPos( const OUString& aName ) const;
 
     // starts enumerating the filter in the container
-    void SAL_CALL beginEnumFilter( );
+    void beginEnumFilter( );
 
     // returns true if another filter has been retrieved
-    bool SAL_CALL getNextFilter( FILTER_ENTRY_T& nextFilterEntry );
+    bool getNextFilter( FILTER_ENTRY_T& nextFilterEntry );
 
     // cache current filter
-    void SAL_CALL setCurrentFilter( const OUString& aName );
+    void setCurrentFilter( const OUString& aName );
 
     // returns cached current filter
-    OUString SAL_CALL getCurrentFilter() const;
+    OUString getCurrentFilter() const;
 
 protected:
     typedef std::vector< FILTER_ENTRY_T > FILTER_VECTOR_T;
@@ -88,7 +88,7 @@ private:
     CFilterContainer( const CFilterContainer& );
     CFilterContainer& SAL_CALL operator=( const CFilterContainer& );
 
-    sal_Int32 SAL_CALL getFilterTagPos( const OUString& aName ) const;
+    sal_Int32 getFilterTagPos( const OUString& aName ) const;
 
 private:
     FILTER_VECTOR_T                 m_vFilters;
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 54ff672579ff..15aa1474ff5d 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -95,7 +95,7 @@ void SAL_CALL VistaFilePicker::removeFilePickerListener(const css::uno::Referenc
     m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
 }
 
-void SAL_CALL VistaFilePicker::disposing(const css::lang::EventObject& /*aEvent*/)
+void VistaFilePicker::disposing(const css::lang::EventObject& /*aEvent*/)
 {
 }
 
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index 65e67c2c3041..8f36f5438698 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -175,7 +175,7 @@ public:
     // XEventListener
 
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent );
+    virtual void disposing( const css::lang::EventObject& aEvent );
 
 
     // XServiceInfo
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 4817ff129170..ea7b2cd1ba86 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -201,13 +201,13 @@ STDMETHODIMP VistaFilePickerEventHandler::OnControlActivating(IFileDialogCustomi
 }
 
 
-void SAL_CALL VistaFilePickerEventHandler::addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
+void VistaFilePickerEventHandler::addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
 {
     m_lListener.addInterface(cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get(), xListener);
 }
 
 
-void SAL_CALL VistaFilePickerEventHandler::removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
+void VistaFilePickerEventHandler::removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
 {
     m_lListener.removeInterface(cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get(), xListener);
 }
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index 6a8a783dce7d..0a1f9647a7cc 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -113,10 +113,10 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex
         // XFilePickerNotifier
 
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener );
+        virtual void addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener );
 
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener );
+        virtual void removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener );
 
 
         // native interface
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index 22b484034f6c..c3b7b391f89a 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -127,7 +127,7 @@ void SAL_CALL CFolderPicker::cancel( )
 // overwrite base class method, which is called
 // by base class dispose function
 
-void SAL_CALL CFolderPicker::disposing()
+void CFolderPicker::disposing()
 {
 }
 
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index 2f25cc4a4ecf..346a6bfccd98 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
@@ -86,7 +86,7 @@ public:
     // by base class dispose function
 
 
-    virtual void SAL_CALL disposing();
+    virtual void disposing();
 
 private:
     css::uno::Reference< css::lang::XMultiServiceFactory >  m_xServiceMgr;
diff --git a/fpicker/source/win32/folderpicker/FopEvtDisp.hxx b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
index ffb35b7d8a37..d070e8208d26 100644
--- a/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
+++ b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
@@ -28,7 +28,7 @@ class CFOPEventDispatcher
 public:
 
     // dispatches a FilePickerEvent to wherever
-    virtual void SAL_CALL helpRequested( css::lang::EventObject aEvent ) const = 0;
+    virtual void helpRequested( css::lang::EventObject aEvent ) const = 0;
 
 protected:
     ~CFOPEventDispatcher() {}
diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx
index 497d1ebba835..f0cf32b8d0c9 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -302,37 +302,37 @@ bool CMtaFolderPicker::browseForFolder( )
 }
 
 
-void SAL_CALL CMtaFolderPicker::setDisplayDirectory( const OUString& aDirectory )
+void CMtaFolderPicker::setDisplayDirectory( const OUString& aDirectory )
 {
     m_displayDir = aDirectory;
 }
 
 
-OUString SAL_CALL CMtaFolderPicker::getDisplayDirectory( )
+OUString CMtaFolderPicker::getDisplayDirectory( )
 {
     return m_displayDir;
 }
 
 
-OUString SAL_CALL CMtaFolderPicker::getDirectory( )
+OUString CMtaFolderPicker::getDirectory( )
 {
     return m_SelectedDir;
 }
 
 
-void SAL_CALL CMtaFolderPicker::setDescription( const OUString& aDescription )
+void CMtaFolderPicker::setDescription( const OUString& aDescription )
 {
     m_Description = aDescription;
 }
 
 
-void SAL_CALL CMtaFolderPicker::setTitle( const OUString& aTitle )
+void CMtaFolderPicker::setTitle( const OUString& aTitle )
 {
     m_dialogTitle = aTitle;
 }
 
 
-OUString SAL_CALL CMtaFolderPicker::getTitle( )
+OUString CMtaFolderPicker::getTitle( )
 {
     return m_dialogTitle;
 }
@@ -341,7 +341,7 @@ OUString SAL_CALL CMtaFolderPicker::getTitle( )
 // XCancellable
 
 
-void SAL_CALL CMtaFolderPicker::cancel( )
+void CMtaFolderPicker::cancel( )
 {
     if ( IsWindow( m_hwnd ) )
     {
@@ -357,7 +357,7 @@ void SAL_CALL CMtaFolderPicker::cancel( )
 }
 
 
-bool SAL_CALL CMtaFolderPicker::onBrowseForFolder( )
+bool CMtaFolderPicker::onBrowseForFolder( )
 {
     bool bRet;
     LPITEMIDLIST lpiid;
@@ -382,7 +382,7 @@ bool SAL_CALL CMtaFolderPicker::onBrowseForFolder( )
 }
 
 
-void SAL_CALL CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList )
+void CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList )
 {
     sal::systools::COMReference<IMalloc> pIMalloc;
     SHGetMalloc(&pIMalloc);
@@ -394,7 +394,7 @@ void SAL_CALL CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList )
 }
 
 
-LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const OUString& aDirectory )
+LPITEMIDLIST CMtaFolderPicker::getItemIdListFromPath( const OUString& aDirectory )
 {
     // parameter checking
     if ( !aDirectory.getLength( ) )
@@ -420,7 +420,7 @@ LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const OUString& a
 }
 
 
-OUString SAL_CALL CMtaFolderPicker::getPathFromItemIdList( LPCITEMIDLIST lpItemIdList )
+OUString CMtaFolderPicker::getPathFromItemIdList( LPCITEMIDLIST lpItemIdList )
 {
     OUString path;
 
@@ -435,7 +435,7 @@ OUString SAL_CALL CMtaFolderPicker::getPathFromItemIdList( LPCITEMIDLIST lpItemI
 }
 
 
-void SAL_CALL CMtaFolderPicker::enableOk( bool bEnable )
+void CMtaFolderPicker::enableOk( bool bEnable )
 {
     OSL_ASSERT( IsWindow( m_hwnd ) );
 
@@ -447,7 +447,7 @@ void SAL_CALL CMtaFolderPicker::enableOk( bool bEnable )
 }
 
 
-void SAL_CALL CMtaFolderPicker::setSelection( const OUString& aDirectory )
+void CMtaFolderPicker::setSelection( const OUString& aDirectory )
 {
     OSL_ASSERT( IsWindow( m_hwnd ) );
 
@@ -459,7 +459,7 @@ void SAL_CALL CMtaFolderPicker::setSelection( const OUString& aDirectory )
 }
 
 
-void SAL_CALL CMtaFolderPicker::setStatusText( const OUString& aStatusText )
+void CMtaFolderPicker::setStatusText( const OUString& aStatusText )
 {
     OSL_ASSERT( IsWindow( m_hwnd ) );
 
@@ -471,7 +471,7 @@ void SAL_CALL CMtaFolderPicker::setStatusText( const OUString& aStatusText )
 }
 
 
-void SAL_CALL CMtaFolderPicker::onInitialized( )
+void CMtaFolderPicker::onInitialized( )
 {
     LPITEMIDLIST lpiidDisplayDir = getItemIdListFromPath( m_displayDir );
 
@@ -603,7 +603,7 @@ LRESULT CALLBACK CMtaFolderPicker::StaWndProc( HWND hWnd, UINT uMsg, WPARAM wPar
 }
 
 
-bool SAL_CALL CMtaFolderPicker::createStaRequestWindow( )
+bool CMtaFolderPicker::createStaRequestWindow( )
 {
     bool bIsWnd = false;
 
@@ -692,7 +692,7 @@ unsigned int WINAPI CMtaFolderPicker::StaThreadProc( LPVOID pParam )
 }
 
 
-ATOM SAL_CALL CMtaFolderPicker::RegisterStaRequestWindowClass( )
+ATOM CMtaFolderPicker::RegisterStaRequestWindowClass( )
 {
     osl::MutexGuard aGuard( s_Mutex );
 
@@ -729,7 +729,7 @@ ATOM SAL_CALL CMtaFolderPicker::RegisterStaRequestWindowClass( )
 }
 
 
-void SAL_CALL CMtaFolderPicker::UnregisterStaRequestWindowClass( )
+void CMtaFolderPicker::UnregisterStaRequestWindowClass( )
 {
     osl::MutexGuard aGuard( s_Mutex );
 
diff --git a/fpicker/source/win32/folderpicker/MtaFop.hxx b/fpicker/source/win32/folderpicker/MtaFop.hxx
index 06529bab7add..805c137bcb2b 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.hxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.hxx
@@ -55,51 +55,51 @@ public:
     virtual ~CMtaFolderPicker( );
 
     // shell functions
-    bool SAL_CALL browseForFolder( );
+    bool browseForFolder( );
 
-    virtual void  SAL_CALL setDisplayDirectory( const OUString& aDirectory );
-    virtual OUString  SAL_CALL getDisplayDirectory( );
-    virtual OUString SAL_CALL getDirectory( );
+    virtual void setDisplayDirectory( const OUString& aDirectory );
+    virtual OUString getDisplayDirectory( );
+    virtual OUString getDirectory( );
 
-    virtual void SAL_CALL setDescription( const OUString& aDescription );
+    virtual void setDescription( const OUString& aDescription );
 
-    virtual void SAL_CALL setTitle( const OUString& aTitle );
-    OUString  SAL_CALL getTitle( );
+    virtual void setTitle( const OUString& aTitle );
+    OUString getTitle( );
 
 
     // XCancellable
 
 
-    virtual void SAL_CALL cancel( );
+    virtual void cancel( );
 
 protected:
-    void SAL_CALL enableOk( bool bEnable );
-    void SAL_CALL setSelection( const OUString& aDirectory );
-    void SAL_CALL setStatusText( const OUString& aStatusText );
+    void enableOk( bool bEnable );
+    void setSelection( const OUString& aDirectory );
+    void setStatusText( const OUString& aStatusText );
 
-    virtual void SAL_CALL onInitialized( );
-    virtual void SAL_CALL onSelChanged( const OUString& aNewPath ) = 0;
+    virtual void onInitialized( );
+    virtual void onSelChanged( const OUString& aNewPath ) = 0;
 
 private:
     static sal_uInt32 onValidateFailed();
 
     // helper functions
-    static LPITEMIDLIST  SAL_CALL getItemIdListFromPath( const OUString& aDirectory );
-    OUString SAL_CALL getPathFromItemIdList( LPCITEMIDLIST lpItemIdList );
-    static void SAL_CALL releaseItemIdList( LPITEMIDLIST lpItemIdList );
+    static LPITEMIDLIST getItemIdListFromPath( const OUString& aDirectory );
+    OUString getPathFromItemIdList( LPCITEMIDLIST lpItemIdList );
+    static void releaseItemIdList( LPITEMIDLIST lpItemIdList );
 
     unsigned int run( );
 
     // create a hidden windows which serves as an request
     // target; so we guarantee synchronization
-    bool SAL_CALL createStaRequestWindow( );
+    bool createStaRequestWindow( );
 
 
     // message handler functions; remember these functions are called
     // from a different thread context!
 
 
-    bool SAL_CALL onBrowseForFolder( );
+    bool onBrowseForFolder( );
 
     static LRESULT CALLBACK StaWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
     static unsigned int WINAPI StaThreadProc( LPVOID pParam );
@@ -110,8 +110,8 @@ protected:
     HWND m_hwnd;
 
 private:
-    ATOM SAL_CALL RegisterStaRequestWindowClass( );
-    void SAL_CALL UnregisterStaRequestWindowClass( );
+    ATOM RegisterStaRequestWindowClass( );
+    void UnregisterStaRequestWindowClass( );
 
 private:
     HANDLE                      m_hStaThread;
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
index 018922d81c21..c649302ba6b1 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
@@ -46,7 +46,7 @@ CWinFolderPickerImpl::CWinFolderPickerImpl( CFolderPicker* aFolderPicker ) :
 // If the specified path is well formed but invalid for the underlying
 // OS the FolderPicker starts in the root of the file system hierarchy
 
-void SAL_CALL CWinFolderPickerImpl::setDisplayDirectory( const OUString& aDirectory )
+void CWinFolderPickerImpl::setDisplayDirectory( const OUString& aDirectory )
 {
     OUString sysDir;
 
@@ -91,7 +91,7 @@ OUString CWinFolderPickerImpl::getDisplayDirectory( )
     return displayDirectoryURL;
 }
 
-OUString SAL_CALL CWinFolderPickerImpl::getDirectory( )
+OUString CWinFolderPickerImpl::getDirectory( )
 {
     OUString sysDir = CMtaFolderPicker::getDirectory( );
     OUString dirURL;
@@ -102,7 +102,7 @@ OUString SAL_CALL CWinFolderPickerImpl::getDirectory( )
     return dirURL;
 }
 
-sal_Int16 SAL_CALL CWinFolderPickerImpl::execute( )
+sal_Int16 CWinFolderPickerImpl::execute( )
 {
     return m_nLastDlgResult = CMtaFolderPicker::browseForFolder( ) ?
         css::ui::dialogs::ExecutableDialogResults::OK :
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
index ffed7e969342..98f52dac2f31 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
@@ -39,20 +39,20 @@ public:
     // XExecutableDialog
 
     /// @throws css::uno::RuntimeException
-    virtual sal_Int16 SAL_CALL execute(  );
+    virtual sal_Int16 execute(  );
 
 
     // XFolderPicker
 
 
-    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override;
+    virtual void setDisplayDirectory( const OUString& aDirectory ) override;
 
-    virtual OUString SAL_CALL getDisplayDirectory( ) override;
+    virtual OUString getDisplayDirectory( ) override;
 
-    virtual OUString SAL_CALL getDirectory( ) override;
+    virtual OUString getDirectory( ) override;
 
 protected:
-    virtual void SAL_CALL onSelChanged( const OUString& aNewPath ) override;
+    virtual void onSelChanged( const OUString& aNewPath ) override;
 
 private:
     CFolderPicker*  m_pFolderPicker;