[Libreoffice-commits] core.git: basic/source compilerplugins/clang connectivity/source dbaccess/source editeng/source extensions/source fpicker/source i18npool/inc i18npool/source include/connectivity include/sfx2 sc/inc sc/source sd/source sfx2/source ucb/source vbahelper/source xmlsecurity/inc xmlsecurity/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Dec 6 06:44:16 UTC 2017
basic/source/inc/dlgcont.hxx | 24 ++---
basic/source/inc/namecont.hxx | 24 ++---
basic/source/inc/scriptcont.hxx | 24 ++---
basic/source/uno/dlgcont.cxx | 20 ++--
basic/source/uno/scriptcont.cxx | 20 ++--
compilerplugins/clang/salcall.cxx | 40 ++++++++-
connectivity/source/drivers/evoab2/NTables.hxx | 2
connectivity/source/drivers/mork/MTables.hxx | 2
connectivity/source/inc/hsqldb/HTables.hxx | 2
connectivity/source/inc/hsqldb/HViews.hxx | 2
connectivity/source/inc/mysql/YTables.hxx | 2
connectivity/source/inc/mysql/YViews.hxx | 2
dbaccess/source/core/api/BookmarkSet.cxx | 16 +--
dbaccess/source/core/api/BookmarkSet.hxx | 16 +--
dbaccess/source/core/api/CIndexes.cxx | 2
dbaccess/source/core/api/CIndexes.hxx | 2
dbaccess/source/core/api/CRowSetDataColumn.cxx | 2
dbaccess/source/core/api/CRowSetDataColumn.hxx | 2
dbaccess/source/core/api/CacheSet.cxx | 34 +++----
dbaccess/source/core/api/CacheSet.hxx | 44 +++++-----
dbaccess/source/core/api/HelperCollections.cxx | 2
dbaccess/source/core/api/HelperCollections.hxx | 4
dbaccess/source/core/api/KeySet.cxx | 44 +++++-----
dbaccess/source/core/api/KeySet.hxx | 44 +++++-----
dbaccess/source/core/api/OptimisticSet.cxx | 6 -
dbaccess/source/core/api/OptimisticSet.hxx | 6 -
dbaccess/source/core/api/StaticSet.cxx | 42 ++++-----
dbaccess/source/core/api/StaticSet.hxx | 42 ++++-----
dbaccess/source/core/api/WrappedResultSet.cxx | 16 +--
dbaccess/source/core/api/WrappedResultSet.hxx | 16 +--
dbaccess/source/core/api/column.cxx | 2
dbaccess/source/core/api/tablecontainer.cxx | 2
dbaccess/source/core/dataaccess/documentcontainer.cxx | 4
dbaccess/source/core/inc/FilteredContainer.hxx | 2
dbaccess/source/core/inc/column.hxx | 2
dbaccess/source/core/inc/containerapprove.hxx | 2
dbaccess/source/core/inc/objectnameapproval.hxx | 2
dbaccess/source/core/inc/tablecontainer.hxx | 2
dbaccess/source/core/misc/objectnameapproval.cxx | 2
editeng/source/accessibility/AccessibleComponentBase.cxx | 2
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 6 -
extensions/source/propctrlr/buttonnavigationhandler.cxx | 2
extensions/source/propctrlr/buttonnavigationhandler.hxx | 2
extensions/source/propctrlr/cellbindinghandler.cxx | 2
extensions/source/propctrlr/cellbindinghandler.hxx | 2
extensions/source/propctrlr/composeduiupdate.hxx | 2
extensions/source/propctrlr/editpropertyhandler.cxx | 2
extensions/source/propctrlr/editpropertyhandler.hxx | 2
extensions/source/propctrlr/eformspropertyhandler.cxx | 2
extensions/source/propctrlr/eformspropertyhandler.hxx | 2
extensions/source/propctrlr/enumrepresentation.hxx | 6 -
extensions/source/propctrlr/formcomponenthandler.cxx | 2
extensions/source/propctrlr/formcomponenthandler.hxx | 2
extensions/source/propctrlr/formgeometryhandler.cxx | 4
extensions/source/propctrlr/formmetadata.cxx | 6 -
extensions/source/propctrlr/formmetadata.hxx | 6 -
extensions/source/propctrlr/genericpropertyhandler.cxx | 6 -
extensions/source/propctrlr/propcontroller.cxx | 2
extensions/source/propctrlr/propcontroller.hxx | 2
extensions/source/propctrlr/propertycomposer.cxx | 2
extensions/source/propctrlr/propertycomposer.hxx | 2
extensions/source/propctrlr/propertyhandler.hxx | 2
extensions/source/propctrlr/submissionhandler.cxx | 2
extensions/source/propctrlr/submissionhandler.hxx | 2
extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx | 2
fpicker/source/office/commonpicker.cxx | 2
i18npool/inc/breakiterator_ctl.hxx | 2
i18npool/inc/breakiterator_th.hxx | 2
i18npool/source/breakiterator/breakiterator_ctl.cxx | 2
i18npool/source/breakiterator/breakiterator_th.cxx | 2
include/connectivity/sdbcx/VCollection.hxx | 2
include/sfx2/filedlghelper.hxx | 2
sc/inc/AccessibleFilterMenu.hxx | 2
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 6 -
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 6 -
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 14 +--
sc/source/ui/Accessibility/AccessibleDocument.cxx | 4
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 4
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 4
sc/source/ui/Accessibility/AccessiblePageHeader.cxx | 4
sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 4
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 4
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx | 4
sc/source/ui/Accessibility/AccessibleTableBase.cxx | 4
sc/source/ui/inc/AccessibleCellBase.hxx | 6 -
sc/source/ui/inc/AccessibleContextBase.hxx | 6 -
sc/source/ui/inc/AccessibleCsvControl.hxx | 14 +--
sc/source/ui/inc/AccessibleDocument.hxx | 4
sc/source/ui/inc/AccessibleDocumentPagePreview.hxx | 4
sc/source/ui/inc/AccessibleEditObject.hxx | 4
sc/source/ui/inc/AccessiblePageHeader.hxx | 4
sc/source/ui/inc/AccessiblePageHeaderArea.hxx | 4
sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx | 4
sc/source/ui/inc/AccessiblePreviewTable.hxx | 4
sc/source/ui/inc/AccessibleTableBase.hxx | 4
sd/source/ui/dlg/filedlg.cxx | 4
sfx2/source/dialog/filedlghelper.cxx | 2
ucb/source/cacher/cachedcontentresultset.cxx | 8 -
ucb/source/cacher/cachedcontentresultset.hxx | 8 -
ucb/source/cacher/cachedcontentresultsetstub.cxx | 4
ucb/source/cacher/cachedcontentresultsetstub.hxx | 4
ucb/source/cacher/cacheddynamicresultset.cxx | 6 -
ucb/source/cacher/cacheddynamicresultset.hxx | 6 -
ucb/source/cacher/cacheddynamicresultsetstub.cxx | 4
ucb/source/cacher/cacheddynamicresultsetstub.hxx | 4
ucb/source/cacher/contentresultsetwrapper.cxx | 8 -
ucb/source/cacher/contentresultsetwrapper.hxx | 8 -
ucb/source/cacher/dynamicresultsetwrapper.cxx | 6 -
ucb/source/cacher/dynamicresultsetwrapper.hxx | 6 -
vbahelper/source/vbahelper/vbapagesetupbase.cxx | 8 -
xmlsecurity/inc/certificate.hxx | 2
xmlsecurity/source/gpg/CertificateImpl.hxx | 2
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx | 2
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx | 2
114 files changed, 430 insertions(+), 394 deletions(-)
New commits:
commit c0ac78c97174fcde68daf174f6e8ade502c507d3
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Dec 5 10:11:39 2017 +0200
loplugin:salcall handle virtual methods
Change-Id: Iab95db31188ea2914a46d63a7ebef3d825e6ec42
Reviewed-on: https://gerrit.libreoffice.org/45851
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
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);
}
diff --git a/compilerplugins/clang/salcall.cxx b/compilerplugins/clang/salcall.cxx
index 08b0230a9d49..b36bc5cc1db0 100644
--- a/compilerplugins/clang/salcall.cxx
+++ b/compilerplugins/clang/salcall.cxx
@@ -206,7 +206,7 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
// @TODO For now, I am ignore free functions, since those are most likely to have their address taken.
// I'll do them later. They are harder to verify since MSVC does not verify when assigning to function pointers
// that the calling convention of the function matches the calling convention of the function pointer!
- if (!methodDecl || methodDecl->isStatic() || methodDecl->isVirtual())
+ if (!methodDecl || methodDecl->isStatic())
return true;
// can only check when we have a definition since this is the most likely time
@@ -232,6 +232,42 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
return true;
}
+ // some base classes are overridden by sub-classes which override both the base-class and an UNO class
+ if (recordDecl)
+ {
+ auto dc = loplugin::DeclCheck(recordDecl);
+ if (dc.Class("OProxyAggregation").Namespace("comphelper").GlobalNamespace()
+ || dc.Class("OComponentProxyAggregationHelper")
+ .Namespace("comphelper")
+ .GlobalNamespace()
+ || dc.Class("SvxShapeMaster").GlobalNamespace()
+ || dc.Class("ListBoxAccessibleBase").Namespace("accessibility").GlobalNamespace()
+ || dc.Class("AsyncEventNotifierBase").Namespace("comphelper").GlobalNamespace()
+ || dc.Class("ODescriptor")
+ .Namespace("sdbcx")
+ .Namespace("connectivity")
+ .GlobalNamespace()
+ || dc.Class("IController").Namespace("dbaui").GlobalNamespace()
+ || dc.Class("ORowSetBase").Namespace("dbaccess").GlobalNamespace()
+ || dc.Class("OComponentAdapterBase").Namespace("bib").GlobalNamespace()
+ || dc.Class("IEventProcessor").Namespace("comphelper").GlobalNamespace()
+ || dc.Class("SvxUnoTextBase").GlobalNamespace()
+ || dc.Class("OInterfaceContainer").Namespace("frm").GlobalNamespace()
+ || dc.Class("AccessibleComponentBase").Namespace("accessibility").GlobalNamespace()
+ || dc.Class("ContextHandler2Helper")
+ .Namespace("core")
+ .Namespace("oox")
+ .GlobalNamespace()
+ || dc.Class("AccessibleStaticTextBase").Namespace("accessibility").GlobalNamespace()
+ || dc.Class("OCommonPicker").Namespace("svt").GlobalNamespace()
+ || dc.Class("VbaDocumentBase").GlobalNamespace()
+ || dc.Class("VbaPageSetupBase").GlobalNamespace()
+ || dc.Class("ScVbaControl").GlobalNamespace()
+
+ )
+ return true;
+ }
+
if (methodDecl)
{
for (auto iter = methodDecl->begin_overridden_methods();
@@ -351,7 +387,7 @@ bool SalCall::checkOverlap(SourceRange range)
return true;
}
-static loplugin::Plugin::Registration<SalCall> reg("salcall", false);
+static loplugin::Plugin::Registration<SalCall> reg("salcall", true);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/connectivity/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx
index b1acf94daac7..bc886d1d4383 100644
--- a/connectivity/source/drivers/evoab2/NTables.hxx
+++ b/connectivity/source/drivers/evoab2/NTables.hxx
@@ -38,7 +38,7 @@ namespace connectivity
sdbcx::OCollection(_rParent,true,_rMutex,_rVector),
m_xMetaData(_rMetaData)
{}
- virtual void SAL_CALL disposing() override;
+ virtual void disposing() override;
};
}
}
diff --git a/connectivity/source/drivers/mork/MTables.hxx b/connectivity/source/drivers/mork/MTables.hxx
index 23a4b51361f6..a30174806ec0 100644
--- a/connectivity/source/drivers/mork/MTables.hxx
+++ b/connectivity/source/drivers/mork/MTables.hxx
@@ -38,7 +38,7 @@ namespace connectivity
{}
// only the name is identical to ::cppu::OComponentHelper
- virtual void SAL_CALL disposing() override;
+ virtual void disposing() override;
};
}
}
diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx
index d6f65067c307..a52d8b3e5e80 100644
--- a/connectivity/source/inc/hsqldb/HTables.hxx
+++ b/connectivity/source/inc/hsqldb/HTables.hxx
@@ -44,7 +44,7 @@ namespace connectivity
{}
// only the name is identical to ::cppu::OComponentHelper
- virtual void SAL_CALL disposing() override;
+ virtual void disposing() override;
// XDrop
void appendNew(const OUString& _rsNewTable);
diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx
index 40b9478a67f2..f81a50a8cd9e 100644
--- a/connectivity/source/inc/hsqldb/HViews.hxx
+++ b/connectivity/source/inc/hsqldb/HViews.hxx
@@ -44,7 +44,7 @@ namespace connectivity
::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector );
// only the name is identical to ::cppu::OComponentHelper
- virtual void SAL_CALL disposing() override;
+ virtual void disposing() override;
void dropByNameImpl(const OUString& elementName);
};
diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx
index 723a3511273e..1b0780e3f308 100644
--- a/connectivity/source/inc/mysql/YTables.hxx
+++ b/connectivity/source/inc/mysql/YTables.hxx
@@ -46,7 +46,7 @@ namespace connectivity
{}
// only the name is identical to ::cppu::OComponentHelper
- virtual void SAL_CALL disposing() override;
+ virtual void disposing() override;
// XDrop
void appendNew(const OUString& _rsNewTable);
diff --git a/connectivity/source/inc/mysql/YViews.hxx b/connectivity/source/inc/mysql/YViews.hxx
index 9fe8ca6d856a..c9914bfe05be 100644
--- a/connectivity/source/inc/mysql/YViews.hxx
+++ b/connectivity/source/inc/mysql/YViews.hxx
@@ -44,7 +44,7 @@ namespace connectivity
{}
// only the name is identical to ::cppu::OComponentHelper
- virtual void SAL_CALL disposing() override;
+ virtual void disposing() override;
void dropByNameImpl(const OUString& elementName);
};
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index c6c2ddf8883b..974256ee2c90 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -47,32 +47,32 @@ void OBookmarkSet::reset(const Reference< XResultSet>& _xDriverSet)
construct(_xDriverSet, m_sRowSetFilter);
}
-Any SAL_CALL OBookmarkSet::getBookmark()
+Any OBookmarkSet::getBookmark()
{
return m_xRowLocate->getBookmark();
}
-bool SAL_CALL OBookmarkSet::moveToBookmark( const Any& bookmark )
+bool OBookmarkSet::moveToBookmark( const Any& bookmark )
{
return m_xRowLocate->moveToBookmark(bookmark);
}
-sal_Int32 SAL_CALL OBookmarkSet::compareBookmarks( const Any& _first, const Any& _second )
+sal_Int32 OBookmarkSet::compareBookmarks( const Any& _first, const Any& _second )
{
return m_xRowLocate->compareBookmarks(_first,_second);
}
-bool SAL_CALL OBookmarkSet::hasOrderedBookmarks( )
+bool OBookmarkSet::hasOrderedBookmarks( )
{
return m_xRowLocate->hasOrderedBookmarks();
}
-sal_Int32 SAL_CALL OBookmarkSet::hashBookmark( const Any& bookmark )
+sal_Int32 OBookmarkSet::hashBookmark( const Any& bookmark )
{
return m_xRowLocate->hashBookmark(bookmark);
}
-void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ )
+void OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ )
{
Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY);
if(!xUpdRow.is())
@@ -96,7 +96,7 @@ void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const conne
::dbtools::throwSQLException( DBA_RES( RID_STR_NO_XRESULTSETUPDATE ), StandardSQLState::GENERAL_ERROR, *this );
}
-void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ )
+void OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ )
{
Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY);
if(!xUpdRow.is())
@@ -119,7 +119,7 @@ void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowS
::dbtools::throwSQLException( DBA_RES( RID_STR_NO_XRESULTSETUPDATE ), StandardSQLState::GENERAL_ERROR, *this );
}
-void SAL_CALL OBookmarkSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/ )
+void OBookmarkSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/ )
{
Reference<XResultSetUpdate> xUpd(m_xRowLocate,UNO_QUERY);
diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx
index 8c34c2e0156b..b25a7efe73bc 100644
--- a/dbaccess/source/core/api/BookmarkSet.hxx
+++ b/dbaccess/source/core/api/BookmarkSet.hxx
@@ -42,15 +42,15 @@ namespace dbaccess
virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) override;
virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) override;
// css::sdbcx::XRowLocate
- virtual css::uno::Any SAL_CALL getBookmark() override;
- virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
- virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
- virtual bool SAL_CALL hasOrderedBookmarks( ) override;
- virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
+ virtual css::uno::Any getBookmark() override;
+ virtual bool moveToBookmark( const css::uno::Any& bookmark ) override;
+ virtual sal_Int32 compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+ virtual bool hasOrderedBookmarks( ) override;
+ virtual sal_Int32 hashBookmark( const css::uno::Any& bookmark ) override;
// css::sdbc::XResultSetUpdate
- virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
- virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) override;
- virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+ virtual void insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+ virtual void updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) override;
+ virtual void deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
};
}
#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_BOOKMARKSET_HXX
diff --git a/dbaccess/source/core/api/CIndexes.cxx b/dbaccess/source/core/api/CIndexes.cxx
index 0931179875d2..ed713db72a53 100644
--- a/dbaccess/source/core/api/CIndexes.cxx
+++ b/dbaccess/source/core/api/CIndexes.cxx
@@ -82,7 +82,7 @@ void OIndexes::dropObject(sal_Int32 _nPos, const OUString& _sElementName)
OIndexesHelper::dropObject(_nPos,_sElementName);
}
-void SAL_CALL OIndexes::disposing()
+void OIndexes::disposing()
{
if ( m_xIndexes.is() )
clear_NoDispose();
diff --git a/dbaccess/source/core/api/CIndexes.hxx b/dbaccess/source/core/api/CIndexes.hxx
index a71b0f376cc6..0ee3d5ced152 100644
--- a/dbaccess/source/core/api/CIndexes.hxx
+++ b/dbaccess/source/core/api/CIndexes.hxx
@@ -41,7 +41,7 @@ namespace dbaccess
,m_xIndexes(_rxIndexes)
{}
- virtual void SAL_CALL disposing() override;
+ virtual void disposing() override;
};
}
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index 529358055d9f..14970364a798 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -219,7 +219,7 @@ sdbcx::ObjectType ORowSetDataColumns::createObject(const OUString& _rName)
return xNamed;
}
-void SAL_CALL ORowSetDataColumns::disposing()
+void ORowSetDataColumns::disposing()
{
ORowSetDataColumns_BASE::disposing();
m_aColumns = nullptr;
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx
index 60983220408c..83fae4e89c10 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx
@@ -92,7 +92,7 @@ namespace dbaccess
);
virtual ~ORowSetDataColumns() override;
// only the name is identical to ::cppu::OComponentHelper
- virtual void SAL_CALL disposing() override;
+ virtual void disposing() override;
void assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const std::vector< OUString> &_rVector);
};
}
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 96ec66e59337..785cba2a69cc 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -148,7 +148,7 @@ void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable)
}
}
-void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable )
+void OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable )
{
Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
fillTableName(xSet);
@@ -271,7 +271,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
}
}
-void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable )
+void OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable )
{
Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
fillTableName(xSet);
@@ -315,7 +315,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR
m_bUpdated = xPrep->executeUpdate() > 0;
}
-void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable )
+void OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable )
{
Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
fillTableName(xSet);
@@ -494,58 +494,58 @@ Reference< XArray > SAL_CALL OCacheSet::getArray( sal_Int32 columnIndex )
}
// XResultSet
-bool SAL_CALL OCacheSet::next()
+bool OCacheSet::next()
{
m_bInserted = m_bUpdated = m_bDeleted = false;
return m_xDriverSet->next();
}
-bool SAL_CALL OCacheSet::isBeforeFirst( )
+bool OCacheSet::isBeforeFirst( )
{
return m_xDriverSet->isBeforeFirst();
}
-bool SAL_CALL OCacheSet::isAfterLast( )
+bool OCacheSet::isAfterLast( )
{
return m_xDriverSet->isAfterLast();
}
-void SAL_CALL OCacheSet::beforeFirst( )
+void OCacheSet::beforeFirst( )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
m_xDriverSet->beforeFirst();
}
-void SAL_CALL OCacheSet::afterLast( )
+void OCacheSet::afterLast( )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
m_xDriverSet->afterLast();
}
-bool SAL_CALL OCacheSet::first()
+bool OCacheSet::first()
{
m_bInserted = m_bUpdated = m_bDeleted = false;
return m_xDriverSet->first();
}
-bool SAL_CALL OCacheSet::last()
+bool OCacheSet::last()
{
m_bInserted = m_bUpdated = m_bDeleted = false;
return m_xDriverSet->last();
}
-sal_Int32 SAL_CALL OCacheSet::getRow( )
+sal_Int32 OCacheSet::getRow( )
{
return m_xDriverSet->getRow();
}
-bool SAL_CALL OCacheSet::absolute( sal_Int32 row )
+bool OCacheSet::absolute( sal_Int32 row )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
return m_xDriverSet->absolute(row);
}
-bool SAL_CALL OCacheSet::previous( )
+bool OCacheSet::previous( )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
return m_xDriverSet->previous();
@@ -566,22 +566,22 @@ bool OCacheSet::absolute_checked( sal_Int32 row,bool /*i_bFetchRow*/ )
return absolute(row);
}
-void SAL_CALL OCacheSet::refreshRow( )
+void OCacheSet::refreshRow( )
{
m_xDriverSet->refreshRow();
}
-bool SAL_CALL OCacheSet::rowUpdated( )
+bool OCacheSet::rowUpdated( )
{
return m_xDriverSet->rowUpdated();
}
-bool SAL_CALL OCacheSet::rowInserted( )
+bool OCacheSet::rowInserted( )
{
return m_xDriverSet->rowInserted();
}
-bool SAL_CALL OCacheSet::rowDeleted( )
+bool OCacheSet::rowDeleted( )
{
return m_xDriverSet->rowDeleted();
}
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index 5f2c50da9a90..ddfef905cdc8 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -104,72 +104,72 @@ namespace dbaccess
// css::sdbc::XResultSet
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual bool SAL_CALL next();
+ virtual bool next();
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual bool SAL_CALL isBeforeFirst( );
+ virtual bool isBeforeFirst( );
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual bool SAL_CALL isAfterLast( );
+ virtual bool isAfterLast( );
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual void SAL_CALL beforeFirst( );
+ virtual void beforeFirst( );
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual void SAL_CALL afterLast( );
+ virtual void afterLast( );
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual bool SAL_CALL first();
+ virtual bool first();
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual bool SAL_CALL last();
+ virtual bool last();
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual sal_Int32 SAL_CALL getRow( );
+ virtual sal_Int32 getRow( );
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual bool SAL_CALL absolute( sal_Int32 row );
+ virtual bool absolute( sal_Int32 row );
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual bool SAL_CALL previous( );
+ virtual bool previous( );
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual void SAL_CALL refreshRow( );
+ virtual void refreshRow( );
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual bool SAL_CALL rowUpdated( );
+ virtual bool rowUpdated( );
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual bool SAL_CALL rowInserted( );
+ virtual bool rowInserted( );
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual bool SAL_CALL rowDeleted( );
+ virtual bool rowDeleted( );
// css::sdbcx::XRowLocate
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual css::uno::Any SAL_CALL getBookmark() = 0;
+ virtual css::uno::Any getBookmark() = 0;
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) = 0;
+ virtual bool moveToBookmark( const css::uno::Any& bookmark ) = 0;
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) = 0;
+ virtual sal_Int32 compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) = 0;
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual bool SAL_CALL hasOrderedBookmarks( ) = 0;
+ virtual bool hasOrderedBookmarks( ) = 0;
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) = 0;
+ virtual sal_Int32 hashBookmark( const css::uno::Any& bookmark ) = 0;
// css::sdbc::XResultSetUpdate
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable );
+ virtual void insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable );
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual void SAL_CALL updateRow( const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable );
+ virtual void updateRow( const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable );
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- virtual void SAL_CALL deleteRow( const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable ) = 0;
+ virtual void deleteRow( const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable ) = 0;
virtual bool isResultSetChanged() const;
virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) = 0;
diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx
index 52d436fcd362..2a873c862718 100644
--- a/dbaccess/source/core/api/HelperCollections.cxx
+++ b/dbaccess/source/core/api/HelperCollections.cxx
@@ -67,7 +67,7 @@ namespace dbaccess
return new OPrivateColumns( _rColumns, _bCase, _rParent, _rMutex, aNames, false );
}
- void SAL_CALL OPrivateColumns::disposing()
+ void OPrivateColumns::disposing()
{
m_aColumns = nullptr;
clear_NoDispose();
diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx
index 32adb2b2759a..1e6da30e68b7 100644
--- a/dbaccess/source/core/api/HelperCollections.hxx
+++ b/dbaccess/source/core/api/HelperCollections.hxx
@@ -70,7 +70,7 @@ namespace dbaccess
::osl::Mutex& _rMutex
);
- virtual void SAL_CALL disposing() override;
+ virtual void disposing() override;
};
typedef connectivity::sdbcx::OCollection OPrivateTables_BASE;
@@ -95,7 +95,7 @@ namespace dbaccess
,m_aTables(_rTables)
{
}
- virtual void SAL_CALL disposing() override
+ virtual void disposing() override
{
clear_NoDispose();
// we're not owner of the objects we're holding, instead the object we got in our ctor is
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 6c9bc6964d45..2a8584cc6455 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -413,14 +413,14 @@ void OKeySet::invalidateRow()
::comphelper::disposeComponent(m_xSet);
}
-Any SAL_CALL OKeySet::getBookmark()
+Any OKeySet::getBookmark()
{
OSL_ENSURE(m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin(),
"getBookmark is only possible when we stand on a valid row!");
return makeAny(m_aKeyIter->first);
}
-bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark )
+bool OKeySet::moveToBookmark( const Any& bookmark )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32(bookmark));
@@ -428,7 +428,7 @@ bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark )
return m_aKeyIter != m_aKeyMap.end();
}
-sal_Int32 SAL_CALL OKeySet::compareBookmarks( const Any& _first, const Any& _second )
+sal_Int32 OKeySet::compareBookmarks( const Any& _first, const Any& _second )
{
sal_Int32 nFirst = 0, nSecond = 0;
_first >>= nFirst;
@@ -437,18 +437,18 @@ sal_Int32 SAL_CALL OKeySet::compareBookmarks( const Any& _first, const Any& _sec
return (nFirst != nSecond) ? CompareBookmark::NOT_EQUAL : CompareBookmark::EQUAL;
}
-bool SAL_CALL OKeySet::hasOrderedBookmarks( )
+bool OKeySet::hasOrderedBookmarks( )
{
return true;
}
-sal_Int32 SAL_CALL OKeySet::hashBookmark( const Any& bookmark )
+sal_Int32 OKeySet::hashBookmark( const Any& bookmark )
{
return ::comphelper::getINT32(bookmark);
}
-void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable )
+void OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable )
{
Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
fillTableName(xSet);
@@ -617,7 +617,7 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO
}
}
-void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable )
+void OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable )
{
Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
fillTableName(xSet);
@@ -861,7 +861,7 @@ void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow, ORowSetRow const & _rK
}
}
-void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable )
+void OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable )
{
Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
fillTableName(xSet);
@@ -1003,7 +1003,7 @@ Reference<XNameAccess> OKeySet::getKeyColumns() const
return xKeyColumns;
}
-bool SAL_CALL OKeySet::next()
+bool OKeySet::next()
{
m_bInserted = m_bUpdated = m_bDeleted = false;
@@ -1031,24 +1031,24 @@ bool SAL_CALL OKeySet::next()
return !isAfterLast();
}
-bool SAL_CALL OKeySet::isBeforeFirst( )
+bool OKeySet::isBeforeFirst( )
{
return m_aKeyIter == m_aKeyMap.begin();
}
-bool SAL_CALL OKeySet::isAfterLast( )
+bool OKeySet::isAfterLast( )
{
return m_bRowCountFinal && m_aKeyIter == m_aKeyMap.end();
}
-void SAL_CALL OKeySet::beforeFirst( )
+void OKeySet::beforeFirst( )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
m_aKeyIter = m_aKeyMap.begin();
invalidateRow();
}
-void SAL_CALL OKeySet::afterLast( )
+void OKeySet::afterLast( )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
fillAllRows();
@@ -1056,7 +1056,7 @@ void SAL_CALL OKeySet::afterLast( )
invalidateRow();
}
-bool SAL_CALL OKeySet::first()
+bool OKeySet::first()
{
m_bInserted = m_bUpdated = m_bDeleted = false;
m_aKeyIter = m_aKeyMap.begin();
@@ -1074,7 +1074,7 @@ bool SAL_CALL OKeySet::first()
return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin();
}
-bool SAL_CALL OKeySet::last( )
+bool OKeySet::last( )
{
return last_checked(true);
}
@@ -1093,7 +1093,7 @@ bool OKeySet::last_checked( bool /* i_bFetchRow */ )
return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin();
}
-sal_Int32 SAL_CALL OKeySet::getRow( )
+sal_Int32 OKeySet::getRow( )
{
OSL_ENSURE(!isAfterLast(),"getRow is not allowed when afterlast record!");
OSL_ENSURE(!isBeforeFirst(),"getRow is not allowed when beforefirst record!");
@@ -1101,7 +1101,7 @@ sal_Int32 SAL_CALL OKeySet::getRow( )
return std::distance(m_aKeyMap.begin(),m_aKeyIter);
}
-bool SAL_CALL OKeySet::absolute( sal_Int32 row )
+bool OKeySet::absolute( sal_Int32 row )
{
return absolute_checked(row,true);
}
@@ -1176,7 +1176,7 @@ bool OKeySet::previous_checked( bool /* i_bFetchRow */ )
return m_aKeyIter != m_aKeyMap.begin();
}
-bool SAL_CALL OKeySet::previous( )
+bool OKeySet::previous( )
{
return previous_checked(true);
}
@@ -1225,7 +1225,7 @@ bool OKeySet::doTryRefetch_throw()
return m_xSet->next();
}
-void SAL_CALL OKeySet::refreshRow()
+void OKeySet::refreshRow()
{
invalidateRow();
@@ -1466,17 +1466,17 @@ Reference< XArray > SAL_CALL OKeySet::getArray( sal_Int32 columnIndex )
return m_xRow->getArray(columnIndex);
}
-bool SAL_CALL OKeySet::rowUpdated( )
+bool OKeySet::rowUpdated( )
{
return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 2;
}
-bool SAL_CALL OKeySet::rowInserted( )
+bool OKeySet::rowInserted( )
{
return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 1;
}
-bool SAL_CALL OKeySet::rowDeleted( )
+bool OKeySet::rowDeleted( )
{
bool bDeleted = m_bDeleted;
m_bDeleted = false;
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index 45262f53d5d3..bea06818dbe9 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -182,39 +182,39 @@ namespace dbaccess
virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
- virtual bool SAL_CALL rowUpdated( ) override;
- virtual bool SAL_CALL rowInserted( ) override;
- virtual bool SAL_CALL rowDeleted( ) override;
+ virtual bool rowUpdated( ) override;
+ virtual bool rowInserted( ) override;
+ virtual bool rowDeleted( ) override;
// css::sdbc::XResultSet
- virtual bool SAL_CALL next() override;
- virtual bool SAL_CALL isBeforeFirst( ) override;
- virtual bool SAL_CALL isAfterLast( ) override;
- virtual void SAL_CALL beforeFirst( ) override;
- virtual void SAL_CALL afterLast( ) override;
- virtual bool SAL_CALL first() override;
- virtual bool SAL_CALL last( ) override;
- virtual sal_Int32 SAL_CALL getRow( ) override;
- virtual bool SAL_CALL absolute( sal_Int32 row ) override;
- virtual bool SAL_CALL previous( ) override;
+ virtual bool next() override;
+ virtual bool isBeforeFirst( ) override;
+ virtual bool isAfterLast( ) override;
+ virtual void beforeFirst( ) override;
+ virtual void afterLast( ) override;
+ virtual bool first() override;
+ virtual bool last( ) override;
+ virtual sal_Int32 getRow( ) override;
+ virtual bool absolute( sal_Int32 row ) override;
+ virtual bool previous( ) override;
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
void ensureRowForData( );
- virtual void SAL_CALL refreshRow( ) override;
+ virtual void refreshRow( ) override;
// css::sdbcx::XRowLocate
- virtual css::uno::Any SAL_CALL getBookmark() override;
+ virtual css::uno::Any getBookmark() override;
- virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
+ virtual bool moveToBookmark( const css::uno::Any& bookmark ) override;
- virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+ virtual sal_Int32 compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
- virtual bool SAL_CALL hasOrderedBookmarks( ) override;
+ virtual bool hasOrderedBookmarks( ) override;
- virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
+ virtual sal_Int32 hashBookmark( const css::uno::Any& bookmark ) override;
// css::sdbc::XResultSetUpdate
- virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) override;
- virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
- virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+ virtual void updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) override;
+ virtual void deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+ virtual void insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
virtual bool previous_checked( bool i_bFetchRow ) override;
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index f67491fc69b9..0d8383cd8b07 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -167,7 +167,7 @@ void OptimisticSet::makeNewStatement( )
::comphelper::disposeComponent(xAnalyzer);
}
-void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ )
+void OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ )
{
if ( m_aJoinedKeyColumns.empty() )
throw SQLException();
@@ -236,7 +236,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow
}
}
-void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ )
+void OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ )
{
TSQLStatements aSql;
TSQLStatements aParameter;
@@ -331,7 +331,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn
}
}
-void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& /*_xTable*/ )
+void OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& /*_xTable*/ )
{
OUString aQuote = getIdentifierQuoteString();
TSQLStatements aKeyConditions;
diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx
index 417ab833e48f..d64d75a0b8fb 100644
--- a/dbaccess/source/core/api/OptimisticSet.hxx
+++ b/dbaccess/source/core/api/OptimisticSet.hxx
@@ -59,9 +59,9 @@ namespace dbaccess
virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) override;
// css::sdbc::XResultSetUpdate
- virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) override;
- virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
- virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+ virtual void updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) override;
+ virtual void deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+ virtual void insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
// CacheSet
virtual bool isResultSetChanged() const override;
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index 39ad1bbb0e9e..015bcce47b08 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -44,18 +44,18 @@ void OStaticSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 /*_nPosition*/)
}
// css::sdbcx::XRowLocate
-Any SAL_CALL OStaticSet::getBookmark()
+Any OStaticSet::getBookmark()
{
return makeAny(getRow());
}
-bool SAL_CALL OStaticSet::moveToBookmark( const Any& bookmark )
+bool OStaticSet::moveToBookmark( const Any& bookmark )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
return absolute(::comphelper::getINT32(bookmark));
}
-sal_Int32 SAL_CALL OStaticSet::compareBookmarks( const Any& _first, const Any& _second )
+sal_Int32 OStaticSet::compareBookmarks( const Any& _first, const Any& _second )
{
sal_Int32 nFirst = 0, nSecond = 0;
_first >>= nFirst;
@@ -63,12 +63,12 @@ sal_Int32 SAL_CALL OStaticSet::compareBookmarks( const Any& _first, const Any& _
return (nFirst < nSecond) ? CompareBookmark::LESS : ((nFirst > nSecond) ? CompareBookmark::GREATER : CompareBookmark::EQUAL);
}
-bool SAL_CALL OStaticSet::hasOrderedBookmarks( )
+bool OStaticSet::hasOrderedBookmarks( )
{
return true;
}
-sal_Int32 SAL_CALL OStaticSet::hashBookmark( const Any& bookmark )
+sal_Int32 OStaticSet::hashBookmark( const Any& bookmark )
{
return ::comphelper::getINT32(bookmark);
}
@@ -108,7 +108,7 @@ void OStaticSet::fillAllRows()
}
// XResultSet
-bool SAL_CALL OStaticSet::next()
+bool OStaticSet::next()
{
m_bInserted = m_bUpdated = m_bDeleted = false;
@@ -125,30 +125,30 @@ bool SAL_CALL OStaticSet::next()
return !isAfterLast();
}
-bool SAL_CALL OStaticSet::isBeforeFirst( )
+bool OStaticSet::isBeforeFirst( )
{
return m_aSetIter == m_aSet.begin();
}
-bool SAL_CALL OStaticSet::isAfterLast( )
+bool OStaticSet::isAfterLast( )
{
return m_aSetIter == m_aSet.end() && m_bEnd;
}
-void SAL_CALL OStaticSet::beforeFirst( )
+void OStaticSet::beforeFirst( )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
m_aSetIter = m_aSet.begin();
}
-void SAL_CALL OStaticSet::afterLast( )
+void OStaticSet::afterLast( )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
fillAllRows();
m_aSetIter = m_aSet.end();
}
-bool SAL_CALL OStaticSet::first()
+bool OStaticSet::first()
{
m_bInserted = m_bUpdated = m_bDeleted = false;
m_aSetIter = m_aSet.begin()+1;
@@ -158,7 +158,7 @@ bool SAL_CALL OStaticSet::first()
return m_aSetIter != m_aSet.end();
}
-bool SAL_CALL OStaticSet::last()
+bool OStaticSet::last()
{
m_bInserted = m_bUpdated = m_bDeleted = false;
fillAllRows();
@@ -167,7 +167,7 @@ bool SAL_CALL OStaticSet::last()
return !isBeforeFirst() && !isAfterLast();
}
-sal_Int32 SAL_CALL OStaticSet::getRow( )
+sal_Int32 OStaticSet::getRow( )
{
OSL_ENSURE(!isAfterLast(),"getRow is not allowed when afterlast record!");
OSL_ENSURE(!isBeforeFirst(),"getRow is not allowed when beforefirst record!");
@@ -177,7 +177,7 @@ sal_Int32 SAL_CALL OStaticSet::getRow( )
return nPos;
}
-bool SAL_CALL OStaticSet::absolute( sal_Int32 row )
+bool OStaticSet::absolute( sal_Int32 row )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
OSL_ENSURE(row,"OStaticSet::absolute: INVALID row number!");
@@ -217,7 +217,7 @@ bool SAL_CALL OStaticSet::absolute( sal_Int32 row )
return m_aSetIter != m_aSet.end() && m_aSetIter != m_aSet.begin();
}
-bool SAL_CALL OStaticSet::previous( )
+bool OStaticSet::previous( )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
@@ -227,26 +227,26 @@ bool SAL_CALL OStaticSet::previous( )
return m_aSetIter != m_aSet.begin();
}
-void SAL_CALL OStaticSet::refreshRow( )
+void OStaticSet::refreshRow( )
{
}
-bool SAL_CALL OStaticSet::rowUpdated( )
+bool OStaticSet::rowUpdated( )
{
return m_bUpdated;
}
-bool SAL_CALL OStaticSet::rowInserted( )
+bool OStaticSet::rowInserted( )
{
return m_bInserted;
}
-bool SAL_CALL OStaticSet::rowDeleted( )
+bool OStaticSet::rowDeleted( )
{
return m_bDeleted;
}
-void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable )
+void OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable )
{
OCacheSet::insertRow( _rInsertRow,_xTable);
if(m_bInserted)
@@ -258,7 +258,7 @@ void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connect
}
}
-void SAL_CALL OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable )
+void OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable )
{
OCacheSet::deleteRow(_rDeleteRow,_xTable);
if(m_bDeleted)
diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx
index 064d789f3f7d..92f4d55ce7b0 100644
--- a/dbaccess/source/core/api/StaticSet.hxx
+++ b/dbaccess/source/core/api/StaticSet.hxx
@@ -45,30 +45,30 @@ namespace dbaccess
virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition) override;
// css::sdbcx::XRowLocate
- virtual css::uno::Any SAL_CALL getBookmark() override;
- virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
- virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
- virtual bool SAL_CALL hasOrderedBookmarks( ) override;
- virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
+ virtual css::uno::Any getBookmark() override;
+ virtual bool moveToBookmark( const css::uno::Any& bookmark ) override;
+ virtual sal_Int32 compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+ virtual bool hasOrderedBookmarks( ) override;
+ virtual sal_Int32 hashBookmark( const css::uno::Any& bookmark ) override;
// css::sdbc::XResultSet
- virtual bool SAL_CALL next() override;
- virtual bool SAL_CALL isBeforeFirst( ) override;
- virtual bool SAL_CALL isAfterLast( ) override;
- virtual void SAL_CALL beforeFirst( ) override;
- virtual void SAL_CALL afterLast( ) override;
- virtual bool SAL_CALL first() override;
- virtual bool SAL_CALL last() override;
- virtual sal_Int32 SAL_CALL getRow( ) override;
- virtual bool SAL_CALL absolute( sal_Int32 row ) override;
- virtual bool SAL_CALL previous( ) override;
- virtual void SAL_CALL refreshRow( ) override;
- virtual bool SAL_CALL rowUpdated( ) override;
- virtual bool SAL_CALL rowInserted( ) override;
- virtual bool SAL_CALL rowDeleted( ) override;
+ virtual bool next() override;
+ virtual bool isBeforeFirst( ) override;
+ virtual bool isAfterLast( ) override;
+ virtual void beforeFirst( ) override;
+ virtual void afterLast( ) override;
+ virtual bool first() override;
+ virtual bool last() override;
+ virtual sal_Int32 getRow( ) override;
+ virtual bool absolute( sal_Int32 row ) override;
+ virtual bool previous( ) override;
+ virtual void refreshRow( ) override;
+ virtual bool rowUpdated( ) override;
+ virtual bool rowInserted( ) override;
+ virtual bool rowDeleted( ) override;
// css::sdbc::XResultSetUpdate
- virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
- virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+ virtual void insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+ virtual void deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
};
}
#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_STATICSET_HXX
diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx
index ddbe9cc23e3a..15f935d0c048 100644
--- a/dbaccess/source/core/api/WrappedResultSet.cxx
+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
@@ -49,7 +49,7 @@ void WrappedResultSet::reset(const Reference< XResultSet>& _xDriverSet)
construct(_xDriverSet, m_sRowSetFilter);
}
-Any SAL_CALL WrappedResultSet::getBookmark()
+Any WrappedResultSet::getBookmark()
{
if ( m_xRowLocate.is() )
{
@@ -58,27 +58,27 @@ Any SAL_CALL WrappedResultSet::getBookmark()
return makeAny(m_xDriverSet->getRow());
}
-bool SAL_CALL WrappedResultSet::moveToBookmark( const Any& bookmark )
+bool WrappedResultSet::moveToBookmark( const Any& bookmark )
{
return m_xRowLocate->moveToBookmark( bookmark );
}
-sal_Int32 SAL_CALL WrappedResultSet::compareBookmarks( const Any& _first, const Any& _second )
+sal_Int32 WrappedResultSet::compareBookmarks( const Any& _first, const Any& _second )
{
return m_xRowLocate->compareBookmarks( _first,_second );
}
-bool SAL_CALL WrappedResultSet::hasOrderedBookmarks( )
+bool WrappedResultSet::hasOrderedBookmarks( )
{
return m_xRowLocate->hasOrderedBookmarks();
}
-sal_Int32 SAL_CALL WrappedResultSet::hashBookmark( const Any& bookmark )
+sal_Int32 WrappedResultSet::hashBookmark( const Any& bookmark )
{
return m_xRowLocate->hashBookmark(bookmark);
}
-void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ )
+void WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ )
{
m_xUpd->moveToInsertRow();
sal_Int32 i = 1;
@@ -92,7 +92,7 @@ void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const c
(*_rInsertRow->get().begin()) = getBookmark();
}
-void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ )
+void WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ )
{
sal_Int32 i = 1;
connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aOrgIter = _rOriginalRow->get().begin()+1;
@@ -105,7 +105,7 @@ void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const O
m_xUpd->updateRow();
}
-void SAL_CALL WrappedResultSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/ )
+void WrappedResultSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/ )
{
m_xUpd->deleteRow();
}
diff --git a/dbaccess/source/core/api/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx
index 7d5608637c49..96a82b3780ce 100644
--- a/dbaccess/source/core/api/WrappedResultSet.hxx
+++ b/dbaccess/source/core/api/WrappedResultSet.hxx
@@ -45,15 +45,15 @@ namespace dbaccess
virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) override;
virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) override;
// css::sdbcx::XRowLocate
- virtual css::uno::Any SAL_CALL getBookmark() override;
- virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
- virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
- virtual bool SAL_CALL hasOrderedBookmarks( ) override;
- virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
+ virtual css::uno::Any getBookmark() override;
+ virtual bool moveToBookmark( const css::uno::Any& bookmark ) override;
+ virtual sal_Int32 compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+ virtual bool hasOrderedBookmarks( ) override;
+ virtual sal_Int32 hashBookmark( const css::uno::Any& bookmark ) override;
// css::sdbc::XResultSetUpdate
- virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
- virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) override;
- virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+ virtual void insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+ virtual void updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) override;
+ virtual void deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
};
}
#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_WRAPPEDRESULTSET_HXX
diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx
index ee2df90ae9cb..430b5c1f9517 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -220,7 +220,7 @@ void OColumns::clearColumns()
disposing();
}
-void SAL_CALL OColumns::disposing()
+void OColumns::disposing()
{
MutexGuard aGuard(m_rMutex);
m_xDrvColumns = nullptr;
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index f797ff9aaa48..499720524008 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -421,7 +421,7 @@ void SAL_CALL OTableContainer::elementReplaced( const ContainerEvent& Event )
renameObject(sOldComposedName,sNewComposedName);
}
-void SAL_CALL OTableContainer::disposing()
+void OTableContainer::disposing()
{
OFilteredContainer::disposing();
// say goodbye to our listeners
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 87d32f989099..6416074e4aea 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -65,10 +65,10 @@ class LocalNameApproval : public IContainerApprove
::connectivity::SQLError m_aErrors;
public:
- void SAL_CALL approveElement( const OUString& _rName, const Reference< XInterface >& _rxElement ) override;
+ void approveElement( const OUString& _rName, const Reference< XInterface >& _rxElement ) override;
};
-void SAL_CALL LocalNameApproval::approveElement( const OUString& _rName, const Reference< XInterface >& /*_rxElement*/ )
+void LocalNameApproval::approveElement( const OUString& _rName, const Reference< XInterface >& /*_rxElement*/ )
{
if ( _rName.indexOf( '/' ) != -1 )
throw IllegalArgumentException(
diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx
index dd90a81a12f4..b07892731f3f 100644
--- a/dbaccess/source/core/inc/FilteredContainer.hxx
+++ b/dbaccess/source/core/inc/FilteredContainer.hxx
@@ -68,7 +68,7 @@ namespace dbaccess
/** tell the container to free all elements and all additional resources.<BR>
After using this method the object may be reconstructed by calling one of the <code>construct</code> methods.
*/
- virtual void SAL_CALL disposing() override;
+ virtual void disposing() override;
class EnsureReset
{
diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx
index b9be7f0a2e5a..2fd16937cb5a 100644
--- a/dbaccess/source/core/inc/column.hxx
+++ b/dbaccess/source/core/inc/column.hxx
@@ -227,7 +227,7 @@ namespace dbaccess
void append(const OUString& rName, OColumn*);
void clearColumns();
// only the name is identical to ::cppu::OComponentHelper
- virtual void SAL_CALL disposing() override;
+ virtual void disposing() override;
private:
using OColumns_BASE::setParent;
diff --git a/dbaccess/source/core/inc/containerapprove.hxx b/dbaccess/source/core/inc/containerapprove.hxx
index 8c81e97da515..47da745bdc89 100644
--- a/dbaccess/source/core/inc/containerapprove.hxx
+++ b/dbaccess/source/core/inc/containerapprove.hxx
@@ -50,7 +50,7 @@ namespace dbaccess
if the name or the object are invalid, or not eligible for insertion
into the container
*/
- virtual void SAL_CALL approveElement(
+ virtual void approveElement(
const OUString& _rName,
const css::uno::Reference< css::uno::XInterface >& _rxElement
) = 0;
diff --git a/dbaccess/source/core/inc/objectnameapproval.hxx b/dbaccess/source/core/inc/objectnameapproval.hxx
index ce2d9b8ac6f2..b99933281168 100644
--- a/dbaccess/source/core/inc/objectnameapproval.hxx
+++ b/dbaccess/source/core/inc/objectnameapproval.hxx
@@ -67,7 +67,7 @@ namespace dbaccess
virtual ~ObjectNameApproval() override;
// IContainerApprove
- virtual void SAL_CALL approveElement( const OUString& _rName, const css::uno::Reference< css::uno::XInterface >& _rxElement ) override;
+ virtual void approveElement( const OUString& _rName, const css::uno::Reference< css::uno::XInterface >& _rxElement ) override;
};
diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx
index 608565109d0f..1148fdb11688 100644
--- a/dbaccess/source/core/inc/tablecontainer.hxx
+++ b/dbaccess/source/core/inc/tablecontainer.hxx
@@ -64,7 +64,7 @@ namespace dbaccess
virtual connectivity::sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override;
- virtual void SAL_CALL disposing() override;
+ virtual void disposing() override;
virtual void SAL_CALL acquire() throw() override { OFilteredContainer::acquire();}
virtual void SAL_CALL release() throw() override { OFilteredContainer::release();}
diff --git a/dbaccess/source/core/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx
index d388c1be0dea..930dfca632f8 100644
--- a/dbaccess/source/core/misc/objectnameapproval.cxx
+++ b/dbaccess/source/core/misc/objectnameapproval.cxx
@@ -59,7 +59,7 @@ namespace dbaccess
{
}
- void SAL_CALL ObjectNameApproval::approveElement( const OUString& _rName, const Reference< XInterface >& /*_rxElement*/ )
+ void ObjectNameApproval::approveElement( const OUString& _rName, const Reference< XInterface >& /*_rxElement*/ )
{
Reference< XConnection > xConnection( m_pImpl->aConnection );
if ( !xConnection.is() )
diff --git a/editeng/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx
index 6a2cd65dd80f..ae43a2c55b42 100644
--- a/editeng/source/accessibility/AccessibleComponentBase.cxx
+++ b/editeng/source/accessibility/AccessibleComponentBase.cxx
@@ -140,7 +140,7 @@ OUString SAL_CALL AccessibleComponentBase::getToolTipText()
// XTypeProvider
-uno::Sequence<uno::Type> SAL_CALL
+uno::Sequence<uno::Type>
AccessibleComponentBase::getTypes()
{
// Get list of types from the context base implementation...
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index b13ec7100eb8..10805ce72564 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -481,19 +481,19 @@ namespace accessibility
}
// XAccessibleContext
- sal_Int32 SAL_CALL AccessibleStaticTextBase::getAccessibleChildCount()
+ sal_Int32 AccessibleStaticTextBase::getAccessibleChildCount()
{
// no children at all
return 0;
}
- uno::Reference< XAccessible > SAL_CALL AccessibleStaticTextBase::getAccessibleChild( sal_Int32 /*i*/ )
+ uno::Reference< XAccessible > AccessibleStaticTextBase::getAccessibleChild( sal_Int32 /*i*/ )
{
// no children at all
return uno::Reference< XAccessible >();
}
- uno::Reference< XAccessible > SAL_CALL AccessibleStaticTextBase::getAccessibleAtPoint( const awt::Point& /*_aPoint*/ )
+ uno::Reference< XAccessible > AccessibleStaticTextBase::getAccessibleAtPoint( const awt::Point& /*_aPoint*/ )
{
// no children at all
return uno::Reference< XAccessible >();
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx
index f7d441684205..93e9572b77d0 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.cxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx
@@ -173,7 +173,7 @@ namespace pcr
}
- Sequence< Property > SAL_CALL ButtonNavigationHandler::doDescribeSupportedProperties() const
+ Sequence< Property > ButtonNavigationHandler::doDescribeSupportedProperties() const
{
std::vector< Property > aProperties;
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.hxx b/extensions/source/propctrlr/buttonnavigationhandler.hxx
index a2f823d8e942..fed4722a56fb 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.hxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.hxx
@@ -64,7 +64,7 @@ namespace pcr
// PropertyHandler overridables
virtual css::uno::Sequence< css::beans::Property >
- SAL_CALL doDescribeSupportedProperties() const override;
+ doDescribeSupportedProperties() const override;
};
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx
index b45657864ab5..bb3ce64bd8f1 100644
--- a/extensions/source/propctrlr/cellbindinghandler.cxx
+++ b/extensions/source/propctrlr/cellbindinghandler.cxx
@@ -442,7 +442,7 @@ namespace pcr
}
- Sequence< Property > SAL_CALL CellBindingPropertyHandler::doDescribeSupportedProperties() const
+ Sequence< Property > CellBindingPropertyHandler::doDescribeSupportedProperties() const
{
std::vector< Property > aProperties;
diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx
index 33c5c81f19de..af42adb0281b 100644
--- a/extensions/source/propctrlr/cellbindinghandler.hxx
+++ b/extensions/source/propctrlr/cellbindinghandler.hxx
@@ -67,7 +67,7 @@ namespace pcr
// PropertyHandler overridables
virtual css::uno::Sequence< css::beans::Property >
- SAL_CALL doDescribeSupportedProperties() const override;
+ doDescribeSupportedProperties() const override;
virtual void onNewComponent() override;
private:
diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx
index 805ed2cf5583..e113b046c831 100644
--- a/extensions/source/propctrlr/composeduiupdate.hxx
+++ b/extensions/source/propctrlr/composeduiupdate.hxx
@@ -40,7 +40,7 @@ namespace pcr
{
public:
/// @throws css::uno::RuntimeException
- virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) = 0;
+ virtual bool hasPropertyByName( const OUString& _rName ) = 0;
protected:
~IPropertyExistenceCheck() {}
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx
index 4d28814c1e81..e8da2ca83a3a 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -210,7 +210,7 @@ namespace pcr
}
- Sequence< Property > SAL_CALL EditPropertyHandler::doDescribeSupportedProperties() const
+ Sequence< Property > EditPropertyHandler::doDescribeSupportedProperties() const
{
std::vector< Property > aProperties;
diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx
index 15dbffa07521..cd15c8a7d6d0 100644
--- a/extensions/source/propctrlr/editpropertyhandler.hxx
+++ b/extensions/source/propctrlr/editpropertyhandler.hxx
@@ -58,7 +58,7 @@ namespace pcr
// PropertyHandler overridables
virtual css::uno::Sequence< css::beans::Property >
- SAL_CALL doDescribeSupportedProperties() const override;
+ doDescribeSupportedProperties() const override;
private:
bool implHaveBothScrollBarProperties() const;
bool implHaveTextTypeProperty() const;
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index 645e4c7c1693..4ed56c0ff3fb 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -278,7 +278,7 @@ namespace pcr
}
- Sequence< Property > SAL_CALL EFormsPropertyHandler::doDescribeSupportedProperties() const
+ Sequence< Property > EFormsPropertyHandler::doDescribeSupportedProperties() const
{
std::vector< Property > aProperties;
diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx
index 0d7a9488e34a..ede7bee9819d 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.hxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.hxx
@@ -79,7 +79,7 @@ namespace pcr
// PropertyHandler overridables
virtual css::uno::Sequence< css::beans::Property >
- SAL_CALL doDescribeSupportedProperties() const override;
+ doDescribeSupportedProperties() const override;
virtual void onNewComponent() override;
protected:
diff --git a/extensions/source/propctrlr/enumrepresentation.hxx b/extensions/source/propctrlr/enumrepresentation.hxx
index aa8c1f5bd8ea..90428590e670 100644
--- a/extensions/source/propctrlr/enumrepresentation.hxx
+++ b/extensions/source/propctrlr/enumrepresentation.hxx
@@ -39,19 +39,19 @@ namespace pcr
public:
/** retrieves all descriptions of all possible values of the enumeration property
*/
- virtual std::vector< OUString > SAL_CALL getDescriptions(
+ virtual std::vector< OUString > getDescriptions(
) const = 0;
/** converts a given description into a property value
*/
- virtual void SAL_CALL getValueFromDescription(
+ virtual void getValueFromDescription(
const OUString& _rDescription,
css::uno::Any& _out_rValue
) const = 0;
/** converts a given property value into a description
*/
- virtual OUString SAL_CALL getDescriptionForValue(
+ virtual OUString getDescriptionForValue(
const css::uno::Any& _rEnumValue
) const = 0;
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index da9ad725451d..d1b0bca65e97 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -810,7 +810,7 @@ namespace pcr
FormComponentPropertyHandler_Base::removePropertyChangeListener( _rxListener );
}
- Sequence< Property > SAL_CALL FormComponentPropertyHandler::doDescribeSupportedProperties() const
+ Sequence< Property > FormComponentPropertyHandler::doDescribeSupportedProperties() const
{
if ( !m_xComponentPropertyInfo.is() )
return Sequence< Property >();
diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx
index 1bf8df0f152e..991449992de6 100644
--- a/extensions/source/propctrlr/formcomponenthandler.hxx
+++ b/extensions/source/propctrlr/formcomponenthandler.hxx
@@ -135,7 +135,7 @@ namespace pcr
// PropertyHandler
virtual css::uno::Sequence< css::beans::Property >
- SAL_CALL doDescribeSupportedProperties() const override;
+ doDescribeSupportedProperties() const override;
virtual void onNewComponent() override;
private:
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 31f7c0ec5860..dedd555dea19 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -232,7 +232,7 @@ namespace pcr
virtual void SAL_CALL disposing() override;
// PropertyHandler overridables
- virtual Sequence< Property > SAL_CALL doDescribeSupportedProperties() const override;
+ virtual Sequence< Property > doDescribeSupportedProperties() const override;
protected:
virtual void onNewComponent() override;
@@ -537,7 +537,7 @@ namespace pcr
}
- Sequence< Property > SAL_CALL FormGeometryHandler::doDescribeSupportedProperties() const
+ Sequence< Property > FormGeometryHandler::doDescribeSupportedProperties() const
{
if ( !m_xAssociatedShape.is() )
return Sequence< Property >();
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index fd831d55febc..0f8e6cc5b235 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -596,13 +596,13 @@ namespace pcr
}
- std::vector< OUString > SAL_CALL DefaultEnumRepresentation::getDescriptions() const
+ std::vector< OUString > DefaultEnumRepresentation::getDescriptions() const
{
return m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId );
}
- void SAL_CALL DefaultEnumRepresentation::getValueFromDescription( const OUString& _rDescription, Any& _out_rValue ) const
+ void DefaultEnumRepresentation::getValueFromDescription( const OUString& _rDescription, Any& _out_rValue ) const
{
sal_uInt32 nPropertyUIFlags = m_rMetaData.getPropertyUIFlags( m_nPropertyId );
std::vector< OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId );
@@ -645,7 +645,7 @@ namespace pcr
}
- OUString SAL_CALL DefaultEnumRepresentation::getDescriptionForValue( const Any& _rEnumValue ) const
+ OUString DefaultEnumRepresentation::getDescriptionForValue( const Any& _rEnumValue ) const
{
OUString sReturn;
sal_Int32 nIntValue = -1;
diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx
index 2f0370c64746..2cc6f5dbb399 100644
--- a/extensions/source/propctrlr/formmetadata.hxx
+++ b/extensions/source/propctrlr/formmetadata.hxx
@@ -88,9 +88,9 @@ namespace pcr
protected:
// IPropertyEnumRepresentation implementqation
virtual std::vector< OUString >
- SAL_CALL getDescriptions() const override;
- virtual void SAL_CALL getValueFromDescription( const OUString& _rDescription, css::uno::Any& _out_rValue ) const override;
- virtual OUString SAL_CALL getDescriptionForValue( const css::uno::Any& _rEnumValue ) const override;
+ getDescriptions() const override;
+ virtual void getValueFromDescription( const OUString& _rDescription, css::uno::Any& _out_rValue ) const override;
+ virtual OUString getDescriptionForValue( const css::uno::Any& _rEnumValue ) const override;
private:
DefaultEnumRepresentation( const DefaultEnumRepresentation& ) = delete;
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 859b7ae76eff..88d109d24f41 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -75,9 +75,9 @@ namespace pcr
// IPropertyEnumRepresentation implementqation
virtual std::vector< OUString >
- SAL_CALL getDescriptions() const override;
- virtual void SAL_CALL getValueFromDescription( const OUString& _rDescription, css::uno::Any& _out_rValue ) const override;
- virtual OUString SAL_CALL getDescriptionForValue( const css::uno::Any& _rEnumValue ) const override;
+ getDescriptions() const override;
+ virtual void getValueFromDescription( const OUString& _rDescription, css::uno::Any& _out_rValue ) const override;
+ virtual OUString getDescriptionForValue( const css::uno::Any& _rEnumValue ) const override;
private:
void impl_getValues( Sequence< sal_Int32 >& _out_rValues ) const;
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 6ee3d63b46f0..a3e7cc1f3a8c 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -1319,7 +1319,7 @@ namespace pcr
}
- bool SAL_CALL OPropertyBrowserController::hasPropertyByName( const OUString& _rName )
+ bool OPropertyBrowserController::hasPropertyByName( const OUString& _rName )
{
for ( OrderedPropertyMap::const_iterator search = m_aProperties.begin();
search != m_aProperties.end();
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index efb18ec27a84..e8358856c43e 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -205,7 +205,7 @@ namespace pcr
virtual void valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) override;
// IPropertyExistenceCheck
- virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) override;
+ virtual bool hasPropertyByName( const OUString& _rName ) override;
// XObjectInspectorUI
virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) override;
diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx
index 04c9bd82995c..2628cb03fc56 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -488,7 +488,7 @@ namespace pcr
}
- bool SAL_CALL PropertyComposer::hasPropertyByName( const OUString& _rName )
+ bool PropertyComposer::hasPropertyByName( const OUString& _rName )
{
return impl_isSupportedProperty_nothrow( _rName );
}
diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx
index 8f2f1fc102a5..08adeb1dab75 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -110,7 +110,7 @@ namespace pcr
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
// IPropertyExistenceCheck
- virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) override;
+ virtual bool hasPropertyByName( const OUString& _rName ) override;
private:
/** ensures that m_pUIRequestComposer exists
diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx
index 7711e6055af0..faad4b062f47 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -121,7 +121,7 @@ namespace pcr
// own overridables
virtual css::uno::Sequence< css::beans::Property >
- SAL_CALL doDescribeSupportedProperties() const = 0;
+ doDescribeSupportedProperties() const = 0;
/// called when XPropertyHandler::inspect has been called, and we thus have a new component to inspect
virtual void onNewComponent();
diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx
index 89d4b312b629..8c53f83a7c01 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -259,7 +259,7 @@ namespace pcr
}
- Sequence< Property > SAL_CALL SubmissionPropertyHandler::doDescribeSupportedProperties() const
+ Sequence< Property > SubmissionPropertyHandler::doDescribeSupportedProperties() const
{
std::vector< Property > aProperties;
if ( m_pHelper.get() )
diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx
index 47f18f12438e..9ce01a2f1d19 100644
--- a/extensions/source/propctrlr/submissionhandler.hxx
+++ b/extensions/source/propctrlr/submissionhandler.hxx
@@ -101,7 +101,7 @@ namespace pcr
// PropertyHandler overridables
virtual css::uno::Sequence< css::beans::Property >
- SAL_CALL doDescribeSupportedProperties() const override;
+ doDescribeSupportedProperties() const override;
virtual void onNewComponent() override;
private:
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
index ea1564525c8b..e49be9b60843 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
@@ -71,7 +71,7 @@ namespace pcr
// PropertyHandler overridables
virtual css::uno::Sequence< css::beans::Property >
- SAL_CALL doDescribeSupportedProperties() const override;
+ doDescribeSupportedProperties() const override;
virtual void onNewComponent() override;
private:
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 14fcbd9c5ea8..fe1dab768923 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -335,7 +335,7 @@ namespace svt
// XExecutableDialog functions
- void SAL_CALL OCommonPicker::setTitle( const OUString& _rTitle )
+ void OCommonPicker::setTitle( const OUString& _rTitle )
{
SolarMutexGuard aGuard;
m_aTitle = _rTitle;
diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx
index b95be28f5b9d..a533b4bb7a15 100644
--- a/i18npool/inc/breakiterator_ctl.hxx
+++ b/i18npool/inc/breakiterator_ctl.hxx
@@ -49,7 +49,7 @@ protected:
sal_Int32 cellIndexSize;
/// @throws css::uno::RuntimeException
- virtual void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos);
+ virtual void makeIndex(const OUString& text, sal_Int32 pos);
};
}
diff --git a/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx
index 2be6e30c2411..112d4327a56d 100644
--- a/i18npool/inc/breakiterator_th.hxx
+++ b/i18npool/inc/breakiterator_th.hxx
@@ -32,7 +32,7 @@ public:
virtual ~BreakIterator_th() override;
protected:
- void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) override;
+ void makeIndex(const OUString& text, sal_Int32 pos) override;
};
}
diff --git a/i18npool/source/breakiterator/breakiterator_ctl.cxx b/i18npool/source/breakiterator/breakiterator_ctl.cxx
index e39966e66175..4f4410e2f369 100644
--- a/i18npool/source/breakiterator/breakiterator_ctl.cxx
+++ b/i18npool/source/breakiterator/breakiterator_ctl.cxx
@@ -106,7 +106,7 @@ sal_Int32 SAL_CALL BreakIterator_CTL::nextCharacters(const OUString& Text,
}
// This method should be overwritten by derived language specific class.
-void SAL_CALL BreakIterator_CTL::makeIndex(const OUString& /*text*/, sal_Int32 /*pos*/)
+void BreakIterator_CTL::makeIndex(const OUString& /*text*/, sal_Int32 /*pos*/)
{
throw RuntimeException();
}
diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx
index 66e2827f3ac2..6e304cabd728 100644
--- a/i18npool/source/breakiterator/breakiterator_th.cxx
+++ b/i18npool/source/breakiterator/breakiterator_th.cxx
@@ -104,7 +104,7 @@ static sal_Int32 SAL_CALL getACell(const sal_Unicode *text, sal_Int32 pos, sal_I
#define is_Thai(c) (0x0e00 <= c && c <= 0x0e7f) // Unicode definition for Thai
-void SAL_CALL BreakIterator_th::makeIndex(const OUString& Text, sal_Int32 const nStartPos)
+void BreakIterator_th::makeIndex(const OUString& Text, sal_Int32 const nStartPos)
{
if (Text != cachedText) {
cachedText = Text;
diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx
index 4337a025843e..ead911083029 100644
--- a/include/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
@@ -176,7 +176,7 @@ namespace connectivity
void renameObject(const OUString& _sOldName, const OUString& _sNewName);
// only the name is identical to ::cppu::OComponentHelper
- virtual void SAL_CALL disposing();
+ virtual void disposing();
// dispatch the refcounting to the parent
virtual void SAL_CALL acquire() throw() override;
virtual void SAL_CALL release() throw() override;
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index d05ab0e24cdb..083e5a402ce2 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -204,7 +204,7 @@ public:
// XFilePickerListener methods
void FileSelectionChanged();
void DirectoryChanged();
- virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent );
+ virtual void ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent );
void DialogSizeChanged();
static OUString SAL_CALL HelpRequested( const css::ui::dialogs::FilePickerEvent& aEvent );
diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx
index 9b6db9a51420..f9dae4e2b44f 100644
--- a/sc/inc/AccessibleFilterMenu.hxx
+++ b/sc/inc/AccessibleFilterMenu.hxx
@@ -52,7 +52,7 @@ public:
ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos);
virtual ~ScAccessibleFilterMenu() override;
- virtual bool SAL_CALL isVisible() override;
+ virtual bool isVisible() override;
/// XAccessibleComponent
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index a7a5ac2d76f9..26c56e133ca9 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -75,7 +75,7 @@ ScAccessibleCellBase::~ScAccessibleCellBase()
//===== XAccessibleComponent ============================================
-bool SAL_CALL ScAccessibleCellBase::isVisible()
+bool ScAccessibleCellBase::isVisible()
{
SolarMutexGuard aGuard;
IsObjectValid();
@@ -204,7 +204,7 @@ sal_Int32
return mnIndex;
}
-OUString SAL_CALL
+OUString
ScAccessibleCellBase::createAccessibleDescription()
{
OUString sDescription = STR_ACC_CELL_DESCR;
@@ -212,7 +212,7 @@ OUString SAL_CALL
return sDescription;
}
-OUString SAL_CALL
+OUString
ScAccessibleCellBase::createAccessibleName()
{
// Document not needed, because only the cell address, but not the tablename is needed
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index a8057a10be71..4ba1d4f935cd 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -201,7 +201,7 @@ bool ScAccessibleContextBase::isShowing( )
return bShowing;
}
-bool SAL_CALL ScAccessibleContextBase::isVisible()
+bool ScAccessibleContextBase::isVisible()
{
return true;
}
@@ -452,14 +452,14 @@ uno::Sequence<sal_Int8> SAL_CALL
//===== internal ============================================================
-OUString SAL_CALL
+OUString
ScAccessibleContextBase::createAccessibleDescription()
{
OSL_FAIL("should be implemented in the abrevated class");
return OUString();
}
-OUString SAL_CALL ScAccessibleContextBase::createAccessibleName()
+OUString ScAccessibleContextBase::createAccessibleName()
{
OSL_FAIL("should be implemented in the abrevated class");
return OUString();
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 21c7685813df..3b4cef34f065 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -109,7 +109,7 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvControl::getAccessibleAtPoint(
return nullptr;
}
-bool SAL_CALL ScAccessibleCsvControl::isVisible()
+bool ScAccessibleCsvControl::isVisible()
{
SolarMutexGuard aGuard;
ensureAlive();
@@ -739,12 +739,12 @@ void ScAccessibleCsvRuler::SendCaretEvent()
// helpers --------------------------------------------------------------------
-OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleName()
+OUString ScAccessibleCsvRuler::createAccessibleName()
{
return ScResId( STR_ACC_CSVRULER_NAME );
}
-OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleDescription()
+OUString ScAccessibleCsvRuler::createAccessibleDescription()
{
return ScResId( STR_ACC_CSVRULER_DESCR );
}
@@ -1267,12 +1267,12 @@ void ScAccessibleCsvGrid::SendRemoveColumnEvent( sal_uInt32 nFirstColumn, sal_uI
// helpers --------------------------------------------------------------------
-OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleName()
+OUString ScAccessibleCsvGrid::createAccessibleName()
{
return ScResId( STR_ACC_CSVGRID_NAME );
}
-OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleDescription()
+OUString ScAccessibleCsvGrid::createAccessibleDescription()
{
return ScResId( STR_ACC_CSVGRID_DESCR );
}
@@ -1482,12 +1482,12 @@ tools::Rectangle ScAccessibleCsvCell::GetBoundingBox() const
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list