summaryrefslogtreecommitdiff
path: root/basic/source/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-12-05 10:11:39 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-12-06 07:42:50 +0100
commitc0ac78c97174fcde68daf174f6e8ade502c507d3 (patch)
tree800de448258b3fd82d78efdb53d4f5c8eed6cb26 /basic/source/inc
parentda85b582656219a0bc9d20cef59ae6b7ee1c4a9b (diff)
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>
Diffstat (limited to 'basic/source/inc')
-rw-r--r--basic/source/inc/dlgcont.hxx24
-rw-r--r--basic/source/inc/namecont.hxx24
-rw-r--r--basic/source/inc/scriptcont.hxx24
3 files changed, 36 insertions, 36 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;
};