loplugin:salcall handle virtual methods

Change-Id: Iab95db31188ea2914a46d63a7ebef3d825e6ec42
Reviewed-on: https://gerrit.libreoffice.org/45851
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 56 insertions, 56 deletions

diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx
index 2218b29d2665..93e917dd1cd2 100644
--- a/basic/source/inc/dlgcont.hxx
+++ b/basic/source/inc/dlgcont.hxx
@@ -35,36 +35,36 @@ namespace basic
 class SfxDialogLibraryContainer : public SfxLibraryContainer
 {
     // Methods to distinguish between different library types
-    virtual SfxLibrary* SAL_CALL implCreateLibrary( const OUString& aName ) override;
-    virtual SfxLibrary* SAL_CALL implCreateLibraryLink
+    virtual SfxLibrary* implCreateLibrary( const OUString& aName ) override;
+    virtual SfxLibrary* implCreateLibraryLink
         ( const OUString& aName, const OUString& aLibInfoFileURL,
           const OUString& StorageURL, bool ReadOnly ) override;
-    virtual css::uno::Any SAL_CALL createEmptyLibraryElement() override;
-    virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const override;
-    virtual void SAL_CALL writeLibraryElement
+    virtual css::uno::Any createEmptyLibraryElement() override;
+    virtual bool isLibraryElementValid(const css::uno::Any& rElement) const override;
+    virtual void writeLibraryElement
     (
         const css::uno::Reference< css::container::XNameContainer>& xLibrary,
         const OUString& aElementName,
         const css::uno::Reference< css::io::XOutputStream >& xOutput
     ) override;
 
-    virtual css::uno::Any SAL_CALL importLibraryElement
+    virtual css::uno::Any importLibraryElement
     (
         const css::uno::Reference< css::container::XNameContainer>& xLibrary,
         const OUString& aElementName,
         const OUString& aFile,
         const css::uno::Reference< css::io::XInputStream >& xElementStream ) override;
 
-    virtual void SAL_CALL importFromOldStorage( const OUString& aFile ) override;
+    virtual void importFromOldStorage( const OUString& aFile ) override;
 
     virtual SfxLibraryContainer* createInstanceImpl() override;
 
     virtual void onNewRootStorage() override;
 
-    virtual const sal_Char* SAL_CALL    getInfoFileName() const override;
-    virtual const sal_Char* SAL_CALL    getOldInfoFileName() const override;
-    virtual const sal_Char* SAL_CALL    getLibElementFileExtension() const override;
-    virtual const sal_Char* SAL_CALL    getLibrariesDir() const override;
+    virtual const sal_Char*    getInfoFileName() const override;
+    virtual const sal_Char*    getOldInfoFileName() const override;
+    virtual const sal_Char*    getLibElementFileExtension() const override;
+    virtual const sal_Char*    getLibrariesDir() const override;
 
 public:
     SfxDialogLibraryContainer();
@@ -142,7 +142,7 @@ public:
     static bool containsValidDialog( const css::uno::Any& aElement );
 
 protected:
-    virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const override;
+    virtual bool isLibraryElementValid(const css::uno::Any& rElement) const override;
 };
 
 }   // namespace basic
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index f1cca76f44d5..1b5d21ebbfd5 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -258,27 +258,27 @@ protected:
     void implImportLibDescriptor( SfxLibrary* pLib, ::xmlscript::LibDescriptor const & rLib );
 
     // Methods to distinguish between different library types
-    virtual SfxLibrary* SAL_CALL implCreateLibrary( const OUString& aName ) = 0;
-    virtual SfxLibrary* SAL_CALL implCreateLibraryLink
+    virtual SfxLibrary* implCreateLibrary( const OUString& aName ) = 0;
+    virtual SfxLibrary* implCreateLibraryLink
         ( const OUString& aName, const OUString& aLibInfoFileURL,
           const OUString& StorageURL, bool ReadOnly ) = 0;
