[Libreoffice-commits] core.git: basctl/source basic/source canvas/source chart2/inc chart2/source comphelper/source compilerplugins/clang connectivity/source cppuhelper/source cppu/source dbaccess/source desktop/source dtrans/source editeng/source extensions/source filter/source forms/source framework/inc framework/source hwpfilter/source i18npool/inc i18npool/source include/comphelper include/connectivity include/editeng include/framework include/package include/sax include/sfx2 include/svtools include/svx include/toolkit include/ucbhelper include/xmlscript lotuswordpro/source package/inc package/source reportdesign/source salhelper/source scripting/source sc/source sd/inc sd/source sfx2/source svtools/source svx/source sw/inc sw/source ucbhelper/source ucb/source unotools/source unoxml/source vbahelper/source vcl/inc vcl/qa vcl/source vcl/unx writerperfect/source xmlhelp/source xmloff/source xmlsecurity/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Dec 5 06:34:32 UTC 2017
basctl/source/dlged/dlgedobj.cxx | 10
basctl/source/inc/dlgedobj.hxx | 12 -
basic/source/inc/namecont.hxx | 2
basic/source/uno/namecont.cxx | 2
canvas/source/cairo/cairo_canvashelper.hxx | 2
canvas/source/opengl/ogl_canvashelper.hxx | 2
chart2/inc/ChartModel.hxx | 6
chart2/source/model/main/ChartModel.cxx | 2
chart2/source/model/main/ChartModel_Persistence.cxx | 4
chart2/source/model/template/ChartTypeTemplate.cxx | 2
chart2/source/model/template/ChartTypeTemplate.hxx | 2
comphelper/source/misc/accessiblecomponenthelper.cxx | 10
comphelper/source/misc/accessibleselectionhelper.cxx | 14 -
comphelper/source/property/opropertybag.hxx | 2
compilerplugins/clang/salcall.cxx | 31 --
compilerplugins/clang/test/salcall.cxx | 12 -
connectivity/source/commontools/paramwrapper.cxx | 2
connectivity/source/commontools/warningscontainer.cxx | 4
connectivity/source/cpool/ZConnectionPool.cxx | 2
connectivity/source/cpool/ZConnectionPool.hxx | 2
connectivity/source/drivers/dbase/DTable.cxx | 2
connectivity/source/drivers/firebird/ResultSet.cxx | 4
connectivity/source/drivers/firebird/ResultSet.hxx | 4
connectivity/source/drivers/mork/MConnection.cxx | 2
connectivity/source/drivers/mork/MConnection.hxx | 2
connectivity/source/drivers/mork/MDatabaseMetaData.cxx | 2
connectivity/source/drivers/mork/MDatabaseMetaData.hxx | 2
connectivity/source/drivers/mork/MResultSet.cxx | 2
connectivity/source/drivers/mork/MResultSet.hxx | 2
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx | 2
connectivity/source/inc/dbase/DTable.hxx | 2
cppu/source/uno/lbmap.cxx | 8
cppuhelper/source/weak.cxx | 4
dbaccess/source/core/api/KeySet.hxx | 2
dbaccess/source/core/dataaccess/ModelImpl.cxx | 6
dbaccess/source/core/dataaccess/datasource.cxx | 6
dbaccess/source/core/dataaccess/datasource.hxx | 4
dbaccess/source/core/dataaccess/intercept.cxx | 2
dbaccess/source/core/dataaccess/intercept.hxx | 2
dbaccess/source/core/inc/ModelImpl.hxx | 6
desktop/source/deployment/manager/dp_manager.h | 2
dtrans/source/cnttype/mcnttype.cxx | 24 +-
dtrans/source/cnttype/mcnttype.hxx | 24 +-
editeng/source/uno/unotext.cxx | 12 -
extensions/source/propctrlr/browserlistbox.cxx | 10
extensions/source/propctrlr/browserlistbox.hxx | 6
extensions/source/propctrlr/commoncontrol.cxx | 4
extensions/source/propctrlr/commoncontrol.hxx | 10
extensions/source/propctrlr/composeduiupdate.cxx | 6
extensions/source/propctrlr/composeduiupdate.hxx | 6
filter/source/t602/t602filter.cxx | 4
filter/source/t602/t602filter.hxx | 4
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 4
filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx | 4
filter/source/xsltfilter/LibXSLTTransformer.hxx | 16 -
filter/source/xsltfilter/OleHandler.cxx | 14 -
filter/source/xsltfilter/OleHandler.hxx | 14 -
forms/source/component/Columns.cxx | 4
forms/source/component/Columns.hxx | 4
forms/source/component/EditBase.hxx | 4
forms/source/component/errorbroadcaster.cxx | 6
forms/source/component/errorbroadcaster.hxx | 6
forms/source/helper/controlfeatureinterception.cxx | 4
forms/source/helper/formnavigation.cxx | 2
forms/source/inc/controlfeatureinterception.hxx | 6
forms/source/inc/formnavigation.hxx | 2
forms/source/inc/propertybaghelper.hxx | 2
framework/inc/helper/statusindicatorfactory.hxx | 8
framework/inc/recording/dispatchrecorder.hxx | 4
framework/inc/services/desktop.hxx | 2
framework/inc/uielement/constitemcontainer.hxx | 2
framework/source/accelerators/moduleacceleratorconfiguration.cxx | 2
framework/source/fwi/uielement/constitemcontainer.cxx | 2
framework/source/recording/dispatchrecorder.cxx | 4
framework/source/services/desktop.cxx | 2
framework/source/services/dispatchhelper.cxx | 2
framework/source/services/frame.cxx | 16 -
framework/source/uielement/uicommanddescription.cxx | 4
hwpfilter/source/hwpreader.hxx | 2
i18npool/inc/breakiteratorImpl.hxx | 4
i18npool/inc/breakiterator_unicode.hxx | 2
i18npool/inc/calendar_gregorian.hxx | 2
i18npool/inc/characterclassificationImpl.hxx | 6
i18npool/inc/collatorImpl.hxx | 6
i18npool/inc/defaultnumberingprovider.hxx | 4
i18npool/inc/indexentrysupplier.hxx | 4
i18npool/inc/indexentrysupplier_common.hxx | 2
i18npool/inc/inputsequencechecker.hxx | 2
i18npool/inc/localedata.hxx | 32 +-
i18npool/inc/nativenumbersupplier.hxx | 4
i18npool/inc/textToPronounce_zh.hxx | 2
i18npool/inc/textconversion.hxx | 8
i18npool/inc/textconversionImpl.hxx | 2
i18npool/inc/transliterationImpl.hxx | 4
i18npool/inc/transliteration_Numeric.hxx | 2
i18npool/inc/transliteration_body.hxx | 2
i18npool/inc/transliteration_caseignore.hxx | 2
i18npool/source/breakiterator/breakiteratorImpl.cxx | 4
i18npool/source/breakiterator/breakiterator_unicode.cxx | 2
i18npool/source/calendar/calendar_gregorian.cxx | 2
i18npool/source/characterclassification/characterclassificationImpl.cxx | 4
i18npool/source/collator/collatorImpl.cxx | 4
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 2
i18npool/source/indexentry/indexentrysupplier.cxx | 4
i18npool/source/indexentry/indexentrysupplier_common.cxx | 2
i18npool/source/inputchecker/inputsequencechecker.cxx | 2
i18npool/source/localedata/localedata.cxx | 36 +--
i18npool/source/nativenumber/nativenumbersupplier.cxx | 4
i18npool/source/search/textsearch.hxx | 2
i18npool/source/textconversion/textconversion.cxx | 2
i18npool/source/textconversion/textconversionImpl.cxx | 2
i18npool/source/textconversion/textconversion_ko.cxx | 2
i18npool/source/textconversion/textconversion_zh.cxx | 4
i18npool/source/transliteration/textToPronounce_zh.cxx | 2
i18npool/source/transliteration/transliterationImpl.cxx | 4
i18npool/source/transliteration/transliteration_Numeric.cxx | 2
i18npool/source/transliteration/transliteration_body.cxx | 2
i18npool/source/transliteration/transliteration_caseignore.cxx | 2
include/comphelper/accessiblecomponenthelper.hxx | 10
include/comphelper/accessibleselectionhelper.hxx | 14 -
include/comphelper/accessibletexthelper.hxx | 12 -
include/comphelper/interfacecontainer2.hxx | 18 -
include/connectivity/paramwrapper.hxx | 2
include/connectivity/warningscontainer.hxx | 4
include/editeng/unotext.hxx | 16 -
include/framework/dispatchhelper.hxx | 2
include/package/Deflater.hxx | 18 -
include/package/Inflater.hxx | 10
include/sax/tools/documenthandleradapter.hxx | 8
include/sfx2/filedlghelper.hxx | 8
include/sfx2/unoctitm.hxx | 4
include/svtools/accessibleruler.hxx | 2
include/svtools/popupmenucontrollerbase.hxx | 2
include/svx/AccessibleControlShape.hxx | 4
include/svx/AccessibleTextHelper.hxx | 2
include/svx/fmgridcl.hxx | 2
include/svx/unoshape.hxx | 18 -
include/toolkit/awt/vclxwindows.hxx | 4
include/ucbhelper/interactionrequest.hxx | 2
include/xmlscript/xml_helper.hxx | 10
lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 2
lotuswordpro/source/filter/LotusWordProImportFilter.hxx | 2
package/inc/ByteGrabber.hxx | 8
package/inc/CRC32.hxx | 10
package/inc/ZipEnumeration.hxx | 4
package/inc/ZipPackageStream.hxx | 2
package/source/xstor/xstorage.cxx | 2
package/source/xstor/xstorage.hxx | 2
package/source/zipapi/ByteGrabber.cxx | 8
package/source/zipapi/CRC32.cxx | 10
package/source/zipapi/Deflater.cxx | 16 -
package/source/zipapi/Inflater.cxx | 6
package/source/zipapi/MemoryByteGrabber.hxx | 2
package/source/zipapi/ZipEnumeration.cxx | 4
package/source/zippackage/ZipPackageStream.cxx | 2
reportdesign/source/core/api/ReportEngineJFree.cxx | 2
reportdesign/source/core/inc/ReportEngineJFree.hxx | 2
reportdesign/source/ui/dlg/GroupsSorting.cxx | 8
salhelper/source/timer.cxx | 8
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 8
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 2
sc/source/ui/inc/AccessibleCellBase.hxx | 8
sc/source/ui/inc/AccessibleContextBase.hxx | 2
sc/source/ui/vba/vbacomment.cxx | 8
sc/source/ui/vba/vbacomment.hxx | 8
sc/source/ui/vba/vbaglobals.hxx | 2
scripting/source/dlgprov/dlgprov.hxx | 2
scripting/source/stringresource/stringresource.hxx | 4
sd/inc/textapi.hxx | 2
sd/source/core/text/textapi.cxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 2
sd/source/ui/slideshow/slideshowimpl.hxx | 2
sd/source/ui/slideshow/slideshowviewimpl.cxx | 2
sd/source/ui/slideshow/slideshowviewimpl.hxx | 2
sfx2/source/bastyp/fltlst.cxx | 4
sfx2/source/bastyp/fltlst.hxx | 4
sfx2/source/control/unoctitm.cxx | 4
sfx2/source/dialog/filedlghelper.cxx | 8
sfx2/source/doc/SfxDocumentMetaData.cxx | 48 ++--
svtools/source/control/accessibleruler.cxx | 2
svtools/source/uno/popupmenucontrollerbase.cxx | 2
svx/source/accessibility/AccessibleControlShape.cxx | 2
svx/source/accessibility/AccessibleTextHelper.cxx | 20 -
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 2
svx/source/accessibility/charmapacc.cxx | 2
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 2
svx/source/form/fmscriptingenv.cxx | 4
svx/source/inc/GraphCtlAccessibleContext.hxx | 2
svx/source/inc/charmapacc.hxx | 6
svx/source/inc/svxrectctaccessiblecontext.hxx | 2
svx/source/svdraw/svdograf.cxx | 2
svx/source/unodraw/UnoNameItemTable.cxx | 2
svx/source/unodraw/UnoNameItemTable.hxx | 2
svx/source/unodraw/unomtabl.cxx | 4
svx/source/unodraw/unoshape.cxx | 16 -
svx/source/unodraw/unoshtxt.cxx | 8
sw/inc/unochart.hxx | 4
sw/inc/unostyle.hxx | 2
sw/inc/unotbl.hxx | 2
sw/source/core/access/acccontext.cxx | 4
sw/source/core/access/acccontext.hxx | 4
sw/source/core/inc/unometa.hxx | 2
sw/source/core/inc/unoport.hxx | 6
sw/source/core/unocore/unoport.cxx | 6
sw/source/core/unocore/unorefmk.cxx | 2
sw/source/core/unocore/unosect.cxx | 4
ucb/source/cacher/cachedcontentresultset.cxx | 54 ++--
ucb/source/cacher/cachedcontentresultset.hxx | 42 +--
ucb/source/cacher/cachedcontentresultsetstub.cxx | 6
ucb/source/cacher/cachedcontentresultsetstub.hxx | 6
ucb/source/cacher/contentresultsetwrapper.cxx | 24 +-
ucb/source/cacher/contentresultsetwrapper.hxx | 24 +-
ucb/source/cacher/dynamicresultsetwrapper.cxx | 10
ucb/source/cacher/dynamicresultsetwrapper.hxx | 10
ucb/source/sorter/sortdynres.cxx | 2
ucb/source/sorter/sortdynres.hxx | 2
ucb/source/ucp/file/bc.cxx | 18 -
ucb/source/ucp/file/bc.hxx | 18 -
ucb/source/ucp/file/filinl.hxx | 16 -
ucb/source/ucp/file/filinpstr.hxx | 4
ucb/source/ucp/file/filnot.cxx | 4
ucb/source/ucp/file/filnot.hxx | 4
ucb/source/ucp/file/filrset.cxx | 2
ucb/source/ucp/file/filrset.hxx | 6
ucb/source/ucp/file/filstr.cxx | 2
ucb/source/ucp/file/filstr.hxx | 6
ucb/source/ucp/file/filtask.cxx | 80 +++----
ucb/source/ucp/file/filtask.hxx | 110 +++++-----
ucb/source/ucp/file/prov.cxx | 4
ucb/source/ucp/file/prov.hxx | 4
ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 2
ucb/source/ucp/hierarchy/hierarchydatasource.hxx | 2
ucbhelper/source/provider/interactionrequest.cxx | 2
unotools/source/config/eventcfg.cxx | 20 -
unoxml/source/dom/documentbuilder.cxx | 2
unoxml/source/dom/documentbuilder.hxx | 2
unoxml/source/rdf/CURI.cxx | 4
vbahelper/source/msforms/vbalistcontrolhelper.cxx | 12 -
vbahelper/source/msforms/vbalistcontrolhelper.hxx | 12 -
vcl/inc/canvasbitmap.hxx | 2
vcl/qa/cppunit/canvasbitmaptest.cxx | 2
vcl/source/helper/canvasbitmap.cxx | 2
vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 6
vcl/unx/gtk/fpicker/SalGtkPicker.hxx | 6
writerperfect/source/writer/WordPerfectImportFilter.cxx | 2
writerperfect/source/writer/WordPerfectImportFilter.hxx | 2
xmlhelp/source/cxxhelp/inc/tvread.hxx | 2
xmlhelp/source/cxxhelp/provider/inputstream.hxx | 2
xmlhelp/source/treeview/tvread.cxx | 2
xmloff/source/transform/OOo2Oasis.cxx | 2
xmloff/source/transform/OOo2Oasis.hxx | 2
xmlsecurity/source/component/certificatecontainer.hxx | 4
252 files changed, 840 insertions(+), 849 deletions(-)
New commits:
commit 9a06b99d2f53bd8d0a9ab0936efed9924a2abb88
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Dec 4 14:20:26 2017 +0200
loplugin:salcall fix non-virtual methods
first, since those are safer to change than virtual methods
Change-Id: Ie3b624019d75ee2b793cee33b3c5f64e994e8bfe
Reviewed-on: https://gerrit.libreoffice.org/45798
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index f61986d62592..167c48c35cc7 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -441,7 +441,7 @@ void DlgEdObj::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
SetRectFromProps();
}
-void SAL_CALL DlgEdObj::NameChange( const css::beans::PropertyChangeEvent& evt )
+void DlgEdObj::NameChange( const css::beans::PropertyChangeEvent& evt )
{
// get old name
OUString aOldName;
@@ -1100,7 +1100,7 @@ void DlgEdObj::EndListening(bool bRemoveListener)
}
}
-void SAL_CALL DlgEdObj::_propertyChange( const css::beans::PropertyChangeEvent& evt )
+void DlgEdObj::_propertyChange( const css::beans::PropertyChangeEvent& evt )
{
if (isListening())
{
@@ -1156,7 +1156,7 @@ void SAL_CALL DlgEdObj::_propertyChange( const css::beans::PropertyChangeEvent&
}
}
-void SAL_CALL DlgEdObj::_elementInserted()
+void DlgEdObj::_elementInserted()
{
if (isListening())
{
@@ -1165,7 +1165,7 @@ void SAL_CALL DlgEdObj::_elementInserted()
}
}
-void SAL_CALL DlgEdObj::_elementReplaced()
+void DlgEdObj::_elementReplaced()
{
if (isListening())
{
@@ -1174,7 +1174,7 @@ void SAL_CALL DlgEdObj::_elementReplaced()
}
}
-void SAL_CALL DlgEdObj::_elementRemoved()
+void DlgEdObj::_elementRemoved()
{
if (isListening())
{
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx
index 86a2f715350f..c59e69c22289 100644
--- a/basctl/source/inc/dlgedobj.hxx
+++ b/basctl/source/inc/dlgedobj.hxx
@@ -117,21 +117,21 @@ public:
virtual void PositionAndSizeChange( const css::beans::PropertyChangeEvent& evt );
/// @throws css::container::NoSuchElementException
/// @throws css::uno::RuntimeException
- void SAL_CALL NameChange( const css::beans::PropertyChangeEvent& evt );
+ void NameChange( const css::beans::PropertyChangeEvent& evt );
/// @throws css::uno::RuntimeException
- void SAL_CALL TabIndexChange( const css::beans::PropertyChangeEvent& evt );
+ void TabIndexChange( const css::beans::PropertyChangeEvent& evt );
// PropertyChangeListener
/// @throws css::uno::RuntimeException
- void SAL_CALL _propertyChange(const css::beans::PropertyChangeEvent& evt);
+ void _propertyChange(const css::beans::PropertyChangeEvent& evt);
// ContainerListener
/// @throws css::uno::RuntimeException
- void SAL_CALL _elementInserted();
+ void _elementInserted();
/// @throws css::uno::RuntimeException
- void SAL_CALL _elementReplaced();
+ void _elementReplaced();
/// @throws css::uno::RuntimeException
- void SAL_CALL _elementRemoved();
+ void _elementRemoved();
virtual void SetLayer(SdrLayerID nLayer) override;
void MakeDataAware( const css::uno::Reference< css::frame::XModel >& xModel );
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 203660ae6ff0..f1cca76f44d5 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -332,7 +332,7 @@ protected:
const css::uno::Reference< css::embed::XStorage >& xStorage,
bool bComplete );
- void SAL_CALL initializeFromDocument( const css::uno::Reference< css::document::XStorageBasedDocument >& _rxDocument );
+ void initializeFromDocument( const css::uno::Reference< css::document::XStorageBasedDocument >& _rxDocument );
// OEventListenerAdapter
virtual void _disposing( const css::lang::EventObject& _rSource ) override;
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 4010259771c4..b5853950aeef 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -2642,7 +2642,7 @@ void SAL_CALL SfxLibraryContainer::initialize( const Sequence< Any >& _rArgument
throw IllegalArgumentException();
}
-void SAL_CALL SfxLibraryContainer::initializeFromDocument( const Reference< XStorageBasedDocument >& _rxDocument )
+void SfxLibraryContainer::initializeFromDocument( const Reference< XStorageBasedDocument >& _rxDocument )
{
// check whether this is a valid OfficeDocument, and obtain the document's root storage
Reference< XStorage > xDocStorage;
diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx
index 0773b59021f8..36860c0830f7 100644
--- a/canvas/source/cairo/cairo_canvashelper.hxx
+++ b/canvas/source/cairo/cairo_canvashelper.hxx
@@ -154,7 +154,7 @@ namespace cairocanvas
const css::uno::Sequence< css::rendering::Texture >& textures,
const css::uno::Reference< css::geometry::XMapping2D >& xMapping );
- css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL
+ css::uno::Reference< css::rendering::XCanvasFont >
createFont( const css::rendering::XCanvas* pCanvas,
const css::rendering::FontRequest& fontRequest,
const css::uno::Sequence< css::beans::PropertyValue >& extraFontProperties,
diff --git a/canvas/source/opengl/ogl_canvashelper.hxx b/canvas/source/opengl/ogl_canvashelper.hxx
index fdc8698c9173..afdceb74458d 100644
--- a/canvas/source/opengl/ogl_canvashelper.hxx
+++ b/canvas/source/opengl/ogl_canvashelper.hxx
@@ -137,7 +137,7 @@ namespace oglcanvas
const css::uno::Reference<
css::geometry::XMapping2D >& xMapping );
- css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL
+ css::uno::Reference< css::rendering::XCanvasFont >
createFont( const css::rendering::XCanvas* pCanvas,
const css::rendering::FontRequest& fontRequest,
const css::uno::Sequence<
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index d13c672dccd9..063e3fc6a72b 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -187,13 +187,13 @@ private:
impl_getCurrentController();
/// @throws css::uno::RuntimeException
- void SAL_CALL
+ void
impl_notifyModifiedListeners();
/// @throws css::uno::RuntimeException
- void SAL_CALL
+ void
impl_notifyCloseListeners();
/// @throws css::uno::RuntimeException
- void SAL_CALL
+ void
impl_notifyStorageChangeListeners();
void impl_store(
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 4c25a63c63f1..055f3a94fe50 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -261,7 +261,7 @@ uno::Reference< frame::XController > ChartModel::impl_getCurrentController()
return uno::Reference< frame::XController > ();
}
-void SAL_CALL ChartModel::impl_notifyCloseListeners()
+void ChartModel::impl_notifyCloseListeners()
{
::cppu::OInterfaceContainerHelper* pIC = m_aLifeTimeManager.m_aListenerContainer
.getContainer( cppu::UnoType<util::XCloseListener>::get());
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 213d87f42f9d..946569312380 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -637,7 +637,7 @@ void ChartModel::impl_loadGraphics(
}
// util::XModifiable
-void SAL_CALL ChartModel::impl_notifyModifiedListeners()
+void ChartModel::impl_notifyModifiedListeners()
{
{
MutexGuard aGuard( m_aModelMutex );
@@ -772,7 +772,7 @@ Reference< embed::XStorage > SAL_CALL ChartModel::getDocumentStorage()
return m_xStorage;
}
-void SAL_CALL ChartModel::impl_notifyStorageChangeListeners()
+void ChartModel::impl_notifyStorageChangeListeners()
{
::cppu::OInterfaceContainerHelper* pIC = m_aLifeTimeManager.m_aListenerContainer
.getContainer( cppu::UnoType<document::XStorageChangeListener>::get());
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index b06adcdfbda6..aacb8971c967 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -415,7 +415,7 @@ void SAL_CALL ChartTypeTemplate::applyStyle(
}
}
-void SAL_CALL ChartTypeTemplate::applyStyles( const Reference< chart2::XDiagram >& xDiagram )
+void ChartTypeTemplate::applyStyles( const Reference< chart2::XDiagram >& xDiagram )
{
// apply chart-type specific styles, like "symbols on" for example
Sequence< Sequence< Reference< XDataSeries > > > aNewSeriesSeq(
diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx
index 6dacf519101c..3567066d6066 100644
--- a/chart2/source/model/template/ChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ChartTypeTemplate.hxx
@@ -107,7 +107,7 @@ protected:
const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override;
/// @throws css::uno::RuntimeException
- void SAL_CALL applyStyles(
+ void applyStyles(
const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
// ____ XServiceName ____
diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx
index ab01665afcf3..7be140511702 100644
--- a/comphelper/source/misc/accessiblecomponenthelper.cxx
+++ b/comphelper/source/misc/accessiblecomponenthelper.cxx
@@ -39,7 +39,7 @@ namespace comphelper
}
- bool SAL_CALL OCommonAccessibleComponent::containsPoint( const Point& _rPoint )
+ bool OCommonAccessibleComponent::containsPoint( const Point& _rPoint )
{
OExternalLockGuard aGuard( this );
Rectangle aBounds( implGetBounds() );
@@ -50,7 +50,7 @@ namespace comphelper
}
- Point SAL_CALL OCommonAccessibleComponent::getLocation( )
+ Point OCommonAccessibleComponent::getLocation( )
{
OExternalLockGuard aGuard( this );
Rectangle aBounds( implGetBounds() );
@@ -58,7 +58,7 @@ namespace comphelper
}
- Point SAL_CALL OCommonAccessibleComponent::getLocationOnScreen( )
+ Point OCommonAccessibleComponent::getLocationOnScreen( )
{
OExternalLockGuard aGuard( this );
@@ -78,7 +78,7 @@ namespace comphelper
}
- Size SAL_CALL OCommonAccessibleComponent::getSize( )
+ Size OCommonAccessibleComponent::getSize( )
{
OExternalLockGuard aGuard( this );
Rectangle aBounds( implGetBounds() );
@@ -86,7 +86,7 @@ namespace comphelper
}
- Rectangle SAL_CALL OCommonAccessibleComponent::getBounds( )
+ Rectangle OCommonAccessibleComponent::getBounds( )
{
OExternalLockGuard aGuard( this );
return implGetBounds();
diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx b/comphelper/source/misc/accessibleselectionhelper.cxx
index c19079226207..967c1b079e48 100644
--- a/comphelper/source/misc/accessibleselectionhelper.cxx
+++ b/comphelper/source/misc/accessibleselectionhelper.cxx
@@ -36,31 +36,31 @@ namespace comphelper
OCommonAccessibleSelection::~OCommonAccessibleSelection() {}
- void SAL_CALL OCommonAccessibleSelection::selectAccessibleChild( sal_Int32 nChildIndex )
+ void OCommonAccessibleSelection::selectAccessibleChild( sal_Int32 nChildIndex )
{
implSelect( nChildIndex, true );
}
- bool SAL_CALL OCommonAccessibleSelection::isAccessibleChildSelected( sal_Int32 nChildIndex )
+ bool OCommonAccessibleSelection::isAccessibleChildSelected( sal_Int32 nChildIndex )
{
return implIsSelected( nChildIndex );
}
- void SAL_CALL OCommonAccessibleSelection::clearAccessibleSelection( )
+ void OCommonAccessibleSelection::clearAccessibleSelection( )
{
implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, false );
}
- void SAL_CALL OCommonAccessibleSelection::selectAllAccessibleChildren( )
+ void OCommonAccessibleSelection::selectAllAccessibleChildren( )
{
implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, true );
}
- sal_Int32 SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChildCount( )
+ sal_Int32 OCommonAccessibleSelection::getSelectedAccessibleChildCount( )
{
sal_Int32 nRet = 0;
Reference< XAccessibleContext > xParentContext( implGetAccessibleContext() );
@@ -78,7 +78,7 @@ namespace comphelper
}
- Reference< XAccessible > SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
+ Reference< XAccessible > OCommonAccessibleSelection::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
{
Reference< XAccessible > xRet;
Reference< XAccessibleContext > xParentContext( implGetAccessibleContext() );
@@ -96,7 +96,7 @@ namespace comphelper
}
- void SAL_CALL OCommonAccessibleSelection::deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
+ void OCommonAccessibleSelection::deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
{
implSelect( nSelectedChildIndex, false );
}
diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx
index 956657a33910..4c797105ce4f 100644
--- a/comphelper/source/property/opropertybag.hxx
+++ b/comphelper/source/property/opropertybag.hxx
@@ -174,7 +174,7 @@ namespace comphelper
sal_Bool bVetoable,
bool bIgnoreRuntimeExceptionsWhileFiring) override;
- void SAL_CALL setModifiedImpl( bool bModified,
+ void setModifiedImpl( bool bModified,
bool bIgnoreRuntimeExceptionsWhileFiring);
/** finds a free property handle
diff --git a/compilerplugins/clang/salcall.cxx b/compilerplugins/clang/salcall.cxx
index 2c34f8281b96..071e3a87841a 100644
--- a/compilerplugins/clang/salcall.cxx
+++ b/compilerplugins/clang/salcall.cxx
@@ -202,13 +202,13 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
}
}
- if (!bDeclIsSalCall)
+ if (!bCanonicalDeclIsSalCall)
return true;
// @TODO For now, I am ignore free functions, since those are most likely to have their address taken.
- // I'll do these later. They are harder to verify since MSVC does not verify when assigning to function pointers
+ // 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())
+ if (!methodDecl || methodDecl->isStatic() || methodDecl->isVirtual())
return true;
// can only check when we have a definition since this is the most likely time
@@ -234,21 +234,6 @@ 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)
- {
- if (loplugin::DeclCheck(recordDecl)
- .Class("OProxyAggregation")
- .Namespace("comphelper")
- .GlobalNamespace()
- || loplugin::DeclCheck(recordDecl)
- .Class("OComponentProxyAggregationHelper")
- .Namespace("comphelper")
- .GlobalNamespace()
- || loplugin::DeclCheck(recordDecl).Class("SvxShapeMaster").GlobalNamespace())
- return true;
- }
-
if (methodDecl)
{
for (auto iter = methodDecl->begin_overridden_methods();
@@ -260,7 +245,6 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
}
}
- /*
bool bOK = rewrite(rewriteLoc);
if (bOK && canonicalDecl != decl)
{
@@ -269,13 +253,12 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
if (bOK)
return true;
- //std::cout << "xxx:" << std::string(p1, leftBracket - p1) << std::endl;
report(DiagnosticsEngine::Warning, "SAL_CALL unnecessary here", rewriteLoc)
<< decl->getSourceRange();
if (canonicalDecl != decl)
report(DiagnosticsEngine::Warning, "SAL_CALL unnecessary here", rewriteCanonicalLoc)
<< canonicalDecl->getSourceRange();
-*/
+
return true;
}
@@ -333,8 +316,12 @@ bool SalCall::rewrite(SourceLocation locBegin)
{
if (!rewriter)
return false;
+ if (!locBegin.isValid())
+ return false;
auto locEnd = locBegin.getLocWithOffset(8);
+ if (!locEnd.isValid())
+ return false;
SourceRange range(locBegin, locEnd);
@@ -368,7 +355,7 @@ bool SalCall::checkOverlap(SourceRange range)
}
#endif
-static loplugin::Plugin::Registration<SalCall> reg("salcall", true);
+static loplugin::Plugin::Registration<SalCall> reg("salcall", false);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/salcall.cxx b/compilerplugins/clang/test/salcall.cxx
index 3b05530e8097..92172ab9e3df 100644
--- a/compilerplugins/clang/test/salcall.cxx
+++ b/compilerplugins/clang/test/salcall.cxx
@@ -11,10 +11,11 @@
class Class1
{
- void SAL_CALL method1(); // xxexpected-error {{SAL_CALL unnecessary here [loplugin:salcall]}}
+ void SAL_CALL method1(); // expected-error {{SAL_CALL unnecessary here [loplugin:salcall]}}
};
-void SAL_CALL Class1::method1() {
-} // xxexpected-error {{SAL_CALL unnecessary here [loplugin:salcall]}}
+void SAL_CALL Class1::method1()
+{ // expected-error at -1 {{SAL_CALL unnecessary here [loplugin:salcall]}}
+}
class Class2
{
@@ -22,12 +23,15 @@ class Class2
};
void SAL_CALL Class2::method1() {} // expected-note {{SAL_CALL inconsistency [loplugin:salcall]}}
+// comment this out because it seems to generate a warning in some internal buffer of clang that I can't annotate
+#if 0
// no warning, this appears to be legal
class Class3
{
- void SAL_CALL method1();
+ void SAL_CALL method1(); // expected-error {{SAL_CALL unnecessary here [loplugin:salcall]}}
};
void Class3::method1() {}
+#endif
// no warning, normal case for reference
class Class4
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 8185b34ce2eb..25e45cd94946 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -245,7 +245,7 @@ namespace param
}
- void SAL_CALL ParameterWrapper::dispose()
+ void ParameterWrapper::dispose()
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx
index 2e7d6244c052..50d706e55f18 100644
--- a/connectivity/source/commontools/warningscontainer.cxx
+++ b/connectivity/source/commontools/warningscontainer.cxx
@@ -74,7 +74,7 @@ namespace dbtools
}
- Any SAL_CALL WarningsContainer::getWarnings( ) const
+ Any WarningsContainer::getWarnings( ) const
{
Any aAllWarnings;
if ( m_xExternalWarnings.is() )
@@ -87,7 +87,7 @@ namespace dbtools
}
- void SAL_CALL WarningsContainer::clearWarnings( )
+ void WarningsContainer::clearWarnings( )
{
if ( m_xExternalWarnings.is() )
m_xExternalWarnings->clearWarnings();
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index cfa16ca44e2a..d6d1c8f3ee13 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -151,7 +151,7 @@ m_xDriverNode.clear();
m_xDriver.clear();
}
-Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo )
+Reference< XConnection > OConnectionPool::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo )
{
MutexGuard aGuard(m_aMutex);
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index b23db6005fa4..a678dd352de9 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -139,7 +139,7 @@ namespace connectivity
void clear(bool _bDispose);
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info );
+ css::uno::Reference< css::sdbc::XConnection > getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info );
// XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
// XPropertyChangeListener
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 3629bfebdb5d..8361e29c8faa 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2317,7 +2317,7 @@ namespace
}
}
-void SAL_CALL ODbaseTable::renameImpl( const OUString& newName )
+void ODbaseTable::renameImpl( const OUString& newName )
{
::osl::MutexGuard aGuard(m_aMutex);
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index abb0c03b8be0..7a515d46a536 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -278,7 +278,7 @@ sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row)
}
}
-void SAL_CALL OResultSet::checkColumnIndex(sal_Int32 nIndex)
+void OResultSet::checkColumnIndex(sal_Int32 nIndex)
{
MutexGuard aGuard(m_rMutex);
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -292,7 +292,7 @@ void SAL_CALL OResultSet::checkColumnIndex(sal_Int32 nIndex)
}
}
-void SAL_CALL OResultSet::checkRowIndex()
+void OResultSet::checkRowIndex()
{
MutexGuard aGuard(m_rMutex);
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx
index 75b0d6fcd60d..a7142451c54b 100644
--- a/connectivity/source/drivers/firebird/ResultSet.hxx
+++ b/connectivity/source/drivers/firebird/ResultSet.hxx
@@ -115,10 +115,10 @@ namespace connectivity
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- void SAL_CALL checkColumnIndex( sal_Int32 index );
+ void checkColumnIndex( sal_Int32 index );
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- void SAL_CALL checkRowIndex();
+ void checkRowIndex();
// you can't delete objects of this type
virtual ~OResultSet() override;
diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx
index 3f861f6045a3..95718217d445 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -353,7 +353,7 @@ void OConnection::disposing()
m_xCatalog.clear();
}
-Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog()
+Reference< XTablesSupplier > OConnection::createCatalog()
{
::osl::MutexGuard aGuard( m_aMutex );
Reference< XTablesSupplier > xTab = m_xCatalog;
diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx
index f83f265f5780..3c2b2f179b10 100644
--- a/connectivity/source/drivers/mork/MConnection.hxx
+++ b/connectivity/source/drivers/mork/MConnection.hxx
@@ -92,7 +92,7 @@ namespace connectivity
// Added to enable me to use SQLInterpreter which requires an
// XNameAccess i/f to access tables.
- css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog();
+ css::uno::Reference< css::sdbcx::XTablesSupplier > createCatalog();
void throwSQLException( const ErrorDescriptor& _rError, const css::uno::Reference< css::uno::XInterface >& _rxContext );
void throwSQLException( const char* pErrorResourceId, const css::uno::Reference< css::uno::XInterface >& _rxContext );
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 585d0bc61d9a..09d3c0d229c4 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -49,7 +49,7 @@ ODatabaseMetaData::~ODatabaseMetaData()
}
-ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows(
+ODatabaseMetaDataResultSet::ORows& ODatabaseMetaData::getColumnRows(
const OUString& tableNamePattern,
const OUString& columnNamePattern )
{
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
index cda03805e0b1..edad3a74aeaf 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
@@ -29,7 +29,7 @@ namespace connectivity
m_pMetaDataHelper;
/// @throws css::sdbc::SQLException
- ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern );
+ ODatabaseMetaDataResultSet::ORows& getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern );
protected:
virtual ~ODatabaseMetaData() override;
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 1312926f6d1d..9234bdc39a36 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -1037,7 +1037,7 @@ sal_Int32 OResultSet::getRowForCardNumber(sal_Int32 nCardNum)
return 0;
}
-void SAL_CALL OResultSet::executeQuery()
+void OResultSet::executeQuery()
{
ResultSetEntryGuard aGuard( *this );
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx
index 5c040c9aabeb..da287247c653 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -279,7 +279,7 @@ public:
// MozAddressbook Specific methods
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- void SAL_CALL executeQuery();
+ void executeQuery();
void setTable(OTable* _rTable);
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
index 9918180a473f..a9f447739a4b 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
@@ -78,7 +78,7 @@ namespace connectivity
/// @throws css::uno::RuntimeException
OUString getDefaultProfile( css::mozilla::MozillaProductType product );
/// @throws css::uno::RuntimeException
- bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName );
+ bool getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName );
private:
ProductStruct m_ProductProfileList[4];
void LoadProductsInfo();
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index 9fa3499a1218..962a66a48f63 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -133,7 +133,7 @@ namespace connectivity
/// @throws css::sdbc::SQLException
/// @throws css::container::ElementExistException
/// @throws css::uno::RuntimeException
- void SAL_CALL renameImpl( const OUString& newName );
+ void renameImpl( const OUString& newName );
void throwInvalidColumnType(const char* pErrorId, const OUString& _sColumnName);
protected:
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 4bdf0a6d6d8e..74e167eb336c 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -64,8 +64,8 @@ public:
Mapping(Mapping && other): _pMapping(other._pMapping)
{ other._pMapping = nullptr; }
inline ~Mapping();
- inline Mapping & SAL_CALL operator = ( uno_Mapping * pMapping );
- Mapping & SAL_CALL operator = ( const Mapping & rMapping )
+ inline Mapping & operator = ( uno_Mapping * pMapping );
+ Mapping & operator = ( const Mapping & rMapping )
{ return operator = ( rMapping._pMapping ); }
Mapping & operator =(Mapping && other) {
if (_pMapping != nullptr) {
@@ -75,9 +75,9 @@ public:
other._pMapping = nullptr;
return *this;
}
- uno_Mapping * SAL_CALL get() const
+ uno_Mapping * get() const
{ return _pMapping; }
- bool SAL_CALL is() const
+ bool is() const
{ return (_pMapping != nullptr); }
};
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index acbbb94a4551..fb2ccfdfe5d7 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -76,7 +76,7 @@ public:
/// Called from the weak object if the reference count goes to zero.
///
/// @throws css::uno::RuntimeException
- void SAL_CALL dispose();
+ void dispose();
private:
virtual ~OWeakConnectionPoint() {}
@@ -109,7 +109,7 @@ void SAL_CALL OWeakConnectionPoint::release() throw()
delete this;
}
-void SAL_CALL OWeakConnectionPoint::dispose()
+void OWeakConnectionPoint::dispose()
{
std::vector<Reference<XReference>> aCopy;
{ // only hold the mutex while we access the field
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index d72643385d87..45262f53d5d3 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -198,7 +198,7 @@ namespace dbaccess
virtual bool SAL_CALL previous( ) override;
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- void SAL_CALL ensureRowForData( );
+ void ensureRowForData( );
virtual void SAL_CALL refreshRow( ) override;
// css::sdbcx::XRowLocate
virtual css::uno::Any SAL_CALL getBookmark() override;
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 48643a9c4892..766eafdcb725 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -623,7 +623,7 @@ void ODatabaseModelImpl::reset()
}
}
-void SAL_CALL ODatabaseModelImpl::disposing( const css::lang::EventObject& Source )
+void ODatabaseModelImpl::disposing( const css::lang::EventObject& Source )
{
Reference<XConnection> xCon(Source.Source,UNO_QUERY);
if ( xCon.is() )
@@ -975,12 +975,12 @@ Reference< XModel > ODatabaseModelImpl::createNewModel_deliverOwnership()
return xModel;
}
-void SAL_CALL ODatabaseModelImpl::acquire()
+void ODatabaseModelImpl::acquire()
{
osl_atomic_increment(&m_refCount);
}
-void SAL_CALL ODatabaseModelImpl::release()
+void ODatabaseModelImpl::release()
{
if ( osl_atomic_decrement(&m_refCount) == 0 )
{
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 2e5d452b616c..eeeb9850f68e 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -119,7 +119,7 @@ protected:
FlushNotificationAdapter( const Reference< XFlushable >& _rxBroadcaster, const Reference< XFlushListener >& _rxListener );
virtual ~FlushNotificationAdapter() override;
- void SAL_CALL impl_dispose();
+ void impl_dispose();
protected:
// XFlushListener
@@ -147,7 +147,7 @@ FlushNotificationAdapter::~FlushNotificationAdapter()
{
}
-void SAL_CALL FlushNotificationAdapter::impl_dispose()
+void FlushNotificationAdapter::impl_dispose()
{
Reference< XFlushListener > xKeepAlive( this );
@@ -1021,7 +1021,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnectionWithComp
return connectWithCompletion(_rxHandler,true);
}
-Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler,bool _bIsolated )
+Reference< XConnection > ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler,bool _bIsolated )
{
ModelMethodGuard aGuard( *this );
diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx
index c513064a2dd5..7d6401922271 100644
--- a/dbaccess/source/core/dataaccess/datasource.hxx
+++ b/dbaccess/source/core/dataaccess/datasource.hxx
@@ -202,10 +202,10 @@ private:
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password , bool _bIsolated);
+ css::uno::Reference< css::sdbc::XConnection > getConnection( const OUString& user, const OUString& password , bool _bIsolated);
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- css::uno::Reference< css::sdbc::XConnection > SAL_CALL connectWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler , bool _bIsolated);
+ css::uno::Reference< css::sdbc::XConnection > connectWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler , bool _bIsolated);
protected:
using ::cppu::OPropertySetHelper::getFastPropertyValue;
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index aebd2df2600f..de566166743e 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -54,7 +54,7 @@ using namespace ::cppu;
#define DISPATCH_RELOAD 5
// the OSL_ENSURE in CTOR has to be changed too, when adding new defines
-void SAL_CALL OInterceptor::dispose()
+void OInterceptor::dispose()
{
EventObject aEvt( *this );
diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx
index 39ed7fc428e5..cfb83676f5ab 100644
--- a/dbaccess/source/core/dataaccess/intercept.hxx
+++ b/dbaccess/source/core/dataaccess/intercept.hxx
@@ -45,7 +45,7 @@ public:
explicit OInterceptor( ODocumentDefinition* _pContentHolder );
/// @throws css::uno::RuntimeException
- void SAL_CALL dispose();
+ void dispose();
//XDispatch
virtual void SAL_CALL
diff --git a/dbaccess/source/core/inc/ModelImpl.hxx b/dbaccess/source/core/inc/ModelImpl.hxx
index 7a4931557bab..bf74d41adb08 100644
--- a/dbaccess/source/core/inc/ModelImpl.hxx
+++ b/dbaccess/source/core/inc/ModelImpl.hxx
@@ -277,7 +277,7 @@ public:
// XEventListener
/// @throws css::uno::RuntimeException
- void SAL_CALL disposing( const css::lang::EventObject& Source );
+ void disposing( const css::lang::EventObject& Source );
void setModified( bool bModified );
@@ -369,9 +369,9 @@ public:
const ::comphelper::SharedMutex& getSharedMutex() const { return m_aMutex; }
- void SAL_CALL acquire();
+ void acquire();
- void SAL_CALL release();
+ void release();
/// returns a all known data source settings, including their default values
static const AsciiPropertyValue* getDefaultDataSourceSettings();
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index f5ffe6996d49..f3002a88d163 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -173,7 +173,7 @@ public:
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
OUString getDeployPath( ActivePackages::Data const & data );
- css::uno::Reference<css::deployment::XPackage> SAL_CALL getDeployedPackage_(
+ css::uno::Reference<css::deployment::XPackage> getDeployedPackage_(
OUString const & id, OUString const & fileName,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv );
css::uno::Reference<css::deployment::XPackage> getDeployedPackage_(
diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx
index 20271ea17aab..2a405b5a0e74 100644
--- a/dtrans/source/cnttype/mcnttype.cxx
+++ b/dtrans/source/cnttype/mcnttype.cxx
@@ -88,7 +88,7 @@ OUString SAL_CALL CMimeContentType::getParameterValue( const OUString& aName )
return m_ParameterMap.find( aName )->second;
}
-void SAL_CALL CMimeContentType::init( const OUString& aCntType )
+void CMimeContentType::init( const OUString& aCntType )
{
if ( aCntType.isEmpty( ) )
throw IllegalArgumentException( );
@@ -99,7 +99,7 @@ void SAL_CALL CMimeContentType::init( const OUString& aCntType )
type();
}
-void SAL_CALL CMimeContentType::getSym()
+void CMimeContentType::getSym()
{
if ( m_nPos < m_ContentType.getLength( ) )
{
@@ -111,7 +111,7 @@ void SAL_CALL CMimeContentType::getSym()
m_nxtSym = OUString( );
}
-void SAL_CALL CMimeContentType::acceptSym( const OUString& pSymTlb )
+void CMimeContentType::acceptSym( const OUString& pSymTlb )
{
if ( pSymTlb.indexOf( m_nxtSym ) < 0 )
throw IllegalArgumentException( );
@@ -119,13 +119,13 @@ void SAL_CALL CMimeContentType::acceptSym( const OUString& pSymTlb )
getSym();
}
-void SAL_CALL CMimeContentType::skipSpaces()
+void CMimeContentType::skipSpaces()
{
while (m_nxtSym == SPACE)
getSym( );
}
-void SAL_CALL CMimeContentType::type()
+void CMimeContentType::type()
{
skipSpaces( );
@@ -154,7 +154,7 @@ void SAL_CALL CMimeContentType::type()
subtype( );
}
-void SAL_CALL CMimeContentType::subtype()
+void CMimeContentType::subtype()
{
skipSpaces( );
@@ -180,7 +180,7 @@ void SAL_CALL CMimeContentType::subtype()
trailer();
}
-void SAL_CALL CMimeContentType::trailer()
+void CMimeContentType::trailer()
{
OUString sToken(TOKEN);
while( !m_nxtSym.isEmpty( ) )
@@ -221,7 +221,7 @@ void SAL_CALL CMimeContentType::trailer()
}
}
-OUString SAL_CALL CMimeContentType::pName( )
+OUString CMimeContentType::pName( )
{
OUString pname;
@@ -240,7 +240,7 @@ OUString SAL_CALL CMimeContentType::pName( )
return pname;
}
-OUString SAL_CALL CMimeContentType::pValue( )
+OUString CMimeContentType::pValue( )
{
OUString pvalue;
@@ -274,7 +274,7 @@ OUString SAL_CALL CMimeContentType::pValue( )
// '";' (quote sign followed by semicolon) and '" ' (quote sign followed
// by space)
-OUString SAL_CALL CMimeContentType::quotedPValue( )
+OUString CMimeContentType::quotedPValue( )
{
OUString pvalue;
bool bAfterQuoteSign = false;
@@ -301,7 +301,7 @@ OUString SAL_CALL CMimeContentType::quotedPValue( )
return pvalue;
}
-OUString SAL_CALL CMimeContentType::nonquotedPValue( )
+OUString CMimeContentType::nonquotedPValue( )
{
OUString pvalue;
@@ -320,7 +320,7 @@ OUString SAL_CALL CMimeContentType::nonquotedPValue( )
return pvalue;
}
-void SAL_CALL CMimeContentType::comment()
+void CMimeContentType::comment()
{
while ( !m_nxtSym.isEmpty( ) )
{
diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx
index 45a80bbed66c..61e9594b2ba8 100644
--- a/dtrans/source/cnttype/mcnttype.hxx
+++ b/dtrans/source/cnttype/mcnttype.hxx
@@ -48,18 +48,18 @@ public:
private:
/// @throws css::lang::IllegalArgumentException
- void SAL_CALL init( const OUString& aCntType );
- void SAL_CALL getSym();
- void SAL_CALL acceptSym( const OUString& pSymTlb );
- void SAL_CALL skipSpaces();
- void SAL_CALL type();
- void SAL_CALL subtype();
- void SAL_CALL trailer();
- OUString SAL_CALL pName( );
- OUString SAL_CALL pValue( );
- OUString SAL_CALL quotedPValue( );
- OUString SAL_CALL nonquotedPValue( );
- void SAL_CALL comment();
+ void init( const OUString& aCntType );
+ void getSym();
+ void acceptSym( const OUString& pSymTlb );
+ void skipSpaces();
+ void type();
+ void subtype();
+ void trailer();
+ OUString pName( );
+ OUString pValue( );
+ OUString quotedPValue( );
+ OUString nonquotedPValue( );
+ void comment();
static bool SAL_CALL isInRange( const OUString& aChr, const OUString& aRange );
private:
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 78307abe011d..9f744e3270a0 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -421,7 +421,7 @@ void SAL_CALL SvxUnoTextRangeBase::setPropertyValue(const OUString& PropertyName
_setPropertyValue( PropertyName, aValue );
}
-void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyName, const uno::Any& aValue, sal_Int32 nPara )
+void SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyName, const uno::Any& aValue, sal_Int32 nPara )
{
SolarMutexGuard aGuard;
@@ -592,7 +592,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyValue(const OUString& Property
return _getPropertyValue( PropertyName );
}
-uno::Any SAL_CALL SvxUnoTextRangeBase::_getPropertyValue(const OUString& PropertyName, sal_Int32 nPara )
+uno::Any SvxUnoTextRangeBase::_getPropertyValue(const OUString& PropertyName, sal_Int32 nPara )
{
SolarMutexGuard aGuard;
@@ -752,7 +752,7 @@ void SAL_CALL SvxUnoTextRangeBase::setPropertyValues( const uno::Sequence< OUStr
_setPropertyValues( aPropertyNames, aValues );
}
-void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues, sal_Int32 nPara )
+void SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues, sal_Int32 nPara )
{
SolarMutexGuard aGuard;
@@ -876,7 +876,7 @@ uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyValues( const
return _getPropertyValues( aPropertyNames );
}
-uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( const uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara )
+uno::Sequence< uno::Any > SvxUnoTextRangeBase::_getPropertyValues( const uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara )
{
SolarMutexGuard aGuard;
@@ -937,7 +937,7 @@ static const sal_uInt16 aSvxUnoFontDescriptorWhichMap[] = { EE_CHAR_FONTINFO, EE
EE_CHAR_UNDERLINE, EE_CHAR_WEIGHT, EE_CHAR_STRIKEOUT, EE_CHAR_CASEMAP,
EE_CHAR_WLM, 0 };
-beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara)
+beans::PropertyState SvxUnoTextRangeBase::_getPropertyState(const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara)
{
if ( pMap )
{
@@ -1028,7 +1028,7 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxIt
throw beans::UnknownPropertyException();
}
-beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const OUString& PropertyName, sal_Int32 nPara /* = -1 */)
+beans::PropertyState SvxUnoTextRangeBase::_getPropertyState(const OUString& PropertyName, sal_Int32 nPara /* = -1 */)
{
SolarMutexGuard aGuard;
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 38f5a92c6be8..a68e2aa956ce 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -147,7 +147,7 @@ namespace pcr
<type scope="css::inspection">XPropertyControlContext</type> methods
will throw a <type scope="css::lang">DisposedException</type>.
*/
- void SAL_CALL dispose();
+ void dispose();
/** sets the notification mode, so that notifications received from the controls are
forwarded to our OBrowserListBox either synchronously or asynchronously
@@ -207,7 +207,7 @@ namespace pcr
}
- void SAL_CALL PropertyControlContext_Impl::dispose()
+ void PropertyControlContext_Impl::dispose()
{
SolarMutexGuard aGuard;
if ( impl_isDisposed_nothrow() )
@@ -918,7 +918,7 @@ namespace pcr
}
- void SAL_CALL OBrowserListBox::focusGained( const Reference< XPropertyControl >& _rxControl )
+ void OBrowserListBox::focusGained( const Reference< XPropertyControl >& _rxControl )
{
DBG_TESTSOLARMUTEX();
@@ -934,7 +934,7 @@ namespace pcr
}
- void SAL_CALL OBrowserListBox::valueChanged( const Reference< XPropertyControl >& _rxControl )
+ void OBrowserListBox::valueChanged( const Reference< XPropertyControl >& _rxControl )
{
DBG_TESTSOLARMUTEX();
@@ -956,7 +956,7 @@ namespace pcr
}
- void SAL_CALL OBrowserListBox::activateNextControl( const Reference< XPropertyControl >& _rxCurrentControl )
+ void OBrowserListBox::activateNextControl( const Reference< XPropertyControl >& _rxCurrentControl )
{
DBG_TESTSOLARMUTEX();
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index 9ec019fe9c64..d5a2aa64e85e 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -144,11 +144,11 @@ namespace pcr
void CommitModified( );
/// @throws css::uno::RuntimeException
- void SAL_CALL focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control );
+ void focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control );
/// @throws css::uno::RuntimeException
- void SAL_CALL valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control );
+ void valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control );
/// @throws css::uno::RuntimeException
- void SAL_CALL activateNextControl( const css::uno::Reference< css::inspection::XPropertyControl >& CurrentControl );
+ void activateNextControl( const css::uno::Reference< css::inspection::XPropertyControl >& CurrentControl );
private:
// IButtonClickListener
diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx
index c84593501edc..be480faa8846 100644
--- a/extensions/source/propctrlr/commoncontrol.cxx
+++ b/extensions/source/propctrlr/commoncontrol.cxx
@@ -47,12 +47,12 @@ namespace pcr
{
}
- void SAL_CALL CommonBehaviourControlHelper::setControlContext( const Reference< XPropertyControlContext >& _controlcontext )
+ void CommonBehaviourControlHelper::setControlContext( const Reference< XPropertyControlContext >& _controlcontext )
{
m_xContext = _controlcontext;
}
- void SAL_CALL CommonBehaviourControlHelper::notifyModifiedValue( )
+ void CommonBehaviourControlHelper::notifyModifiedValue( )
{
if ( isModified() && m_xContext.is() )
{
diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx
index ed2261b598ba..b6c0add791e1 100644
--- a/extensions/source/propctrlr/commoncontrol.hxx
+++ b/extensions/source/propctrlr/commoncontrol.hxx
@@ -75,15 +75,15 @@ namespace pcr
// XPropertyControl
/// @throws css::uno::RuntimeException
- ::sal_Int16 SAL_CALL getControlType() { return m_nControlType; }
+ ::sal_Int16 getControlType() { return m_nControlType; }
/// @throws css::uno::RuntimeException
- const css::uno::Reference< css::inspection::XPropertyControlContext >& SAL_CALL getControlContext() { return m_xContext; }
+ const css::uno::Reference< css::inspection::XPropertyControlContext >& getControlContext() { return m_xContext; }
/// @throws css::uno::RuntimeException
- void SAL_CALL setControlContext( const css::uno::Reference< css::inspection::XPropertyControlContext >& _controlcontext );
+ void setControlContext( const css::uno::Reference< css::inspection::XPropertyControlContext >& _controlcontext );
/// @throws css::uno::RuntimeException
- bool SAL_CALL isModified( ) { return m_bModified; }
+ bool isModified( ) { return m_bModified; }
/// @throws css::uno::RuntimeException
- void SAL_CALL notifyModifiedValue( );
+ void notifyModifiedValue( );
/** (fail-safe) wrapper around calling our context's activateNextControl
*/
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx
index c6a1c32a7ea7..86e6bb8f670a 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -711,14 +711,14 @@ namespace pcr
}
- void SAL_CALL ComposedPropertyUIUpdate::suspendAutoFire()
+ void ComposedPropertyUIUpdate::suspendAutoFire()
{
impl_checkDisposed();
osl_atomic_increment( &m_nSuspendCounter );
}
- void SAL_CALL ComposedPropertyUIUpdate::resumeAutoFire()
+ void ComposedPropertyUIUpdate::resumeAutoFire()
{
impl_checkDisposed();
if ( 0 == osl_atomic_decrement( &m_nSuspendCounter ) )
@@ -747,7 +747,7 @@ namespace pcr
}
- void SAL_CALL ComposedPropertyUIUpdate::dispose()
+ void ComposedPropertyUIUpdate::dispose()
{
if ( impl_isDisposed() )
return;
diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx
index c38c405a334c..805ed2cf5583 100644
--- a/extensions/source/propctrlr/composeduiupdate.hxx
+++ b/extensions/source/propctrlr/composeduiupdate.hxx
@@ -118,13 +118,13 @@ namespace pcr
@seealso resumeAutoFire
*/
- void SAL_CALL suspendAutoFire();
+ void suspendAutoFire();
/** Suspends automatic firing of UI changes
@seealso suspendAutoFire
*/
- void SAL_CALL resumeAutoFire();
+ void resumeAutoFire();
/** disposes the instance, so it becomes non-functional.
@@ -132,7 +132,7 @@ namespace pcr
the latter will also be disposed, so that if anybody still holds a reference to them
and tries to operate them will get a DisposedException.
*/
- void SAL_CALL dispose();
+ void dispose();
/** invokes m_pPropertyCheck to check whether a given property should be handled
*/
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index e307908be99c..36f6bc6da996 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -231,7 +231,7 @@ void T602ImportFilter::inschr(unsigned char ch)
inschrdef(ch);
}
-bool SAL_CALL T602ImportFilter::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor )
+bool T602ImportFilter::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor )
{
Reset602();
@@ -438,7 +438,7 @@ bool SAL_CALL T602ImportFilter::importImpl( const Sequence< css::beans::Property
return true;
}
-bool SAL_CALL T602ImportFilter::test()
+bool T602ImportFilter::test()
{
Reset602();
Read602();
diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx
index 1b407ed996e9..63bd0335614f 100644
--- a/filter/source/t602/t602filter.hxx
+++ b/filter/source/t602/t602filter.hxx
@@ -221,7 +221,7 @@ private:
void wrtfnt();
/// @throws css::uno::RuntimeException
- bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor );
+ bool importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor );
public:
explicit T602ImportFilter(const css::uno::Reference<css::lang::XMultiServiceFactory > &r );
@@ -247,7 +247,7 @@ private:
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
- bool SAL_CALL test();
+ bool test();
};
/// @throws css::uno::RuntimeException
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 892cb3989593..ffe7684c7431 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -59,7 +59,7 @@ using namespace com::sun::star::xml;
using namespace com::sun::star::xml::sax;
using namespace ::com::sun::star::task;
-bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor )
+bool XmlFilterAdaptor::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor )
{
OUString udConvertClass = msUserData[0];
const OUString sXMLImportService = msUserData[2];
@@ -171,7 +171,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::Property
return true;
}
-bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< css::beans::PropertyValue >& aDescriptor )
+bool XmlFilterAdaptor::exportImpl( const Sequence< css::beans::PropertyValue >& aDescriptor )
{
OUString udConvertClass = msUserData[0];
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
index b33af42f9c16..a0512a34d864 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
@@ -58,10 +58,10 @@ class XmlFilterAdaptor final : public cppu::WeakImplHelper
FilterType meType;
/// @throws css::uno::RuntimeException
- bool SAL_CALL exportImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor );
+ bool exportImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor );
/// @throws css::uno::RuntimeException
- bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor );
+ bool importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor );
public:
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx b/filter/source/xsltfilter/LibXSLTTransformer.hxx
index e65820b1fd99..7ef53fea7137 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.hxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx
@@ -59,10 +59,10 @@ namespace XSLT
{
public:
Reader(LibXSLTTransformer* transformer);
- int SAL_CALL read(char * buffer, int len);
- int SAL_CALL write(const char * buffer, int len);
+ int read(char * buffer, int len);
+ int write(const char * buffer, int len);
void forceStateStopped();
- int SAL_CALL closeOutput();
+ int closeOutput();
private:
virtual ~Reader() override;
@@ -156,19 +156,19 @@ namespace XSLT
virtual void SAL_CALL
initialize(const Sequence<Any>& params) override;
- void SAL_CALL
+ void
done();
- void SAL_CALL
+ void
error(const OUString& msg);
- const OString& SAL_CALL
+ const OString&
getStyleSheetURL() { return m_styleSheetURL; }
- const ::std::map<const char*, OString>& SAL_CALL
+ const ::std::map<const char*, OString>&
getParameters() { return m_parameters; }
- const css::uno::Reference<css::uno::XComponentContext>& SAL_CALL
+ const css::uno::Reference<css::uno::XComponentContext>&
getComponentContext() {
return m_xContext;
}
diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx
index 8162e2df978b..afb7eb0f6009 100644
--- a/filter/source/xsltfilter/OleHandler.cxx
+++ b/filter/source/xsltfilter/OleHandler.cxx
@@ -51,13 +51,13 @@ using namespace ::com::sun::star::embed;
namespace XSLT
{
- Reference<XStream> SAL_CALL OleHandler::createTempFile() {
+ Reference<XStream> OleHandler::createTempFile() {
Reference<XStream> tempFile( TempFile::create(m_xContext), UNO_QUERY);
OSL_ASSERT(tempFile.is());
return tempFile;
}
- void SAL_CALL OleHandler::ensureCreateRootStorage()
+ void OleHandler::ensureCreateRootStorage()
{
if (m_storage == nullptr || m_rootStream == nullptr)
{
@@ -72,7 +72,7 @@ namespace XSLT
}
}
- void SAL_CALL OleHandler::initRootStorageFromBase64(const OString& content)
+ void OleHandler::initRootStorageFromBase64(const OString& content)
{
Sequence<sal_Int8> oleData;
::sax::Converter::decodeBase64(oleData, OStringToOUString(
@@ -94,7 +94,7 @@ namespace XSLT
m_storage = cont;
}
- OString SAL_CALL
+ OString
OleHandler::encodeSubStorage(const OUString& streamName)
{
if (!m_storage->hasByName(streamName))
@@ -146,7 +146,7 @@ namespace XSLT
return OUStringToOString(buf.toString(), RTL_TEXTENCODING_UTF8);
}
- void SAL_CALL
+ void
OleHandler::insertByName(const OUString& streamName, const OString& content)
{
if ( streamName == "oledata.mso" )
@@ -161,7 +161,7 @@ namespace XSLT
}
const OString
- SAL_CALL OleHandler::getByName(const OUString& streamName)
+ OleHandler::getByName(const OUString& streamName)
{
if ( streamName == "oledata.mso" )
{
@@ -181,7 +181,7 @@ namespace XSLT
return encodeSubStorage(streamName);
}
- void SAL_CALL
+ void
OleHandler::insertSubStorage(const OUString& streamName, const OString& content)
{
//decode the base64 string
diff --git a/filter/source/xsltfilter/OleHandler.hxx b/filter/source/xsltfilter/OleHandler.hxx
index af8dac9fc97c..4a1871f229c1 100644
--- a/filter/source/xsltfilter/OleHandler.hxx
+++ b/filter/source/xsltfilter/OleHandler.hxx
@@ -67,8 +67,8 @@ namespace XSLT
if (m_tcontext)
m_tcontext->_private = nullptr;
}
- void SAL_CALL insertByName(const OUString& streamName, const OString& content);
- const OString SAL_CALL getByName(const OUString& streamName);
+ void insertByName(const OUString& streamName, const OString& content);
+ const OString getByName(const OUString& streamName);
void registercontext(xsltTransformContextPtr context)
{
assert(context);
@@ -82,11 +82,11 @@ namespace XSLT
css::uno::Reference<XStream> m_rootStream;
xsltTransformContextPtr m_tcontext;
- void SAL_CALL ensureCreateRootStorage();
- OString SAL_CALL encodeSubStorage(const OUString& streamName);
- void SAL_CALL insertSubStorage(const OUString& streamName, const OString& content);
- void SAL_CALL initRootStorageFromBase64(const OString& content);
- css::uno::Reference<XStream> SAL_CALL createTempFile();
+ void ensureCreateRootStorage();
+ OString encodeSubStorage(const OUString& streamName);
+ void insertSubStorage(const OUString& streamName, const OString& content);
+ void initRootStorageFromBase64(const OString& content);
+ css::uno::Reference<XStream> createTempFile();
};
}
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index 32d5c4db1e94..ed6bfae0daa6 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -466,7 +466,7 @@ Reference< XCloneable > SAL_CALL OGridColumn::createClone( )
// XPersistObject
-void SAL_CALL OGridColumn::write(const Reference<XObjectOutputStream>& _rxOutStream)
+void OGridColumn::write(const Reference<XObjectOutputStream>& _rxOutStream)
{
// 1. Write the UnoControl
Reference<XMarkableStream> xMark(_rxOutStream, UNO_QUERY);
@@ -514,7 +514,7 @@ void SAL_CALL OGridColumn::write(const Reference<XObjectOutputStream>& _rxOutStr
}
-void SAL_CALL OGridColumn::read(const Reference<XObjectInputStream>& _rxInStream)
+void OGridColumn::read(const Reference<XObjectInputStream>& _rxInStream)
{
// 1. Read the UnoControl
sal_Int32 nLen = _rxInStream->readLong();
diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx
index 26b6aec61cbd..66a61056ac7e 100644
--- a/forms/source/component/Columns.hxx
+++ b/forms/source/component/Columns.hxx
@@ -85,8 +85,8 @@ public:
virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override;
// XPersistObject
- void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream);
- void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream);
+ void write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream);
+ void read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream);
// XPropertySet
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override = 0;
diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx
index 3790e4f5d6b7..a98b91b51a57 100644
--- a/forms/source/component/EditBase.hxx
+++ b/forms/source/component/EditBase.hxx
@@ -84,8 +84,8 @@ public:
protected:
// new properties common to all edit models should be handled with the following two methods
- void SAL_CALL readCommonEditProperties(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream);
- void SAL_CALL writeCommonEditProperties(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream);
+ void readCommonEditProperties(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream);
+ void writeCommonEditProperties(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream);
void defaultCommonEditProperties();
virtual sal_uInt16 getPersistenceFlags() const;
diff --git a/forms/source/component/errorbroadcaster.cxx b/forms/source/component/errorbroadcaster.cxx
index b73b96c3a0e0..fe1121c660c5 100644
--- a/forms/source/component/errorbroadcaster.cxx
+++ b/forms/source/component/errorbroadcaster.cxx
@@ -51,14 +51,14 @@ namespace frm
}
- void SAL_CALL OErrorBroadcaster::disposing()
+ void OErrorBroadcaster::disposing()
{
EventObject aDisposeEvent( static_cast< XSQLErrorBroadcaster* >( this ) );
m_aErrorListeners.disposeAndClear( aDisposeEvent );
}
- void SAL_CALL OErrorBroadcaster::onError( const SQLException& _rException, const OUString& _rContextDescription )
+ void OErrorBroadcaster::onError( const SQLException& _rException, const OUString& _rContextDescription )
{
Any aError;
if ( !_rContextDescription.isEmpty() )
@@ -70,7 +70,7 @@ namespace frm
}
- void SAL_CALL OErrorBroadcaster::onError( const css::sdb::SQLErrorEvent& _rError )
+ void OErrorBroadcaster::onError( const css::sdb::SQLErrorEvent& _rError )
{
if ( m_aErrorListeners.getLength() )
{
diff --git a/forms/source/component/errorbroadcaster.hxx b/forms/source/component/errorbroadcaster.hxx
index 0f445900a85f..b60bfcecce0f 100644
--- a/forms/source/component/errorbroadcaster.hxx
+++ b/forms/source/component/errorbroadcaster.hxx
@@ -44,10 +44,10 @@ namespace frm
explicit OErrorBroadcaster( ::cppu::OBroadcastHelper& _rBHelper );
virtual ~OErrorBroadcaster( );
- void SAL_CALL disposing();
+ void disposing();
- void SAL_CALL onError( const css::sdbc::SQLException& _rException, const OUString& _rContextDescription );
- void SAL_CALL onError( const css::sdb::SQLErrorEvent& _rException );
+ void onError( const css::sdbc::SQLException& _rException, const OUString& _rContextDescription );
+ void onError( const css::sdb::SQLErrorEvent& _rException );
protected:
// XSQLErrorBroadcaster
diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx
index f3299dea6499..5e79a5c65995 100644
--- a/forms/source/helper/controlfeatureinterception.cxx
+++ b/forms/source/helper/controlfeatureinterception.cxx
@@ -37,7 +37,7 @@ namespace frm
}
- void SAL_CALL ControlFeatureInterception::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
+ void ControlFeatureInterception::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
{
if ( !_rxInterceptor.is() )
{
@@ -60,7 +60,7 @@ namespace frm
}
- void SAL_CALL ControlFeatureInterception::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
+ void ControlFeatureInterception::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
{
if ( !_rxInterceptor.is() )
{
diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx
index 529ba5f1f81a..89f2e7a6ad66 100644
--- a/forms/source/helper/formnavigation.cxx
+++ b/forms/source/helper/formnavigation.cxx
@@ -52,7 +52,7 @@ namespace frm
}
- void SAL_CALL OFormNavigationHelper::dispose( )
+ void OFormNavigationHelper::dispose( )
{
m_pFeatureInterception->dispose();
disconnectDispatchers();
diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx
index 80d3a2cab8f0..f89af1d1827a 100644
--- a/forms/source/inc/controlfeatureinterception.hxx
+++ b/forms/source/inc/controlfeatureinterception.hxx
@@ -61,12 +61,12 @@ namespace frm
// XDispatchProviderInterception
/// @throws css::uno::RuntimeException
- void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor );
+ void registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor );
/// @throws css::uno::RuntimeException
- void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor );
+ void releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor );
// XComponent
- void SAL_CALL dispose();
+ void dispose();
/** queries the interceptor chain for the given dispatch, with a blank target frame and no frame search flags
*/
diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx
index b0f8663075fe..e1068f7bb526 100644
--- a/forms/source/inc/formnavigation.hxx
+++ b/forms/source/inc/formnavigation.hxx
@@ -79,7 +79,7 @@ namespace frm
// XComponent
/// @throws css::uno::RuntimeException
- void SAL_CALL dispose( );
+ void dispose( );
// XDispatchProviderInterception
virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override;
diff --git a/forms/source/inc/propertybaghelper.hxx b/forms/source/inc/propertybaghelper.hxx
index e3d86b3673a7..0e93500ad1a2 100644
--- a/forms/source/inc/propertybaghelper.hxx
+++ b/forms/source/inc/propertybaghelper.hxx
@@ -76,7 +76,7 @@ namespace frm
void removeProperty( const OUString& _rName );
// XPropertyAccess equivalent
- css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues();
+ css::uno::Sequence< css::beans::PropertyValue > getPropertyValues();
void setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& _rProps );
// forwards to m_aDynamicProperties
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index a01b63e261e9..caa384796e7e 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -216,14 +216,14 @@ class StatusIndicatorFactory : public ::cppu::WeakImplHelper<
const OUString& sText ,
sal_Int32 nRange);
- void SAL_CALL reset(const css::uno::Reference< css::task::XStatusIndicator >& xChild);
+ void reset(const css::uno::Reference< css::task::XStatusIndicator >& xChild);
- void SAL_CALL end(const css::uno::Reference< css::task::XStatusIndicator >& xChild);
+ void end(const css::uno::Reference< css::task::XStatusIndicator >& xChild);
- void SAL_CALL setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
+ void setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
const OUString& sText );
- void SAL_CALL setValue(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
+ void setValue(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
sal_Int32 nValue);
// specials
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index 369a11d9afe6..79166fb8c87f 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -85,10 +85,10 @@ class DispatchRecorder
// private functions
private:
- void SAL_CALL implts_recordMacro( const OUString& aURL,
+ void implts_recordMacro( const OUString& aURL,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
bool bAsComment, OUStringBuffer& );
- void SAL_CALL AppendToBuffer( const css::uno::Any& aValue, OUStringBuffer& aArgumentBuffer );
+ void AppendToBuffer( const css::uno::Any& aValue, OUStringBuffer& aArgumentBuffer );
}; // class DispatcRecorder
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 58a8be553c8a..a01e102df934 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -282,7 +282,7 @@ class Desktop : private cppu::BaseMutex,
// we need this wrapped terminate()-call to terminate even the QuickStarter
// non-virtual and non-UNO for now
/// @throws css::uno::RuntimeException
- bool SAL_CALL terminateQuickstarterToo();
+ bool terminateQuickstarterToo();
// protected methods
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index db960358c8ab..5efc22b30fdb 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -87,7 +87,7 @@ class FWI_DLLPUBLIC ConstItemContainer : public ::cppu::WeakImplHelper<
virtual css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) override;
private:
- ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
+ ::cppu::IPropertyArrayHelper& getInfoHelper();
const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor();
void copyItemContainer( const std::vector< css::uno::Sequence< css::beans::PropertyValue > >& rSourceVector );
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 051373c3d92a..fe02406cd39f 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -84,7 +84,7 @@ public:
}
/// This has to be called after when the instance is acquire()'d.
- void SAL_CALL fillCache();
+ void fillCache();
private:
/** helper to listen for configuration changes without ownership cycle problems */
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index efe3167c81a9..d1e45af96492 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -263,7 +263,7 @@ Any SAL_CALL ConstItemContainer::getFastPropertyValue( sal_Int32 nHandle )
throw UnknownPropertyException();
}
-::cppu::IPropertyArrayHelper& SAL_CALL ConstItemContainer::getInfoHelper()
+::cppu::IPropertyArrayHelper& ConstItemContainer::getInfoHelper()
{
// Define static member to give structure of properties to baseclass "OPropertySetHelper".
// "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable.
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index 2446e02b8368..5832f55d3f0c 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -157,7 +157,7 @@ OUString SAL_CALL DispatchRecorder::getRecordedMacro()
return sScript;
}
-void SAL_CALL DispatchRecorder::AppendToBuffer( const css::uno::Any& aValue, OUStringBuffer& aArgumentBuffer )
+void DispatchRecorder::AppendToBuffer( const css::uno::Any& aValue, OUStringBuffer& aArgumentBuffer )
{
// if value == bool
if (aValue.getValueTypeClass() == css::uno::TypeClass_STRUCT )
@@ -284,7 +284,7 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( const css::uno::Any& aValue, OUS
}
}
-void SAL_CALL DispatchRecorder::implts_recordMacro( const OUString& aURL,
+void DispatchRecorder::implts_recordMacro( const OUString& aURL,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
bool bAsComment, OUStringBuffer& aScriptBuffer )
{
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 119dd5d69697..5fc7a7fc4ce7 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -386,7 +386,7 @@ namespace
};
}
-bool SAL_CALL Desktop::terminateQuickstarterToo()
+bool Desktop::terminateQuickstarterToo()
{
QuickstartSuppressor aQuickstartSuppressor(this, m_xQuickLauncher);
m_bSession = true;
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index 1c5df528a6bb..3d58fe9bd32c 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -108,7 +108,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
}
-css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
+css::uno::Any DispatchHelper::executeDispatch(
const css::uno::Reference< css::frame::XDispatch >& xDispatch ,
const css::util::URL& aURL ,
bool SyncronFlag ,
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 5998d7902ccb..17efc5d0386a 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -306,10 +306,10 @@ public:
private:
- void SAL_CALL impl_setPropertyValue(sal_Int32 nHandle,
+ void impl_setPropertyValue(sal_Int32 nHandle,
const css::uno::Any& aValue);
- css::uno::Any SAL_CALL impl_getPropertyValue(sal_Int32 nHandle);
+ css::uno::Any impl_getPropertyValue(sal_Int32 nHandle);
/** set a new owner for this helper.
*
@@ -331,11 +331,11 @@ private:
* The owner of this class has to be sure, that every new property does
* not clash with any existing one.
*/
- void SAL_CALL impl_addPropertyInfo(const css::beans::Property& aProperty);
+ void impl_addPropertyInfo(const css::beans::Property& aProperty);
/** mark the object as "dead".
*/
- void SAL_CALL impl_disablePropertySet();
+ void impl_disablePropertySet();
bool impl_existsVeto(const css::beans::PropertyChangeEvent& aEvent);
@@ -2701,7 +2701,7 @@ sal_Int16 SAL_CALL Frame::resetActionLocks()
return nCurrentLocks;
}
-void SAL_CALL Frame::impl_setPropertyValue(sal_Int32 nHandle,
+void Frame::impl_setPropertyValue(sal_Int32 nHandle,
const css::uno::Any& aValue)
{
@@ -2758,7 +2758,7 @@ void SAL_CALL Frame::impl_setPropertyValue(sal_Int32 nHandle,
}
}
-css::uno::Any SAL_CALL Frame::impl_getPropertyValue(sal_Int32 nHandle)
+css::uno::Any Frame::impl_getPropertyValue(sal_Int32 nHandle)
{
/* There is no need to lock any mutex here. Because we share the
solar mutex with our base class. And we said to our base class: "don't release it on calling us" .-)
@@ -2809,7 +2809,7 @@ void Frame::impl_setPropertyChangeBroadcaster(const css::uno::Reference< css::un
m_xBroadcaster = xBroadcaster;
}
-void SAL_CALL Frame::impl_addPropertyInfo(const css::beans::Property& aProperty)
+void Frame::impl_addPropertyInfo(const css::beans::Property& aProperty)
{
SolarMutexGuard g;
@@ -2820,7 +2820,7 @@ void SAL_CALL Frame::impl_addPropertyInfo(const css::beans::Property& aProperty)
m_lProps[aProperty.Name] = aProperty;
}
-void SAL_CALL Frame::impl_disablePropertySet()
+void Frame::impl_disablePropertySet()
{
SolarMutexGuard g;
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index bd199b6891b1..ab76bdca2e76 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -92,7 +92,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
virtual void SAL_CALL disposing( const EventObject& aEvent ) override;
protected:
- css::uno::Any SAL_CALL getByNameImpl( const OUString& aName );
+ css::uno::Any getByNameImpl( const OUString& aName );
struct CmdToInfoMap
{
@@ -208,7 +208,7 @@ ConfigurationAccess_UICommand::~ConfigurationAccess_UICommand()
}
// XNameAccess
-Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const OUString& rCommandURL )
+Any ConfigurationAccess_UICommand::getByNameImpl( const OUString& rCommandURL )
{
static sal_Int32 nRequests = 0;
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index c23316df620a..fa9a1fcf8f8c 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -86,7 +86,7 @@ public:
*/
virtual sal_Bool SAL_CALL filter(const Sequence< PropertyValue >& aDescriptor) override;
virtual void SAL_CALL cancel() override {}
- void SAL_CALL setDocumentHandler(Reference< XDocumentHandler > const & xHandler)
+ void setDocumentHandler(Reference< XDocumentHandler > const & xHandler)
{
m_rxDocumentHandler = xHandler;
}
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index a357db248712..0b71496e44eb 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -122,9 +122,9 @@ private:
css::uno::Reference < css::uno::XComponentContext > m_xContext;
/// @throws css::uno::RuntimeException
- bool SAL_CALL createLocaleSpecificBreakIterator( const OUString& aLocaleName );
+ bool createLocaleSpecificBreakIterator( const OUString& aLocaleName );
/// @throws css::uno::RuntimeException
- css::uno::Reference < XBreakIterator > SAL_CALL getLocaleSpecificBreakIterator( const css::lang::Locale& rLocale );
+ css::uno::Reference < XBreakIterator > getLocaleSpecificBreakIterator( const css::lang::Locale& rLocale );
};
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index 171b1bbfc6de..f34412d0eac4 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.hxx
@@ -97,7 +97,7 @@ protected:
BI_Data words[4]; // 4 is css::i18n::WordType enumeration size
/// @throws css::uno::RuntimeException
- void SAL_CALL loadICUBreakIterator(const css::lang::Locale& rLocale,
+ void loadICUBreakIterator(const css::lang::Locale& rLocale,
sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const OUString& rText);
public:
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx
index 15a591f37429..34befe25e21e 100644
--- a/i18npool/inc/calendar_gregorian.hxx
+++ b/i18npool/inc/calendar_gregorian.hxx
@@ -51,7 +51,7 @@ public:
// Constructors
Calendar_gregorian();
Calendar_gregorian(const Era *_eraArray);
- void SAL_CALL init(const Era *_eraArray);
+ void init(const Era *_eraArray);
/**
* Destructor
diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx
index 290418152622..36d37c69e4fc 100644
--- a/i18npool/inc/characterclassificationImpl.hxx
+++ b/i18npool/inc/characterclassificationImpl.hxx
@@ -74,7 +74,7 @@ private:
css::lang::Locale aLocale;
OUString aName;
css::uno::Reference < XCharacterClassification > xCI;
- bool SAL_CALL equals(const css::lang::Locale& rLocale) {
+ bool equals(const css::lang::Locale& rLocale) {
return aLocale.Language == rLocale.Language &&
aLocale.Country == rLocale.Country &&
aLocale.Variant == rLocale.Variant;
@@ -87,8 +87,8 @@ private:
css::uno::Reference < XCharacterClassification > xUCI;
/// @throws css::uno::RuntimeException
- css::uno::Reference < XCharacterClassification > const & SAL_CALL getLocaleSpecificCharacterClassification(const css::lang::Locale& rLocale);
- bool SAL_CALL createLocaleSpecificCharacterClassification(const OUString& serviceName, const css::lang::Locale& rLocale);
+ css::uno::Reference < XCharacterClassification > const & getLocaleSpecificCharacterClassification(const css::lang::Locale& rLocale);
+ bool createLocaleSpecificCharacterClassification(const OUString& serviceName, const css::lang::Locale& rLocale);
};
diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index 47641a25f3a5..534690897731 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.hxx
@@ -81,7 +81,7 @@ private:
css::uno::Reference < XCollator > xC;
lookupTableItem(const css::lang::Locale& rLocale, const OUString& _algorithm, const OUString& _service,
css::uno::Reference < XCollator > const & _xC) : aLocale(rLocale), algorithm(_algorithm), service(_service), xC(_xC) {}
- bool SAL_CALL equals(const css::lang::Locale& rLocale, const OUString& _algorithm) {
+ bool equals(const css::lang::Locale& rLocale, const OUString& _algorithm) {
return aLocale.Language == rLocale.Language &&
aLocale.Country == rLocale.Country &&
aLocale.Variant == rLocale.Variant &&
@@ -97,10 +97,10 @@ private:
css::uno::Reference < css::i18n::XLocaleData5 > mxLocaleData;
/// @throws css::uno::RuntimeException
- bool SAL_CALL createCollator(const css::lang::Locale& rLocale, const OUString& serviceName,
+ bool createCollator(const css::lang::Locale& rLocale, const OUString& serviceName,
const OUString& rSortAlgorithm);
/// @throws css::uno::RuntimeException
- void SAL_CALL loadCachedCollator(const css::lang::Locale& rLocale, const OUString& rSortAlgorithm);
+ void loadCachedCollator(const css::lang::Locale& rLocale, const OUString& rSortAlgorithm);
};
}
diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx
index 33d71d95d8a6..1320b7e41a73 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.hxx
@@ -77,9 +77,9 @@ private:
css::uno::Reference < css::container::XHierarchicalNameAccess > xHierarchicalNameAccess;
rtl::Reference<TransliterationImpl> translit;
/// @throws css::uno::RuntimeException
- OUString SAL_CALL makeNumberingIdentifier( sal_Int16 index );
+ OUString makeNumberingIdentifier( sal_Int16 index );
/// @throws css::uno::RuntimeException
- bool SAL_CALL isScriptFlagEnabled(const OUString& aName );
+ bool isScriptFlagEnabled(const OUString& aName );
};
}
diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx
index 2194e4fd1c2a..088ca721630c 100644
--- a/i18npool/inc/indexentrysupplier.hxx
+++ b/i18npool/inc/indexentrysupplier.hxx
@@ -77,9 +77,9 @@ private:
css::uno::Reference < css::i18n::XExtendedIndexEntrySupplier > xIES;
css::uno::Reference < css::uno::XComponentContext > m_xContext;
/// @throws css::uno::RuntimeException
- bool SAL_CALL createLocaleSpecificIndexEntrySupplier(const OUString& name);
+ bool createLocaleSpecificIndexEntrySupplier(const OUString& name);
/// @throws css::uno::RuntimeException
- css::uno::Reference < css::i18n::XExtendedIndexEntrySupplier > const & SAL_CALL getLocaleSpecificIndexEntrySupplier(
+ css::uno::Reference < css::i18n::XExtendedIndexEntrySupplier > const & getLocaleSpecificIndexEntrySupplier(
const css::lang::Locale& rLocale, const OUString& rSortAlgorithm);
css::lang::Locale aLocale;
diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx
index e272f43e3252..9eb2044506c4 100644
--- a/i18npool/inc/indexentrysupplier_common.hxx
+++ b/i18npool/inc/indexentrysupplier_common.hxx
@@ -87,7 +87,7 @@ protected:
OUString aAlgorithm;
/// @throws css::uno::RuntimeException
- const OUString& SAL_CALL getEntry( const OUString& IndexEntry,
+ const OUString& getEntry( const OUString& IndexEntry,
const OUString& PhoneticEntry, const css::lang::Locale& rLocale );
};
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index 094113a8ca74..e31ea6240d64 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -69,7 +69,7 @@ private:
css::uno::Reference < css::uno::XComponentContext > m_xContext;
/// @throws css::uno::RuntimeException
- css::uno::Reference< css::i18n::XExtendedInputSequenceChecker >& SAL_CALL getInputSequenceChecker(sal_Char const * rLanguage);
+ css::uno::Reference< css::i18n::XExtendedInputSequenceChecker >& getInputSequenceChecker(sal_Char const * rLanguage);
static sal_Char* SAL_CALL getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar);
};
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index 4a83d44375b2..8014b682cf99 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -90,20 +90,20 @@ public:
virtual css::uno::Sequence< css::i18n::FormatElement > SAL_CALL getAllFormats( const css::lang::Locale& rLocale ) override;
virtual css::uno::Sequence< css::i18n::Implementation > SAL_CALL getCollatorImplementations( const css::lang::Locale& rLocale ) override;
/// @throws css::uno::RuntimeException
- OUString SAL_CALL getCollatorRuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm );
+ OUString getCollatorRuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm );
virtual css::uno::Sequence< OUString > SAL_CALL getTransliterations( const css::lang::Locale& rLocale ) override;
virtual css::i18n::ForbiddenCharacters SAL_CALL getForbiddenCharacters( const css::lang::Locale& rLocale ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getReservedWord( const css::lang::Locale& rLocale ) override ;
/// @throws css::uno::RuntimeException
- css::uno::Sequence< OUString > SAL_CALL getBreakIteratorRules( const css::lang::Locale& rLocale ) ;
+ css::uno::Sequence< OUString > getBreakIteratorRules( const css::lang::Locale& rLocale ) ;
virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAllInstalledLocaleNames() override;
virtual css::uno::Sequence< OUString > SAL_CALL getSearchOptions( const css::lang::Locale& rLocale ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getCollationOptions( const css::lang::Locale& rLocale ) override;
/// @throws css::uno::RuntimeException
- css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getContinuousNumberingLevels( const css::lang::Locale& rLocale );
+ css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > getContinuousNumberingLevels( const css::lang::Locale& rLocale );
/// @throws css::uno::RuntimeException
- css::uno::Sequence< css::uno::Reference< css::container::XIndexAccess > > SAL_CALL getOutlineNumberingLevels( const css::lang::Locale& rLocale );
+ css::uno::Sequence< css::uno::Reference< css::container::XIndexAccess > > getOutlineNumberingLevels( const css::lang::Locale& rLocale );
// XLocaleData4
virtual css::uno::Sequence< OUString > SAL_CALL getDateAcceptancePatterns( const css::lang::Locale& rLocale ) override;
@@ -113,23 +113,23 @@ public:
// following methods are used by indexentry service
/// @throws css::uno::RuntimeException
- css::uno::Sequence< OUString > SAL_CALL getIndexAlgorithm( const css::lang::Locale& rLocale );
+ css::uno::Sequence< OUString > getIndexAlgorithm( const css::lang::Locale& rLocale );
/// @throws css::uno::RuntimeException
- OUString SAL_CALL getDefaultIndexAlgorithm( const css::lang::Locale& rLocale );
+ OUString getDefaultIndexAlgorithm( const css::lang::Locale& rLocale );
/// @throws css::uno::RuntimeException
- OUString SAL_CALL getIndexKeysByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm );
+ OUString getIndexKeysByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm );
/// @throws css::uno::RuntimeException
- OUString SAL_CALL getIndexModuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm );
+ OUString getIndexModuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm );
/// @throws css::uno::RuntimeException
- css::uno::Sequence< css::i18n::UnicodeScript > SAL_CALL getUnicodeScripts( const css::lang::Locale& rLocale );
+ css::uno::Sequence< css::i18n::UnicodeScript > getUnicodeScripts( const css::lang::Locale& rLocale );
/// @throws css::uno::RuntimeException
- css::uno::Sequence< OUString > SAL_CALL getFollowPageWords( const css::lang::Locale& rLocale );
+ css::uno::Sequence< OUString > getFollowPageWords( const css::lang::Locale& rLocale );
/// @throws css::uno::RuntimeException
- bool SAL_CALL hasPhonetic( const css::lang::Locale& rLocale );
+ bool hasPhonetic( const css::lang::Locale& rLocale );
/// @throws css::uno::RuntimeException
- bool SAL_CALL isPhonetic( const css::lang::Locale& rLocale, const OUString& algorithm );
+ bool isPhonetic( const css::lang::Locale& rLocale, const OUString& algorithm );
/// @throws css::uno::RuntimeException
- OUString SAL_CALL getHangingCharacters( const css::lang::Locale& rLocale );
+ OUString getHangingCharacters( const css::lang::Locale& rLocale );
//XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
@@ -142,9 +142,9 @@ private:
OUString ref_name;
/// @throws css::uno::RuntimeException
- oslGenericFunction SAL_CALL getFunctionSymbol( const css::lang::Locale& rLocale, const sal_Char* pFunction );
- sal_Unicode ** SAL_CALL getIndexArray(const css::lang::Locale& rLocale, sal_Int16& indexCount);
- sal_Unicode ** SAL_CALL getIndexArrayForAlgorithm(const css::lang::Locale& rLocale, const OUString& rAlgorithm);
+ oslGenericFunction getFunctionSymbol( const css::lang::Locale& rLocale, const sal_Char* pFunction );
+ sal_Unicode ** getIndexArray(const css::lang::Locale& rLocale, sal_Int16& indexCount);
+ sal_Unicode ** getIndexArrayForAlgorithm(const css::lang::Locale& rLocale, const OUString& rAlgorithm);
/// @throws css::uno::RuntimeException
css::uno::Sequence< css::i18n::CalendarItem2 > &
getCalendarItemByName(const OUString& name,
diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx
index 0fe10c4218d1..e248a1812004 100644
--- a/i18npool/inc/nativenumbersupplier.hxx
+++ b/i18npool/inc/nativenumbersupplier.hxx
@@ -59,11 +59,11 @@ public:
// following methods are not for XNativeNumberSupplier, they are for calling from transliterations
/// @throws css::uno::RuntimeException
- OUString SAL_CALL getNativeNumberString( const OUString& aNumberString,
+ OUString getNativeNumberString( const OUString& aNumberString,
const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode,
css::uno::Sequence< sal_Int32 >& offset );
/// @throws css::uno::RuntimeException
- sal_Unicode SAL_CALL getNativeNumberChar( const sal_Unicode inChar,
+ sal_Unicode getNativeNumberChar( const sal_Unicode inChar,
const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) ;
private:
diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx
index 7ed51742292d..d573cc1128ce 100644
--- a/i18npool/inc/textToPronounce_zh.hxx
+++ b/i18npool/inc/textToPronounce_zh.hxx
@@ -31,7 +31,7 @@ protected:
oslModule hModule;
#endif
sal_uInt16 **idx;
- const sal_Unicode* SAL_CALL getPronounce(const sal_Unicode ch);
+ const sal_Unicode* getPronounce(const sal_Unicode ch);
public:
#ifndef DISABLE_DYNLOADING
diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index 8b5c9fa9a20e..98e16ca623f2 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -71,7 +71,7 @@ private:
protected:
#ifndef DISABLE_DYNLOADING
oslModule hModule;
- oslGenericFunction SAL_CALL getFunctionBySymbol(const sal_Char* func);
+ oslGenericFunction getFunctionBySymbol(const sal_Char* func);
#endif
};
@@ -115,7 +115,7 @@ private:
css::uno::Reference < css::linguistic2::XConversionDictionaryList > xCDL;
sal_Int32 maxLeftLength;
sal_Int32 maxRightLength;
- css::uno::Sequence< OUString > SAL_CALL
+ css::uno::Sequence< OUString >
getCharConversions(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toHanja);
};
@@ -153,9 +153,9 @@ public:
private:
// user defined dictionary list
css::uno::Reference < css::linguistic2::XConversionDictionaryList > xCDL;
- OUString SAL_CALL getWordConversion(const OUString& aText,
+ OUString getWordConversion(const OUString& aText,
sal_Int32 nStartPos, sal_Int32 nLength, bool toSChinese, sal_Int32 nConversionOptions, css::uno::Sequence <sal_Int32>& offset);
- rtl:: OUString SAL_CALL getCharConversion(const rtl:: OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toSChinese, sal_Int32 nConversionOptions);
+ rtl:: OUString getCharConversion(const rtl:: OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toSChinese, sal_Int32 nConversionOptions);
css::lang::Locale aLocale;
};
diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx
index 43642ef97452..222e5911dce2 100644
--- a/i18npool/inc/textconversionImpl.hxx
+++ b/i18npool/inc/textconversionImpl.hxx
@@ -69,7 +69,7 @@ private:
css::uno::Reference < css::uno::XComponentContext > m_xContext;
/// @throws css::lang::NoSupportException
- void SAL_CALL getLocaleSpecificTextConversion( const css::lang::Locale& rLocale );
+ void getLocaleSpecificTextConversion( const css::lang::Locale& rLocale );
};
} // i18npool
diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx
index 0d70de37bfd2..6012d41490d8 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.hxx
@@ -91,7 +91,7 @@ private:
css::uno::Reference< css::i18n::XExtendedTransliteration > caseignore;
/// @throws css::uno::RuntimeException
- bool SAL_CALL loadModuleByName( const OUString& implName,
+ bool loadModuleByName( const OUString& implName,
css::uno::Reference<css::i18n::XExtendedTransliteration> & body, const css::lang::Locale& rLocale);
void clear();
@@ -101,7 +101,7 @@ private:
css::uno::Reference< css::i18n::XExtendedTransliteration >& body );
/// @throws css::uno::RuntimeException
- css::uno::Sequence< OUString > SAL_CALL getRange(
+ css::uno::Sequence< OUString > getRange(
const css::uno::Sequence< OUString > &inStrs,
sal_Int32 length, const sal_Int16 _nCascade);
};
diff --git a/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx
index dd3d90209e93..b1ab5b423dbf 100644
--- a/i18npool/inc/transliteration_Numeric.hxx
+++ b/i18npool/inc/transliteration_Numeric.hxx
@@ -49,7 +49,7 @@ protected:
bool recycleSymbol;
private:
/// @throws css::uno::RuntimeException
- OUString SAL_CALL
+ OUString
transliterateBullet( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
css::uno::Sequence< sal_Int32 >& offset );
};
diff --git a/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx
index d0f39a19b43c..5e9d2d7971ba 100644
--- a/i18npool/inc/transliteration_body.hxx
+++ b/i18npool/inc/transliteration_body.hxx
@@ -71,7 +71,7 @@ class Transliteration_casemapping : public Transliteration_body
{
public:
Transliteration_casemapping();
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list