-    virtual css::uno::Any SAL_CALL createEmptyLibraryElement() = 0;
-    virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const = 0;
+    virtual css::uno::Any createEmptyLibraryElement() = 0;
+    virtual bool isLibraryElementValid(const css::uno::Any& rElement) const = 0;
     /// @throws css::uno::Exception
-    virtual void SAL_CALL writeLibraryElement
+    virtual void writeLibraryElement
     (
         const css::uno::Reference< css::container::XNameContainer>& xLibrary,
         const OUString& aElementName,
         const css::uno::Reference< css::io::XOutputStream >& xOutput
     ) = 0;
 
-    virtual css::uno::Any SAL_CALL importLibraryElement
+    virtual css::uno::Any importLibraryElement
     (
         const css::uno::Reference< css::container::XNameContainer>& xLibrary,
         const OUString& aElementName,
         const OUString& aFile,
         const css::uno::Reference< css::io::XInputStream >& xElementStream ) = 0;
-    virtual void SAL_CALL importFromOldStorage( const OUString& aFile ) = 0;
+    virtual void importFromOldStorage( const OUString& aFile ) = 0;
 
     // Password encryption
     virtual bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName,
@@ -310,10 +310,10 @@ protected:
     void init( const OUString& rInitialDocumentURL,
                const css::uno::Reference< css::embed::XStorage >& _rxInitialStorage );
 
-    virtual const sal_Char* SAL_CALL    getInfoFileName() const = 0;
-    virtual const sal_Char* SAL_CALL    getOldInfoFileName() const = 0;
-    virtual const sal_Char* SAL_CALL    getLibElementFileExtension() const = 0;
-    virtual const sal_Char* SAL_CALL    getLibrariesDir() const = 0;
+    virtual const sal_Char*    getInfoFileName() const = 0;
+    virtual const sal_Char*    getOldInfoFileName() const = 0;
+    virtual const sal_Char*    getLibElementFileExtension() const = 0;
+    virtual const sal_Char*    getLibrariesDir() const = 0;
 
     // Handle maLibInfoFileURL and maStorageURL correctly
     void checkStorageURL
@@ -587,7 +587,7 @@ public:
 protected:
     virtual bool isLoadedStorable();
 
-    virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const = 0;
+    virtual bool isLibraryElementValid(const css::uno::Any& rElement) const = 0;
 };
 
 
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 33086a006e09..61bd3f2519d3 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -35,27 +35,27 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas
     css::uno::Reference< css::container::XNameAccess > mxCodeNameAccess;
 
     // Methods to distinguish between different library types
-    virtual SfxLibrary* SAL_CALL implCreateLibrary( const OUString& aName ) override;
-    virtual SfxLibrary* SAL_CALL implCreateLibraryLink
+    virtual SfxLibrary* implCreateLibrary( const OUString& aName ) override;
+    virtual SfxLibrary* implCreateLibraryLink
         ( const OUString& aName, const OUString& aLibInfoFileURL,
           const OUString& StorageURL, bool ReadOnly ) override;
-    virtual css::uno::Any SAL_CALL createEmptyLibraryElement() override;
-    virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const override;
-    virtual void SAL_CALL writeLibraryElement
+    virtual css::uno::Any createEmptyLibraryElement() override;
+    virtual bool isLibraryElementValid(const css::uno::Any& rElement) const override;
+    virtual void writeLibraryElement
     (
         const css::uno::Reference< css::container::XNameContainer>& xLibrary,
         const OUString& aElementName,
         const css::uno::Reference< css::io::XOutputStream >& xOutput
     ) override;
 
-    virtual css::uno::Any SAL_CALL importLibraryElement
+    virtual css::uno::Any importLibraryElement
     (
         const css::uno::Reference< css::container::XNameContainer>& xLibrary,
         const OUString& aElementName,
         const OUString& aFile,
         const css::uno::Reference< css::io::XInputStream >& xElementStream ) override;
 
-    virtual void SAL_CALL importFromOldStorage( const OUString& aFile ) override;
+    virtual void importFromOldStorage( const OUString& aFile ) override;
 
     virtual SfxLibraryContainer* createInstanceImpl() override;
 
@@ -79,10 +79,10 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas
     // OldBasicPassword interface
     virtual void setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword ) override;
 
-    virtual const sal_Char* SAL_CALL    getInfoFileName() const override;
-    virtual const sal_Char* SAL_CALL    getOldInfoFileName() const override;
-    virtual const sal_Char* SAL_CALL    getLibElementFileExtension() const override;
-    virtual const sal_Char* SAL_CALL    getLibrariesDir() const override;
+    virtual const sal_Char*    getInfoFileName() const override;
+    virtual const sal_Char*    getOldInfoFileName() const override;
+    virtual const sal_Char*    getLibElementFileExtension() const override;
+    virtual const sal_Char*    getLibrariesDir() const override;
 
 public:
     SfxScriptLibraryContainer();
@@ -152,7 +152,7 @@ public:
     static bool containsValidModule( const css::uno::Any& _rElement );
 
 protected:
-    virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const override;
+    virtual bool isLibraryElementValid(const css::uno::Any& rElement) const override;
 };
 
 
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index df2fb962a2aa..affeb0bcf4be 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -63,10 +63,10 @@ using com::sun::star::uno::Reference;
 
 // Implementation class SfxDialogLibraryContainer
 
-const sal_Char* SAL_CALL SfxDialogLibraryContainer::getInfoFileName() const { return "dialog"; }
-const sal_Char* SAL_CALL SfxDialogLibraryContainer::getOldInfoFileName() const { return "dialogs"; }
-const sal_Char* SAL_CALL SfxDialogLibraryContainer::getLibElementFileExtension() const { return "xdl"; }
-const sal_Char* SAL_CALL SfxDialogLibraryContainer::getLibrariesDir() const { return "Dialogs"; }
+const sal_Char* SfxDialogLibraryContainer::getInfoFileName() const { return "dialog"; }
+const sal_Char* SfxDialogLibraryContainer::getOldInfoFileName() const { return "dialogs"; }
+const sal_Char* SfxDialogLibraryContainer::getLibElementFileExtension() const { return "xdl"; }
+const sal_Char* SfxDialogLibraryContainer::getLibrariesDir() const { return "Dialogs"; }
 
 // Ctor for service
 SfxDialogLibraryContainer::SfxDialogLibraryContainer()
@@ -96,7 +96,7 @@ SfxLibrary* SfxDialogLibraryContainer::implCreateLibraryLink
     return pRet;
 }
 
-Any SAL_CALL SfxDialogLibraryContainer::createEmptyLibraryElement()
+Any SfxDialogLibraryContainer::createEmptyLibraryElement()
 {
     Reference< XInputStreamProvider > xISP;
     Any aRetAny;
@@ -104,7 +104,7 @@ Any SAL_CALL SfxDialogLibraryContainer::createEmptyLibraryElement()
     return aRetAny;
 }
 
-bool SAL_CALL SfxDialogLibraryContainer::isLibraryElementValid(const Any& rElement) const
+bool SfxDialogLibraryContainer::isLibraryElementValid(const Any& rElement) const
 {
     return SfxDialogLibrary::containsValidDialog(rElement);
 }
@@ -144,7 +144,7 @@ bool writeOasis2OOoLibraryElement(
     return true;
 }
 
-void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
+void SfxDialogLibraryContainer::writeLibraryElement
 (
     const Reference < XNameContainer >& xLib,
     const OUString& aElementName,
@@ -258,7 +258,7 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e
 }
 
 
-Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
+Any SfxDialogLibraryContainer::importLibraryElement
     ( const Reference < XNameContainer >& /*xLib*/,
       const OUString& /*aElementName */, const OUString& aFile,
       const uno::Reference< io::XInputStream >& xElementStream )
@@ -332,7 +332,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
     return aRetAny;
 }
 
-void SAL_CALL SfxDialogLibraryContainer::importFromOldStorage( const OUString& )
+void SfxDialogLibraryContainer::importFromOldStorage( const OUString& )
 {
     // Nothing to do here, old dialogs cannot be imported
 }
@@ -567,7 +567,7 @@ bool SfxDialogLibrary::containsValidDialog( const css::uno::Any& aElement )
     return xISP.is();
 }
 
-bool SAL_CALL SfxDialogLibrary::isLibraryElementValid(const css::uno::Any& rElement) const
+bool SfxDialogLibrary::isLibraryElementValid(const css::uno::Any& rElement) const
 {
     return SfxDialogLibrary::containsValidDialog(rElement);
 }
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index e31455eed8cb..72126748d713 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -76,10 +76,10 @@ using namespace osl;
 
 // Implementation class SfxScriptLibraryContainer
 
-const sal_Char* SAL_CALL SfxScriptLibraryContainer::getInfoFileName() const { return "script"; }
-const sal_Char* SAL_CALL SfxScriptLibraryContainer::getOldInfoFileName() const { return "script"; }
-const sal_Char* SAL_CALL SfxScriptLibraryContainer::getLibElementFileExtension() const { return "xba"; }
-const sal_Char* SAL_CALL SfxScriptLibraryContainer::getLibrariesDir() const { return "Basic"; }
+const sal_Char* SfxScriptLibraryContainer::getInfoFileName() const { return "script"; }
+const sal_Char* SfxScriptLibraryContainer::getOldInfoFileName() const { return "script"; }
+const sal_Char* SfxScriptLibraryContainer::getLibElementFileExtension() const { return "xba"; }
+const sal_Char* SfxScriptLibraryContainer::getLibrariesDir() const { return "Basic"; }
 
 // OldBasicPassword interface
 void SfxScriptLibraryContainer::setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword )
@@ -133,19 +133,19 @@ SfxLibrary* SfxScriptLibraryContainer::implCreateLibraryLink( const OUString&,
     return pRet;
 }
 
-Any SAL_CALL SfxScriptLibraryContainer::createEmptyLibraryElement()
+Any SfxScriptLibraryContainer::createEmptyLibraryElement()
 {
     Any aRetAny;
     aRetAny <<= OUString();
     return aRetAny;
 }
 
-bool SAL_CALL SfxScriptLibraryContainer::isLibraryElementValid(const Any& rElement) const
+bool SfxScriptLibraryContainer::isLibraryElementValid(const Any& rElement) const
 {
     return SfxScriptLibrary::containsValidModule(rElement);
 }
 
-void SAL_CALL SfxScriptLibraryContainer::writeLibraryElement( const Reference < XNameContainer >& xLib,
+void SfxScriptLibraryContainer::writeLibraryElement( const Reference < XNameContainer >& xLib,
                                                               const OUString& aElementName,
                                                               const Reference< XOutputStream >& xOutput)
 {
@@ -194,7 +194,7 @@ void SAL_CALL SfxScriptLibraryContainer::writeLibraryElement( const Reference <
 }
 
 
-Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
+Any SfxScriptLibraryContainer::importLibraryElement
     ( const Reference < XNameContainer >& xLib,
       const OUString& aElementName, const OUString& aFile,
       const uno::Reference< io::XInputStream >& xInStream )
@@ -330,7 +330,7 @@ SfxLibraryContainer* SfxScriptLibraryContainer::createInstanceImpl()
     return new SfxScriptLibraryContainer();
 }
 
-void SAL_CALL SfxScriptLibraryContainer::importFromOldStorage( const OUString& aFile )
+void SfxScriptLibraryContainer::importFromOldStorage( const OUString& aFile )
 {
     // TODO: move loading from old storage to binary filters?
     auto xStorage = tools::make_ref<SotStorage>( false, aFile );
@@ -1189,7 +1189,7 @@ bool SfxScriptLibrary::containsValidModule(const Any& rElement)
     return ( !sModuleText.isEmpty() );
 }
 
-bool SAL_CALL SfxScriptLibrary::isLibraryElementValid(const css::uno::Any& rElement) const
+bool SfxScriptLibrary::isLibraryElementValid(const css::uno::Any& rElement) const
 {
     return SfxScriptLibrary::containsValidModule(rElement);
 }