[Libreoffice-commits] core.git: accessibility/source animations/source avmedia/source basctl/source basic/source binaryurp/source bridges/inc bridges/source canvas/source chart2/source comphelper/source compilerplugins/clang configmgr/source connectivity/source cppcanvas/source cppuhelper/source cppu/source cui/source dbaccess/source desktop/source drawinglayer/source dtrans/source editeng/source embeddedobj/source emfio/source eventattacher/source extensions/source filter/source forms/source formula/source fpicker/source framework/source hwpfilter/source i18npool/source i18nutil/source idlc/inc idlc/source include/comphelper include/cppunittester include/editeng include/filter include/framework include/linguistic include/registry include/sfx2 include/store include/svtools include/svx include/toolkit include/vcl include/xmlscript io/source javaunohelper/source lingucomponent/source linguistic/source lotuswordpro/source mysqlc/source odk/qa oox/inc oox/source package/source pyuno/inc pyuno/source remotebridges/source reportdesign/source salhelper/source salhelper/test sal/osl sal/qa sal/rtl sal/textenc sax/source scaddins/source sccomp/source sc/inc scripting/source sc/source sdext/source sd/source sfx2/inc sfx2/source shell/source slideshow/source sot/source starmath/source stoc/source store/source svgio/source svl/source svtools/source svx/source sw/inc sw/source test/source testtools/source toolkit/source ucb/source UnoControls/source unotest/source unotools/source unoxml/source uui/source vbahelper/source vcl/inc vcl/source vcl/unx vcl/workben writerfilter/source writerperfect/source xmlhelp/source xmloff/inc xmloff/source xmlscript/source xmlsecurity/inc xmlsecurity/source

Noel Grandin noel.grandin at collabora.co.uk
Mon Dec 11 11:16:30 UTC 2017


 UnoControls/source/base/registercontrols.cxx                            |   10 
 accessibility/source/helper/acc_factory.cxx                             |    4 
 animations/source/animcore/animcore.cxx                                 |   22 
 avmedia/source/framework/soundhandler.cxx                               |    2 
 avmedia/source/gstreamer/gstuno.cxx                                     |    4 
 avmedia/source/vlc/vlcuno.cxx                                           |    4 
 basctl/source/basicide/register.cxx                                     |    2 
 basctl/source/basicide/unomodel.cxx                                     |    2 
 basctl/source/basicide/unomodel.hxx                                     |    2 
 basic/source/uno/dlgcont.cxx                                            |    2 
 basic/source/uno/scriptcont.cxx                                         |    2 
 binaryurp/source/bridge.cxx                                             |    2 
 binaryurp/source/bridgefactory.cxx                                      |    2 
 binaryurp/source/proxy.cxx                                              |    6 
 binaryurp/source/reader.cxx                                             |    2 
 bridges/inc/bridge.hxx                                                  |   20 
 bridges/inc/cppinterfaceproxy.hxx                                       |    4 
 bridges/inc/unointerfaceproxy.hxx                                       |   16 
 bridges/source/cpp_uno/shared/component.cxx                             |   14 
 bridges/source/cpp_uno/shared/vtablefactory.cxx                         |    4 
 bridges/source/jni_uno/jni_bridge.cxx                                   |   18 
 bridges/source/jni_uno/jni_uno2java.cxx                                 |   16 
 bridges/source/jni_uno/nativethreadpool.cxx                             |    2 
 canvas/source/cairo/cairo_services.cxx                                  |    2 
 canvas/source/factory/cf_service.cxx                                    |    2 
 canvas/source/opengl/ogl_spritecanvas.cxx                               |    2 
 canvas/source/simplecanvas/simplecanvasimpl.cxx                         |    2 
 canvas/source/vcl/services.cxx                                          |    2 
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx       |    2 
 chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx                  |    2 
 chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx             |    2 
 chart2/source/controller/main/ChartController.cxx                       |    2 
 chart2/source/controller/main/ChartFrameloader.cxx                      |    2 
 chart2/source/controller/main/ElementSelector.cxx                       |    2 
 chart2/source/controller/main/ToolbarController.cxx                     |    2 
 chart2/source/controller/sidebar/Chart2PanelFactory.cxx                 |    2 
 chart2/source/model/filter/XMLFilter.cxx                                |    4 
 chart2/source/model/main/Axis.cxx                                       |    2 
 chart2/source/model/main/CartesianCoordinateSystem.cxx                  |    4 
 chart2/source/model/main/ChartModel.cxx                                 |    2 
 chart2/source/model/main/DataSeries.cxx                                 |    2 
 chart2/source/model/main/Diagram.cxx                                    |    2 
 chart2/source/model/main/FormattedString.cxx                            |    2 
 chart2/source/model/main/GridProperties.cxx                             |    2 
 chart2/source/model/main/Legend.cxx                                     |    2 
 chart2/source/model/main/PageBackground.cxx                             |    2 
 chart2/source/model/main/PolarCoordinateSystem.cxx                      |    4 
 chart2/source/model/main/Title.cxx                                      |    2 
 chart2/source/model/template/AreaChartType.cxx                          |    2 
 chart2/source/model/template/BarChartType.cxx                           |    2 
 chart2/source/model/template/BubbleChartType.cxx                        |    2 
 chart2/source/model/template/CandleStickChartType.cxx                   |    2 
 chart2/source/model/template/ChartTypeManager.cxx                       |    2 
 chart2/source/model/template/ColumnChartType.cxx                        |    2 
 chart2/source/model/template/FilledNetChartType.cxx                     |    2 
 chart2/source/model/template/GL3DBarChartType.cxx                       |    2 
 chart2/source/model/template/LineChartType.cxx                          |    2 
 chart2/source/model/template/NetChartType.cxx                           |    2 
 chart2/source/model/template/PieChartType.cxx                           |    2 
 chart2/source/model/template/ScatterChartType.cxx                       |    2 
 chart2/source/tools/CachedDataSequence.cxx                              |    2 
 chart2/source/tools/ConfigColorScheme.cxx                               |    2 
 chart2/source/tools/DataSource.cxx                                      |    2 
 chart2/source/tools/ErrorBar.cxx                                        |    2 
 chart2/source/tools/InternalDataProvider.cxx                            |    2 
 chart2/source/tools/LabeledDataSequence.cxx                             |    2 
 chart2/source/tools/RegressionCurveModel.cxx                            |   14 
 chart2/source/tools/RegressionEquation.cxx                              |    2 
 chart2/source/tools/Scaling.cxx                                         |    8 
 chart2/source/view/main/AbstractShapeFactory.cxx                        |    2 
 chart2/source/view/main/ChartView.cxx                                   |    2 
 comphelper/source/compare/AnyCompareFactory.cxx                         |    2 
 comphelper/source/container/IndexedPropertyValuesContainer.cxx          |    2 
 comphelper/source/container/NamedPropertyValuesContainer.cxx            |    2 
 comphelper/source/misc/comphelper_services.cxx                          |    2 
 comphelper/source/misc/instancelocker.cxx                               |    2 
 comphelper/source/misc/officerestartmanager.cxx                         |    2 
 comphelper/source/officeinstdir/officeinstallationdirectories.cxx       |    2 
 comphelper/source/property/opropertybag.cxx                             |    2 
 comphelper/source/streaming/memorystream.cxx                            |    2 
 comphelper/source/streaming/seqinputstreamserv.cxx                      |    2 
 comphelper/source/streaming/seqoutputstreamserv.cxx                     |    2 
 compilerplugins/clang/salcall.cxx                                       |   25 
 configmgr/source/configurationprovider.hxx                              |    6 
 configmgr/source/configurationregistry.hxx                              |    6 
 configmgr/source/defaultprovider.hxx                                    |    6 
 configmgr/source/readonlyaccess.hxx                                     |    6 
 configmgr/source/readwriteaccess.hxx                                    |    6 
 configmgr/source/services.cxx                                           |    4 
 configmgr/source/update.hxx                                             |    6 
 connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx          |    4 
 connectivity/source/cpool/Zregistration.cxx                             |    2 
 connectivity/source/drivers/ado/Aservices.cxx                           |    2 
 connectivity/source/drivers/calc/CDriver.cxx                            |    2 
 connectivity/source/drivers/calc/Cservices.cxx                          |    4 
 connectivity/source/drivers/dbase/DDriver.cxx                           |    2 
 connectivity/source/drivers/dbase/Dservices.cxx                         |    4 
 connectivity/source/drivers/evoab2/NDriver.cxx                          |    2 
 connectivity/source/drivers/evoab2/NDriver.hxx                          |    2 
 connectivity/source/drivers/evoab2/NServices.cxx                        |    4 
 connectivity/source/drivers/firebird/Driver.cxx                         |    2 
 connectivity/source/drivers/firebird/Driver.hxx                         |    2 
 connectivity/source/drivers/firebird/Services.cxx                       |    4 
 connectivity/source/drivers/flat/EDriver.cxx                            |    2 
 connectivity/source/drivers/flat/Eservices.cxx                          |    4 
 connectivity/source/drivers/hsqldb/HDriver.cxx                          |    2 
 connectivity/source/drivers/hsqldb/Hservices.cxx                        |    4 
 connectivity/source/drivers/jdbc/JDriver.cxx                            |    2 
 connectivity/source/drivers/jdbc/jservices.cxx                          |    4 
 connectivity/source/drivers/macab/MacabServices.cxx                     |    2 
 connectivity/source/drivers/mork/MDriver.cxx                            |    2 
 connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx       |    6 
 connectivity/source/drivers/mysql/YDriver.cxx                           |    2 
 connectivity/source/drivers/mysql/Yservices.cxx                         |    4 
 connectivity/source/drivers/odbc/ORealDriver.cxx                        |    2 
 connectivity/source/drivers/odbc/ORealDriver.hxx                        |    2 
 connectivity/source/drivers/odbc/oservices.cxx                          |    4 
 connectivity/source/drivers/postgresql/pq_connection.cxx                |    2 
 connectivity/source/drivers/postgresql/pq_driver.cxx                    |    2 
 connectivity/source/drivers/writer/WDriver.cxx                          |    2 
 connectivity/source/drivers/writer/Wservices.cxx                        |    4 
 connectivity/source/inc/calc/CDriver.hxx                                |    2 
 connectivity/source/inc/dbase/DDriver.hxx                               |    2 
 connectivity/source/inc/flat/EDriver.hxx                                |    2 
 connectivity/source/inc/hsqldb/HDriver.hxx                              |    2 
 connectivity/source/inc/java/sql/Driver.hxx                             |    2 
 connectivity/source/inc/mysql/YDriver.hxx                               |    2 
 connectivity/source/inc/writer/WDriver.hxx                              |    2 
 connectivity/source/manager/mregistration.cxx                           |    2 
 cppcanvas/source/uno/uno_mtfrenderer.cxx                                |    2 
 cppu/source/AffineBridge/AffineBridge.cxx                               |    4 
 cppu/source/LogBridge/LogBridge.cxx                                     |    4 
 cppu/source/UnsafeBridge/UnsafeBridge.cxx                               |    4 
 cppu/source/helper/purpenv/Proxy.hxx                                    |    2 
 cppu/source/helper/purpenv/helper_purpenv_Environment.cxx               |   46 -
 cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx                   |    8 
 cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx                     |    8 
 cppu/source/threadpool/current.cxx                                      |    2 
 cppu/source/threadpool/jobqueue.hxx                                     |    2 
 cppu/source/typelib/typelib.cxx                                         |    6 
 cppu/source/typelib/typelib.hxx                                         |    6 
 cppu/source/uno/IdentityMapping.cxx                                     |    8 
 cppu/source/uno/cascade_mapping.cxx                                     |    8 
 cppu/source/uno/lbenv.cxx                                               |   32 -
 cppu/source/uno/lbmap.cxx                                               |    8 
 cppuhelper/source/exc_thrower.cxx                                       |    4 
 cppuhelper/source/implbase_ex.cxx                                       |    2 
 cppuhelper/source/macro_expander.cxx                                    |    2 
 cppuhelper/source/servicemanager.hxx                                    |    2 
 cppuhelper/source/tdmgr.cxx                                             |    2 
 cui/source/dialogs/colorpicker.cxx                                      |    6 
 cui/source/inc/colorpicker.hxx                                          |    6 
 cui/source/uno/services.cxx                                             |    2 
 dbaccess/source/core/api/RowSet.cxx                                     |    2 
 dbaccess/source/core/dataaccess/ComponentDefinition.cxx                 |    2 
 dbaccess/source/core/dataaccess/commanddefinition.cxx                   |    2 
 dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx                |    2 
 dbaccess/source/core/dataaccess/databasedocument.cxx                    |    2 
 dbaccess/source/core/dataaccess/datasource.cxx                          |    2 
 dbaccess/source/core/misc/services.cxx                                  |    2 
 dbaccess/source/ext/macromigration/dbmm_services.cxx                    |    2 
 dbaccess/source/filter/xml/dbloader2.cxx                                |    4 
 dbaccess/source/filter/xml/xmlExport.cxx                                |    6 
 dbaccess/source/filter/xml/xmlfilter.cxx                                |    2 
 dbaccess/source/filter/xml/xmlservices.cxx                              |    4 
 dbaccess/source/filter/xml/xmlservices.hxx                              |   12 
 dbaccess/source/inc/registrationhelper.hxx                              |    2 
 dbaccess/source/sdbtools/misc/sdbt_services.cxx                         |    2 
 dbaccess/source/ui/app/AppController.cxx                                |    2 
 dbaccess/source/ui/browser/dbloader.cxx                                 |    2 
 dbaccess/source/ui/browser/exsrcbrw.cxx                                 |    2 
 dbaccess/source/ui/browser/sbagrid.cxx                                  |    2 
 dbaccess/source/ui/browser/unodatbr.cxx                                 |    2 
 dbaccess/source/ui/inc/uiservices.hxx                                   |   48 -
 dbaccess/source/ui/misc/uiservices.cxx                                  |    4 
 dbaccess/source/ui/querydesign/limitboxcontroller.cxx                   |    2 
 dbaccess/source/ui/querydesign/querycontroller.cxx                      |    4 
 dbaccess/source/ui/relationdesign/RelationController.cxx                |    2 
 dbaccess/source/ui/tabledesign/TableController.cxx                      |    2 
 dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx                          |    2 
 dbaccess/source/ui/uno/ColumnControl.cxx                                |    2 
 dbaccess/source/ui/uno/ColumnModel.cxx                                  |    2 
 dbaccess/source/ui/uno/DBTypeWizDlg.cxx                                 |    2 
 dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx                            |    2 
 dbaccess/source/ui/uno/TableFilterDlg.cxx                               |    2 
 dbaccess/source/ui/uno/UserSettingsDlg.cxx                              |    2 
 dbaccess/source/ui/uno/admindlg.cxx                                     |    2 
 dbaccess/source/ui/uno/composerdialogs.cxx                              |    2 
 dbaccess/source/ui/uno/copytablewizard.cxx                              |    2 
 dbaccess/source/ui/uno/dbinteraction.cxx                                |    2 
 dbaccess/source/ui/uno/textconnectionsettings_uno.cxx                   |    2 
 dbaccess/source/ui/uno/unoDirectSql.cxx                                 |    2 
 dbaccess/source/ui/uno/unosqlmessage.cxx                                |    2 
 desktop/source/app/officeipcthread.cxx                                  |    2 
 desktop/source/app/officeipcthread.hxx                                  |    2 
 desktop/source/deployment/dp_services.cxx                               |    2 
 desktop/source/deployment/gui/dp_gui_service.cxx                        |    2 
 desktop/source/deployment/inc/dp_registry.hxx                           |    2 
 desktop/source/deployment/registry/dp_registry.cxx                      |    2 
 desktop/source/migration/services/basicmigration.cxx                    |    2 
 desktop/source/migration/services/basicmigration.hxx                    |    6 
 desktop/source/migration/services/cexports.cxx                          |    2 
 desktop/source/migration/services/cexportsoo3.cxx                       |    2 
 desktop/source/migration/services/oo3extensionmigration.cxx             |    2 
 desktop/source/migration/services/oo3extensionmigration.hxx             |    6 
 desktop/source/migration/services/wordbookmigration.cxx                 |    2 
 desktop/source/migration/services/wordbookmigration.hxx                 |    6 
 desktop/source/offacc/acceptor.cxx                                      |    2 
 desktop/source/splash/services_spl.cxx                                  |    2 
 desktop/source/splash/splash.hxx                                        |    6 
 desktop/source/splash/unxsplash.hxx                                     |    4 
 drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx                 |    2 
 drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx            |    2 
 drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx            |    6 
 dtrans/source/cnttype/mcnttfactory.cxx                                  |    2 
 dtrans/source/cnttype/mctfentry.cxx                                     |    4 
 editeng/source/uno/unofield.cxx                                         |    2 
 embeddedobj/source/commonembedding/register.cxx                         |    2 
 embeddedobj/source/msole/oleregister.cxx                                |    2 
 emfio/source/emfuno/emfuno.cxx                                          |    2 
 emfio/source/emfuno/xemfparser.cxx                                      |    2 
 emfio/source/emfuno/xemfparser.hxx                                      |    6 
 eventattacher/source/eventattacher.cxx                                  |    4 
 extensions/source/abpilot/unodialogabp.cxx                              |    2 
 extensions/source/bibliography/bibload.cxx                              |    6 
 extensions/source/config/ldap/componentdef.cxx                          |    4 
 extensions/source/dbpilots/dbpservices.cxx                              |    4 
 extensions/source/dbpilots/dbpservices.hxx                              |    6 
 extensions/source/dbpilots/wizardservices.cxx                           |    6 
 extensions/source/inc/componentmodule.hxx                               |    2 
 extensions/source/logging/consolehandler.cxx                            |    2 
 extensions/source/logging/csvformatter.cxx                              |    2 
 extensions/source/logging/filehandler.cxx                               |    2 
 extensions/source/logging/logger.cxx                                    |    2 
 extensions/source/logging/plaintextformatter.cxx                        |    2 
 extensions/source/propctrlr/MasterDetailLinkDialog.cxx                  |    2 
 extensions/source/propctrlr/buttonnavigationhandler.cxx                 |    2 
 extensions/source/propctrlr/cellbindinghandler.cxx                      |    2 
 extensions/source/propctrlr/controlfontdialog.cxx                       |    2 
 extensions/source/propctrlr/defaultforminspection.cxx                   |    2 
 extensions/source/propctrlr/defaulthelpprovider.cxx                     |    2 
 extensions/source/propctrlr/editpropertyhandler.cxx                     |    2 
 extensions/source/propctrlr/eformspropertyhandler.cxx                   |    2 
 extensions/source/propctrlr/eventhandler.cxx                            |    2 
 extensions/source/propctrlr/formcomponenthandler.cxx                    |    2 
 extensions/source/propctrlr/formcontroller.cxx                          |    2 
 extensions/source/propctrlr/formgeometryhandler.cxx                     |    2 
 extensions/source/propctrlr/genericpropertyhandler.cxx                  |    2 
 extensions/source/propctrlr/objectinspectormodel.cxx                    |    2 
 extensions/source/propctrlr/pcrservices.cxx                             |    4 
 extensions/source/propctrlr/pcrservices.hxx                             |   38 -
 extensions/source/propctrlr/pcrunodialogs.cxx                           |    2 
 extensions/source/propctrlr/propcontroller.cxx                          |    2 
 extensions/source/propctrlr/stringrepresentation.cxx                    |   14 
 extensions/source/propctrlr/submissionhandler.cxx                       |    2 
 extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx            |    2 
 extensions/source/scanner/scanner.cxx                                   |    2 
 extensions/source/scanner/scanner.hxx                                   |    2 
 extensions/source/scanner/scnserv.cxx                                   |    2 
 extensions/source/update/check/updatecheckjob.cxx                       |    6 
 extensions/source/update/feed/updatefeed.cxx                            |    4 
 extensions/source/update/ui/updatecheckui.cxx                           |    4 
 filter/source/config/cache/registration.cxx                             |    2 
 filter/source/flash/swfdialog.cxx                                       |    4 
 filter/source/flash/swffilter.cxx                                       |    4 
 filter/source/flash/swfuno.cxx                                          |    2 
 filter/source/flash/swfuno.hxx                                          |    8 
 filter/source/graphic/Services.cxx                                      |    2 
 filter/source/graphicfilter/egif/egif.cxx                               |    2 
 filter/source/graphicfilter/eps/eps.cxx                                 |    2 
 filter/source/graphicfilter/etiff/etiff.cxx                             |    2 
 filter/source/graphicfilter/icgm/cgm.cxx                                |    2 
 filter/source/graphicfilter/idxf/idxf.cxx                               |    2 
 filter/source/graphicfilter/ieps/ieps.cxx                               |    2 
 filter/source/graphicfilter/ios2met/ios2met.cxx                         |    2 
 filter/source/graphicfilter/ipbm/ipbm.cxx                               |    2 
 filter/source/graphicfilter/ipcd/ipcd.cxx                               |    2 
 filter/source/graphicfilter/ipcx/ipcx.cxx                               |    2 
 filter/source/graphicfilter/ipict/ipict.cxx                             |    2 
 filter/source/graphicfilter/ipsd/ipsd.cxx                               |    2 
 filter/source/graphicfilter/iras/iras.cxx                               |    2 
 filter/source/graphicfilter/itga/itga.cxx                               |    2 
 filter/source/graphicfilter/itiff/itiff.cxx                             |    2 
 filter/source/msfilter/escherex.cxx                                     |    2 
 filter/source/msfilter/msvbahelper.cxx                                  |    2 
 filter/source/msfilter/services.cxx                                     |    2 
 filter/source/odfflatxml/OdfFlatXml.cxx                                 |    2 
 filter/source/pdf/pdfdialog.cxx                                         |    4 
 filter/source/pdf/pdfdialog.hxx                                         |    4 
 filter/source/pdf/pdffilter.cxx                                         |    4 
 filter/source/pdf/pdffilter.hxx                                         |    4 
 filter/source/pdf/pdfinteract.cxx                                       |    4 
 filter/source/pdf/pdfinteract.hxx                                       |    4 
 filter/source/pdf/pdfuno.cxx                                            |    2 
 filter/source/storagefilterdetect/fdcomp.cxx                            |    2 
 filter/source/svg/svgdialog.cxx                                         |    4 
 filter/source/svg/svgdialog.hxx                                         |    4 
 filter/source/svg/svgfilter.cxx                                         |    2 
 filter/source/t602/filterenv.cxx                                        |    2 
 filter/source/t602/t602filter.cxx                                       |   10 
 filter/source/t602/t602filter.hxx                                       |    8 
 filter/source/textfilterdetect/filterdetect.cxx                         |    2 
 filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx                     |    4 
 filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx                     |    4 
 filter/source/xmlfilteradaptor/genericfilter.cxx                        |    2 
 filter/source/xmlfilterdetect/fdcomp.cxx                                |    2 
 filter/source/xmlfilterdetect/filterdetect.hxx                          |    6 
 filter/source/xsltdialog/xmlfilterdialogcomponent.cxx                   |    6 
 filter/source/xsltfilter/XSLTFilter.cxx                                 |    6 
 forms/source/component/Button.cxx                                       |    4 
 forms/source/component/CheckBox.cxx                                     |    4 
 forms/source/component/ComboBox.cxx                                     |    4 
 forms/source/component/Currency.cxx                                     |    4 
 forms/source/component/DatabaseForm.cxx                                 |    2 
 forms/source/component/Date.cxx                                         |    4 
 forms/source/component/Edit.cxx                                         |    4 
 forms/source/component/File.cxx                                         |    2 
 forms/source/component/Filter.cxx                                       |    2 
 forms/source/component/FixedText.cxx                                    |    2 
 forms/source/component/FormattedField.cxx                               |    2 
 forms/source/component/FormattedFieldWrapper.cxx                        |    4 
 forms/source/component/FormsCollection.cxx                              |    2 
 forms/source/component/Grid.cxx                                         |    2 
 forms/source/component/GroupBox.cxx                                     |    4 
 forms/source/component/Hidden.cxx                                       |    2 
 forms/source/component/ImageButton.cxx                                  |    4 
 forms/source/component/ImageControl.cxx                                 |    4 
 forms/source/component/ListBox.cxx                                      |    4 
 forms/source/component/Numeric.cxx                                      |    4 
 forms/source/component/Pattern.cxx                                      |    4 
 forms/source/component/RadioButton.cxx                                  |    4 
 forms/source/component/Time.cxx                                         |    4 
 forms/source/component/imgprod.cxx                                      |    2 
 forms/source/component/navigationbar.cxx                                |    2 
 forms/source/component/scrollbar.cxx                                    |    2 
 forms/source/component/spinbutton.cxx                                   |    2 
 forms/source/richtext/richtextcontrol.cxx                               |    2 
 forms/source/richtext/richtextmodel.cxx                                 |    2 
 forms/source/runtime/formoperations.cxx                                 |    2 
 forms/source/solar/component/navbarcontrol.cxx                          |    2 
 forms/source/xforms/model.cxx                                           |    2 
 forms/source/xforms/xforms_services.cxx                                 |    2 
 forms/source/xforms/xpathlib/extension.cxx                              |    2 
 formula/source/core/api/services.cxx                                    |    2 
 fpicker/source/office/fps_office.cxx                                    |    2 
 framework/source/accelerators/documentacceleratorconfiguration.cxx      |    2 
 framework/source/accelerators/globalacceleratorconfiguration.cxx        |    2 
 framework/source/accelerators/moduleacceleratorconfiguration.cxx        |    2 
 framework/source/fwe/classes/sfxhelperfunctions.cxx                     |   20 
 framework/source/helper/statusindicatorfactory.cxx                      |    2 
 framework/source/jobs/jobdispatch.cxx                                   |    2 
 framework/source/jobs/jobexecutor.cxx                                   |    2 
 framework/source/layoutmanager/layoutmanager.cxx                        |    2 
 framework/source/services/ContextChangeEventMultiplexer.cxx             |    2 
 framework/source/services/autorecovery.cxx                              |    2 
 framework/source/services/desktop.cxx                                   |    2 
 framework/source/services/frame.cxx                                     |    2 
 framework/source/services/modulemanager.cxx                             |    2 
 framework/source/services/pathsettings.cxx                              |    2 
 framework/source/services/sessionlistener.cxx                           |    2 
 framework/source/services/substitutepathvars.cxx                        |    2 
 framework/source/services/taskcreatorsrv.cxx                            |    2 
 framework/source/services/urltransformer.cxx                            |    2 
 framework/source/uiconfiguration/imagemanager.cxx                       |    2 
 framework/source/uiconfiguration/moduleuicfgsupplier.cxx                |    2 
 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx       |    2 
 framework/source/uiconfiguration/uicategorydescription.cxx              |    2 
 framework/source/uiconfiguration/uiconfigurationmanager.cxx             |    2 
 framework/source/uiconfiguration/windowstateconfiguration.cxx           |    2 
 framework/source/uielement/controlmenucontroller.cxx                    |    2 
 framework/source/uielement/langselectionstatusbarcontroller.cxx         |    2 
 framework/source/uielement/objectmenucontroller.cxx                     |    2 
 framework/source/uielement/popuptoolbarcontroller.cxx                   |    6 
 framework/source/uielement/recentfilesmenucontroller.cxx                |    2 
 framework/source/uielement/resourcemenucontroller.cxx                   |    6 
 framework/source/uielement/subtoolbarcontroller.cxx                     |    2 
 framework/source/uielement/thesaurusmenucontroller.cxx                  |    2 
 framework/source/uielement/uicommanddescription.cxx                     |    2 
 framework/source/uifactory/addonstoolbarfactory.cxx                     |    2 
 framework/source/uifactory/menubarfactory.cxx                           |    2 
 framework/source/uifactory/statusbarfactory.cxx                         |    2 
 framework/source/uifactory/toolbarfactory.cxx                           |    2 
 framework/source/uifactory/uicontrollerfactory.cxx                      |    6 
 framework/source/uifactory/uielementfactorymanager.cxx                  |    2 
 framework/source/uifactory/windowcontentfactorymanager.cxx              |    2 
 hwpfilter/source/hwpreader.cxx                                          |    2 
 hwpfilter/source/hwpreader.hxx                                          |    2 
 i18npool/source/breakiterator/breakiteratorImpl.cxx                     |    6 
 i18npool/source/breakiterator/breakiterator_th.cxx                      |    4 
 i18npool/source/breakiterator/breakiterator_unicode.cxx                 |    2 
 i18npool/source/breakiterator/xdictionary.cxx                           |    2 
 i18npool/source/calendar/calendar_gregorian.cxx                         |    4 
 i18npool/source/characterclassification/cclass_unicode.cxx              |    2 
 i18npool/source/characterclassification/characterclassificationImpl.cxx |    2 
 i18npool/source/characterclassification/unoscripttypedetector.cxx       |    2 
 i18npool/source/collator/collatorImpl.cxx                               |    2 
 i18npool/source/collator/collator_unicode.cxx                           |    2 
 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx   |    2 
 i18npool/source/indexentry/indexentrysupplier_asian.cxx                 |    2 
 i18npool/source/inputchecker/inputsequencechecker.cxx                   |    2 
 i18npool/source/inputchecker/inputsequencechecker_th.cxx                |    2 
 i18npool/source/localedata/localedata.cxx                               |   12 
 i18npool/source/nativenumber/nativenumbersupplier.cxx                   |   22 
 i18npool/source/numberformatcode/numberformatcode.cxx                   |    2 
 i18npool/source/ordinalsuffix/ordinalsuffix.cxx                         |    2 
 i18npool/source/registerservices/registerservices.cxx                   |    4 
 i18npool/source/search/textsearch.cxx                                   |    4 
 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                    |    2 
 i18npool/source/transliteration/ignoreKana.cxx                          |    2 
 i18npool/source/transliteration/ignoreWidth.cxx                         |    2 
 i18npool/source/transliteration/textToPronounce_zh.cxx                  |    2 
 i18npool/source/transliteration/transliterationImpl.cxx                 |    2 
 i18npool/source/transliteration/transliteration_caseignore.cxx          |    2 
 i18nutil/source/utility/casefolding.cxx                                 |    2 
 idlc/inc/astexpression.hxx                                              |    2 
 idlc/inc/idlc.hxx                                                       |    4 
 idlc/inc/idlctypes.hxx                                                  |    4 
 idlc/source/astexpression.cxx                                           |    2 
 idlc/source/idlc.cxx                                                    |   12 
 include/comphelper/componentmodule.hxx                                  |    2 
 include/comphelper/extract.hxx                                          |    2 
 include/cppunittester/protectorfactory.hxx                              |    2 
 include/editeng/unofield.hxx                                            |    2 
 include/filter/msfilter/msvbahelper.hxx                                 |    6 
 include/framework/sfxhelperfunctions.hxx                                |   20 
 include/linguistic/misc.hxx                                             |    2 
 include/registry/typereg_reader.hxx                                     |   68 +-
 include/registry/writer.h                                               |   18 
 include/sfx2/dockwin.hxx                                                |    4 
 include/sfx2/sfxmodelfactory.hxx                                        |    2 
 include/sfx2/stbitem.hxx                                                |    2 
 include/sfx2/tbxctrl.hxx                                                |    2 
 include/store/store.h                                                   |   26 
 include/svtools/accessiblefactory.hxx                                   |    2 
 include/svx/UnoNamespaceMap.hxx                                         |    2 
 include/svx/XPropertyTable.hxx                                          |   12 
 include/svx/unofill.hxx                                                 |   12 
 include/toolkit/helper/accessiblefactory.hxx                            |    2 
 include/vcl/checksum.hxx                                                |    2 
 include/xmlscript/xml_helper.hxx                                        |    6 
 include/xmlscript/xmldlg_imexp.hxx                                      |    8 
 include/xmlscript/xmllib_imexp.hxx                                      |    8 
 include/xmlscript/xmlmod_imexp.hxx                                      |    4 
 io/source/TextInputStream/TextInputStream.cxx                           |    2 
 io/source/TextOutputStream/TextOutputStream.cxx                         |    2 
 io/source/acceptor/acceptor.cxx                                         |    2 
 io/source/connector/connector.cxx                                       |    2 
 io/source/services.cxx                                                  |    2 
 io/source/services.hxx                                                  |   24 
 io/source/stm/odata.cxx                                                 |    8 
 io/source/stm/omark.cxx                                                 |    4 
 io/source/stm/opipe.cxx                                                 |    2 
 io/source/stm/opump.cxx                                                 |    2 
 javaunohelper/source/preload.cxx                                        |    2 
 lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx                   |    4 
 lingucomponent/source/languageguessing/guesslang.cxx                    |    4 
 lingucomponent/source/spellcheck/spell/sspellimp.cxx                    |    4 
 lingucomponent/source/thesaurus/libnth/nthesimp.cxx                     |    4 
 linguistic/source/convdiclist.cxx                                       |    4 
 linguistic/source/dlistimp.cxx                                          |    4 
 linguistic/source/gciterator.cxx                                        |    4 
 linguistic/source/hhconvdic.cxx                                         |    2 
 linguistic/source/lngopt.cxx                                            |    4 
 linguistic/source/lngreg.cxx                                            |    2 
 linguistic/source/lngreg.hxx                                            |   10 
 linguistic/source/lngsvcmgr.cxx                                         |    4 
 linguistic/source/misc.cxx                                              |    2 
 lotuswordpro/source/filter/LotusWordProImportFilter.cxx                 |    4 
 mysqlc/source/mysqlc_driver.cxx                                         |    4 
 mysqlc/source/mysqlc_driver.hxx                                         |    4 
 mysqlc/source/mysqlc_services.cxx                                       |    6 
 odk/qa/checkapi/checkapi.cxx                                            |    2 
 oox/inc/services.hxx                                                    |   42 -
 oox/source/core/fasttokenhandler.cxx                                    |    6 
 oox/source/core/filterdetect.cxx                                        |    2 
 oox/source/core/services.cxx                                            |    2 
 oox/source/docprop/ooxmldocpropimport.cxx                               |    6 
 oox/source/ppt/dgmimport.cxx                                            |    6 
 oox/source/ppt/dgmlayout.cxx                                            |    6 
 oox/source/ppt/pptimport.cxx                                            |    6 
 oox/source/shape/ShapeContextHandler.cxx                                |    6 
 package/source/manifest/ManifestReader.cxx                              |    2 
 package/source/manifest/ManifestWriter.cxx                              |    2 
 package/source/manifest/UnoRegister.cxx                                 |    2 
 package/source/xstor/register.cxx                                       |    2 
 package/source/zippackage/ZipPackage.cxx                                |    2 
 pyuno/inc/pyuno.hxx                                                     |    4 
 pyuno/source/loader/pyuno_loader.cxx                                    |    2 
 remotebridges/source/unourl_resolver/unourl_resolver.cxx                |    4 
 reportdesign/source/core/api/services.cxx                               |    2 
 reportdesign/source/filter/xml/xmlservices.cxx                          |    2 
 reportdesign/source/ui/misc/rptuiservices.cxx                           |    2 
 sal/osl/all/compat.cxx                                                  |    4 
 sal/osl/all/filepath.cxx                                                |    2 
 sal/osl/unx/file_path_helper.cxx                                        |   16 
 sal/osl/unx/file_path_helper.hxx                                        |   16 
 sal/osl/unx/pipe.cxx                                                    |    4 
 sal/osl/unx/process.cxx                                                 |    4 
 sal/osl/unx/process_impl.cxx                                            |    2 
 sal/osl/unx/profile.cxx                                                 |    4 
 sal/osl/unx/secimpl.hxx                                                 |    2 
 sal/osl/unx/security.cxx                                                |   14 
 sal/osl/unx/socket.cxx                                                  |   40 -
 sal/qa/osl/module/osl_Module_DLL.cxx                                    |    2 
 sal/qa/osl/process/osl_Thread.cxx                                       |    2 
 sal/rtl/alloc_arena.cxx                                                 |    8 
 sal/rtl/alloc_global.cxx                                                |   12 
 sal/rtl/cipher.cxx                                                      |    6 
 sal/rtl/digest.cxx                                                      |    8 
 sal/rtl/string.cxx                                                      |    2 
 sal/textenc/textenc.cxx                                                 |    2 
 salhelper/source/dynload.cxx                                            |    2 
 salhelper/test/Symbols/samplelib.hxx                                    |   10 
 salhelper/test/dynamicloader/samplelib.hxx                              |    6 
 sax/source/expatwrap/sax_expat.cxx                                      |    2 
 sax/source/expatwrap/saxwriter.cxx                                      |    2 
 sax/source/fastparser/fastparser.cxx                                    |    2 
 sax/source/fastparser/legacyfastparser.cxx                              |    2 
 sc/inc/appluno.hxx                                                      |   38 -
 sc/inc/filter.hxx                                                       |    2 
 sc/inc/rangelst.hxx                                                     |    2 
 sc/inc/rangenam.hxx                                                     |    2 
 sc/source/core/tool/rangelst.cxx                                        |    2 
 sc/source/core/tool/rangenam.cxx                                        |    2 
 sc/source/filter/excel/excel.cxx                                        |   10 
 sc/source/filter/ftools/ftools.cxx                                      |    2 
 sc/source/filter/oox/excelfilter.cxx                                    |    2 
 sc/source/filter/oox/ooxformulaparser.cxx                               |    2 
 sc/source/filter/orcus/filterdetect.cxx                                 |    2 
 sc/source/filter/xml/xmlexprt.cxx                                       |   20 
 sc/source/filter/xml/xmlimprt.cxx                                       |   34 -
 sc/source/ui/attrdlg/scabstdlg.cxx                                      |    4 
 sc/source/ui/docshell/docsh.cxx                                         |    2 
 sc/source/ui/docshell/impex.cxx                                         |    2 
 sc/source/ui/sidebar/ScPanelFactory.cxx                                 |    2 
 sc/source/ui/unoobj/afmtuno.cxx                                         |    2 
 sc/source/ui/unoobj/appluno.cxx                                         |    8 
 sc/source/ui/unoobj/exceldetect.cxx                                     |    2 
 sc/source/ui/unoobj/filtuno.cxx                                         |    2 
 sc/source/ui/unoobj/funcuno.cxx                                         |    2 
 sc/source/ui/unoobj/scdetect.cxx                                        |    2 
 sc/source/ui/unoobj/unodoc.cxx                                          |    6 
 sc/source/ui/vba/service.cxx                                            |    2 
 sc/source/ui/vba/vbaeventshelper.cxx                                    |    2 
 sc/source/ui/vba/vbaglobals.cxx                                         |    2 
 sc/source/ui/vba/vbatextframe.cxx                                       |    2 
 scaddins/source/analysis/analysis.cxx                                   |    4 
 scaddins/source/analysis/analysis.hxx                                   |    2 
 scaddins/source/datefunc/datefunc.cxx                                   |    4 
 scaddins/source/pricing/pricing.cxx                                     |    4 
 sccomp/source/solver/CoinMPSolver.cxx                                   |    2 
 sccomp/source/solver/LpsolveSolver.cxx                                  |    2 
 sccomp/source/solver/SwarmSolver.cxx                                    |    2 
 scripting/source/basprov/basprov.cxx                                    |    4 
 scripting/source/dlgprov/dlgprov.cxx                                    |   10 
 scripting/source/dlgprov/dlgprov.hxx                                    |    4 
 scripting/source/protocolhandler/scripthandler.cxx                      |    2 
 scripting/source/provider/BrowseNodeFactoryImpl.cxx                     |    6 
 scripting/source/provider/MasterScriptProvider.cxx                      |    6 
 scripting/source/provider/MasterScriptProvider.hxx                      |   12 
 scripting/source/provider/MasterScriptProviderFactory.cxx               |    6 
 scripting/source/stringresource/stringresource.cxx                      |    8 
 scripting/source/vbaevents/eventhelper.cxx                              |    4 
 sd/source/filter/cgm/sdcgmfilter.cxx                                    |    4 
 sd/source/filter/eppt/eppt.cxx                                          |    4 
 sd/source/filter/eppt/pptx-epptooxml.cxx                                |    2 
 sd/source/filter/html/HtmlOptionsDialog.cxx                             |    2 
 sd/source/filter/ppt/pptin.cxx                                          |    4 
 sd/source/filter/sdfilter.cxx                                           |    2 
 sd/source/filter/sdpptwrp.cxx                                           |    6 
 sd/source/filter/xml/sdxmlwrp.cxx                                       |    4 
 sd/source/ui/controller/displaymodecontroller.cxx                       |    2 
 sd/source/ui/controller/slidelayoutcontroller.cxx                       |    4 
 sd/source/ui/dlg/sdabstdlg.cxx                                          |    4 
 sd/source/ui/framework/configuration/Configuration.cxx                  |    2 
 sd/source/ui/framework/configuration/ConfigurationController.cxx        |    2 
 sd/source/ui/framework/configuration/ResourceId.cxx                     |    2 
 sd/source/ui/framework/factories/BasicPaneFactory.cxx                   |    2 
 sd/source/ui/framework/factories/BasicToolBarFactory.cxx                |    2 
 sd/source/ui/framework/factories/BasicViewFactory.cxx                   |    2 
 sd/source/ui/framework/factories/PresentationFactory.cxx                |    2 
 sd/source/ui/framework/module/ModuleController.cxx                      |    2 
 sd/source/ui/inc/facreg.hxx                                             |   12 
 sd/source/ui/presenter/PresenterHelper.cxx                              |    2 
 sd/source/ui/presenter/PresenterPreviewCache.cxx                        |    2 
 sd/source/ui/presenter/PresenterTextView.cxx                            |    2 
 sd/source/ui/presenter/SlideRenderer.cxx                                |    2 
 sd/source/ui/sidebar/PanelFactory.cxx                                   |    2 
 sd/source/ui/slidesorter/shell/SlideSorterService.cxx                   |    2 
 sd/source/ui/unoidl/UnoDocumentSettings.cxx                             |    2 
 sd/source/ui/unoidl/UnoDocumentSettings.hxx                             |    2 
 sd/source/ui/unoidl/facreg.cxx                                          |    2 
 sd/source/ui/unoidl/randomnode.cxx                                      |    2 
 sd/source/ui/unoidl/sddetect.cxx                                        |    2 
 sd/source/ui/unoidl/unodoc.cxx                                          |   12 
 sd/source/ui/unoidl/unomodule.cxx                                       |    2 
 sdext/source/minimizer/pppoptimizeruno.cxx                              |    2 
 sdext/source/pdfimport/services.cxx                                     |    4 
 sdext/source/presenter/PresenterComponent.cxx                           |    2 
 sfx2/inc/fwkhelper.hxx                                                  |    2 
 sfx2/source/appl/app.cxx                                                |    6 
 sfx2/source/appl/appbaslib.cxx                                          |    4 
 sfx2/source/appl/appdispatchprovider.cxx                                |    2 
 sfx2/source/appl/appinit.cxx                                            |    2 
 sfx2/source/appl/appserv.cxx                                            |    4 
 sfx2/source/appl/fwkhelper.cxx                                          |    2 
 sfx2/source/appl/macroloader.cxx                                        |    2 
 sfx2/source/appl/shutdownicon.cxx                                       |    4 
 sfx2/source/appl/xpackcreator.cxx                                       |    2 
 sfx2/source/control/dispatch.cxx                                        |    2 
 sfx2/source/control/objface.cxx                                         |    4 
 sfx2/source/dialog/backingcomp.cxx                                      |    2 
 sfx2/source/dialog/dockwin.cxx                                          |    4 
 sfx2/source/doc/SfxDocumentMetaData.cxx                                 |   24 
 sfx2/source/doc/doctemplates.cxx                                        |    2 
 sfx2/source/doc/iframe.cxx                                              |    2 
 sfx2/source/doc/ownsubfilterservice.cxx                                 |    2 
 sfx2/source/notify/globalevents.cxx                                     |    2 
 sfx2/source/statbar/stbitem.cxx                                         |    2 
 sfx2/source/toolbox/tbxitem.cxx                                         |    2 
 sfx2/source/view/classificationcontroller.cxx                           |    2 
 sfx2/source/view/frmload.cxx                                            |    2 
 shell/source/backends/desktopbe/desktopbackend.cxx                      |    8 
 shell/source/backends/localebe/localebecdef.cxx                         |    4 
 shell/source/cmdmail/cmdmailentry.cxx                                   |    4 
 shell/source/cmdmail/cmdmailsuppl.cxx                                   |    2 
 shell/source/sessioninstall/services.cxx                                |    4 
 shell/source/unix/exec/shellexec.cxx                                    |    2 
 shell/source/unix/exec/shellexecentry.cxx                               |    4 
 slideshow/source/engine/opengl/TransitionerImpl.cxx                     |    2 
 slideshow/source/engine/slide/targetpropertiescreator.cxx               |    2 
 slideshow/source/engine/slide/targetpropertiescreator.hxx               |    2 
 slideshow/source/engine/slideshowimpl.cxx                               |    2 
 sot/source/sdstor/storage.cxx                                           |    2 
 sot/source/unoolestorage/xolesimplestorage.cxx                          |    2 
 starmath/source/detreg.cxx                                              |    2 
 starmath/source/mathmlexport.cxx                                        |   12 
 starmath/source/mathmlimport.cxx                                        |   20 
 starmath/source/mathtype.cxx                                            |    2 
 starmath/source/register.cxx                                            |    2 
 starmath/source/register.hxx                                            |   24 
 starmath/source/unodoc.cxx                                              |    6 
 starmath/source/unofilter.cxx                                           |    2 
 stoc/source/corereflection/crefl.cxx                                    |    2 
 stoc/source/defaultregistry/defaultregistry.cxx                         |    2 
 stoc/source/implementationregistration/implreg.cxx                      |    2 
 stoc/source/inspect/introspection.cxx                                   |    2 
 stoc/source/invocation/invocation.cxx                                   |    4 
 stoc/source/invocation_adapterfactory/iafactory.cxx                     |   10 
 stoc/source/javaloader/javaloader.cxx                                   |    4 
 stoc/source/javavm/javavm.cxx                                           |    4 
 stoc/source/loader/dllcomponentloader.cxx                               |    2 
 stoc/source/namingservice/namingservice.cxx                             |    4 
 stoc/source/proxy_factory/proxyfac.cxx                                  |   12 
 stoc/source/security/access_controller.cxx                              |    2 
 stoc/source/security/file_policy.cxx                                    |    2 
 stoc/source/servicemanager/servicemanager.cxx                           |    6 
 stoc/source/simpleregistry/simpleregistry.cxx                           |    2 
 stoc/source/typeconv/convert.cxx                                        |    2 
 stoc/source/uriproc/ExternalUriReferenceTranslator.cxx                  |    2 
 stoc/source/uriproc/UriReferenceFactory.cxx                             |    2 
 stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx       |    2 
 stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx       |    2 
 stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx                |    2 
 store/source/storbios.cxx                                               |    2 
 store/source/store.cxx                                                  |   26 
 svgio/source/svguno/svguno.cxx                                          |    2 
 svgio/source/svguno/xsvgparser.cxx                                      |    2 
 svgio/source/svguno/xsvgparser.hxx                                      |    6 
 svl/source/fsstor/fsfactory.cxx                                         |    2 
 svl/source/numbers/numfmuno.cxx                                         |    2 
 svl/source/numbers/supservs.cxx                                         |    2 
 svl/source/passwordcontainer/passwordcontainer.cxx                      |    2 
 svl/source/uno/pathservice.cxx                                          |    2 
 svtools/source/filter/SvFilterOptionsDialog.cxx                         |    2 
 svtools/source/graphic/graphicunofactory.cxx                            |    2 
 svtools/source/graphic/provider.cxx                                     |    2 
 svtools/source/graphic/renderer.cxx                                     |    2 
 svtools/source/hatchwindow/documentcloser.cxx                           |    2 
 svtools/source/hatchwindow/hatchwindowfactory.cxx                       |    2 
 svtools/source/misc/svtaccessiblefactory.cxx                            |    2 
 svtools/source/svhtml/htmlkywd.cxx                                      |    6 
 svtools/source/svrtf/rtfkeywd.cxx                                       |    2 
 svtools/source/uno/addrtempuno.cxx                                      |    2 
 svtools/source/uno/fpicker.cxx                                          |    4 
 svtools/source/uno/fpicker.hxx                                          |    8 
 svtools/source/uno/miscservices.cxx                                     |    2 
 svtools/source/uno/wizard/unowizard.cxx                                 |    2 
 svx/source/core/coreservices.cxx                                        |    2 
 svx/source/customshapes/EnhancedCustomShapeEngine.cxx                   |    2 
 svx/source/dialog/SafeModeUI.cxx                                        |    2 
 svx/source/fmcomp/fmgridif.cxx                                          |    2 
 svx/source/fmcomp/gridcols.cxx                                          |    2 
 svx/source/form/formcontroller.cxx                                      |    2 
 svx/source/form/legacyformcontroller.cxx                                |    2 
 svx/source/form/xfm_addcondition.cxx                                    |    6 
 svx/source/inc/coreservices.hxx                                         |   36 -
 svx/source/inc/fmservs.hxx                                              |   12 
 svx/source/mnuctrls/smarttagmenu.cxx                                    |    2 
 svx/source/sdr/primitive2d/primitivefactory2d.cxx                       |    2 
 svx/source/sidebar/PanelFactory.cxx                                     |    2 
 svx/source/svdraw/svdhdl.cxx                                            |    2 
 svx/source/tbxctrls/bulletsnumbering.cxx                                |    2 
 svx/source/tbxctrls/extrusioncontrols.cxx                               |   24 
 svx/source/tbxctrls/fontworkgallery.cxx                                 |   12 
 svx/source/tbxctrls/linectrl.cxx                                        |    2 
 svx/source/tbxctrls/tbcontrl.cxx                                        |    8 
 svx/source/tbxctrls/tbunocontroller.cxx                                 |    2 
 svx/source/tbxctrls/tbunosearchcontrollers.cxx                          |   18 
 svx/source/unodialogs/textconversiondlgs/services.cxx                   |    2 
 svx/source/unodraw/UnoGraphicExporter.cxx                               |    2 
 svx/source/unodraw/UnoNamespaceMap.cxx                                  |    6 
 svx/source/unodraw/XPropertyTable.cxx                                   |   12 
 svx/source/unodraw/gluepts.cxx                                          |    2 
 svx/source/unodraw/gluepts.hxx                                          |    2 
 svx/source/unodraw/recoveryui.cxx                                       |    2 
 svx/source/unodraw/unobtabl.cxx                                         |    2 
 svx/source/unodraw/unoctabl.cxx                                         |    2 
 svx/source/unodraw/unodtabl.cxx                                         |    2 
 svx/source/unodraw/unogtabl.cxx                                         |    2 
 svx/source/unodraw/unohtabl.cxx                                         |    2 
 svx/source/unodraw/unomtabl.cxx                                         |    2 
 svx/source/unodraw/unoshap2.cxx                                         |    4 
 svx/source/unodraw/unoshcol.cxx                                         |    2 
 svx/source/unodraw/unottabl.cxx                                         |    2 
 svx/source/unogallery/unogalthemeprovider.cxx                           |    2 
 svx/source/xml/xmlgrhlp.cxx                                             |    4 
 sw/inc/shellio.hxx                                                      |    6 
 sw/source/core/bastyp/calc.cxx                                          |    2 
 sw/source/core/docnode/finalthreadmanager.cxx                           |    2 
 sw/source/core/inc/unofreg.hxx                                          |   12 
 sw/source/core/layout/dumpfilter.cxx                                    |    2 
 sw/source/filter/basflt/fltini.cxx                                      |    4 
 sw/source/filter/docx/swdocxreader.cxx                                  |    2 
 sw/source/filter/html/svxcss1.cxx                                       |    2 
 sw/source/filter/html/swhtml.cxx                                        |    2 
 sw/source/filter/rtf/swparrtf.cxx                                       |    4 
 sw/source/filter/ww8/docxexportfilter.cxx                               |    6 
 sw/source/filter/ww8/rtfexport.cxx                                      |    4 
 sw/source/filter/ww8/rtfexportfilter.cxx                                |    4 
 sw/source/filter/ww8/rtfexportfilter.hxx                                |    4 
 sw/source/filter/ww8/wrtww8.cxx                                         |    6 
 sw/source/filter/ww8/ww8par.cxx                                         |   10 
 sw/source/filter/xml/xmlexp.cxx                                         |   20 
 sw/source/filter/xml/xmlimp.cxx                                         |   14 
 sw/source/ui/uno/swdetect.cxx                                           |    2 
 sw/source/ui/vba/service.cxx                                            |    2 
 sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx                      |    4 
 sw/source/uibase/dialog/swabstdlg.cxx                                   |    4 
 sw/source/uibase/ribbar/workctrl.cxx                                    |    6 
 sw/source/uibase/sidebar/SwPanelFactory.cxx                             |    2 
 sw/source/uibase/uno/SwXFilterOptions.cxx                               |    2 
 sw/source/uibase/uno/unoatxt.cxx                                        |    2 
 sw/source/uibase/uno/unodoc.cxx                                         |   10 
 sw/source/uibase/uno/unofreg.cxx                                        |    4 
 sw/source/uibase/uno/unomod.cxx                                         |    2 
 sw/source/uibase/uno/unomodule.cxx                                      |    6 
 test/source/vclbootstrapprotector.cxx                                   |    2 
 testtools/source/bridgetest/bridgetest.cxx                              |    4 
 testtools/source/bridgetest/constructors.cxx                            |   14 
 testtools/source/bridgetest/cppobj.cxx                                  |    4 
 toolkit/source/awt/asynccallback.cxx                                    |    2 
 toolkit/source/awt/vclxmenu.cxx                                         |    4 
 toolkit/source/awt/vclxpointer.cxx                                      |    2 
 toolkit/source/awt/vclxprinter.cxx                                      |    2 
 toolkit/source/awt/vclxtoolkit.cxx                                      |   10 
 toolkit/source/controls/animatedimages.cxx                              |    4 
 toolkit/source/controls/dialogcontrol.cxx                               |   16 
 toolkit/source/controls/formattedcontrol.cxx                            |    4 
 toolkit/source/controls/grid/defaultgridcolumnmodel.cxx                 |    2 
 toolkit/source/controls/grid/defaultgriddatamodel.cxx                   |    2 
 toolkit/source/controls/grid/gridcolumn.cxx                             |    2 
 toolkit/source/controls/grid/gridcontrol.cxx                            |    4 
 toolkit/source/controls/grid/sortablegriddatamodel.cxx                  |    2 
 toolkit/source/controls/roadmapcontrol.cxx                              |    4 
 toolkit/source/controls/spinningprogress.cxx                            |    2 
 toolkit/source/controls/stdtabcontroller.cxx                            |    2 
 toolkit/source/controls/stdtabcontrollermodel.cxx                       |    2 
 toolkit/source/controls/tabpagecontainer.cxx                            |    4 
 toolkit/source/controls/tabpagemodel.cxx                                |    4 
 toolkit/source/controls/tkscrollbar.cxx                                 |    4 
 toolkit/source/controls/tkspinbutton.cxx                                |    4 
 toolkit/source/controls/tree/treecontrol.cxx                            |    4 
 toolkit/source/controls/tree/treedatamodel.cxx                          |    2 
 toolkit/source/controls/unocontrolcontainer.cxx                         |    2 
 toolkit/source/controls/unocontrolcontainermodel.cxx                    |    2 
 toolkit/source/controls/unocontrols.cxx                                 |   72 +-
 toolkit/source/helper/accessibilityclient.cxx                           |    2 
 ucb/source/cacher/cachedcontentresultset.cxx                            |    2 
 ucb/source/cacher/cachedcontentresultsetstub.cxx                        |    2 
 ucb/source/cacher/cacheddynamicresultset.cxx                            |    2 
 ucb/source/cacher/cacheddynamicresultsetstub.cxx                        |    2 
 ucb/source/cacher/cacheserv.cxx                                         |    2 
 ucb/source/core/FileAccess.cxx                                          |    2 
 ucb/source/core/FileAccess.hxx                                          |    2 
 ucb/source/core/cmdenv.cxx                                              |    2 
 ucb/source/core/provprox.cxx                                            |    2 
 ucb/source/core/ucb.cxx                                                 |    2 
 ucb/source/core/ucbprops.cxx                                            |    2 
 ucb/source/core/ucbserv.cxx                                             |    2 
 ucb/source/core/ucbstore.cxx                                            |    2 
 ucb/source/sorter/sortdynres.cxx                                        |    2 
 ucb/source/sorter/sortmain.cxx                                          |    2 
 ucb/source/ucp/cmis/cmis_provider.cxx                                   |    4 
 ucb/source/ucp/expand/ucpexpand.cxx                                     |    8 
 ucb/source/ucp/ext/ucpext_services.cxx                                  |    2 
 ucb/source/ucp/file/prov.cxx                                            |    2 
 ucb/source/ucp/ftp/ftpcontentprovider.cxx                               |    2 
 ucb/source/ucp/ftp/ftpservices.cxx                                      |    2 
 ucb/source/ucp/gio/gio_provider.cxx                                     |    4 
 ucb/source/ucp/hierarchy/hierarchydatasource.cxx                        |    2 
 ucb/source/ucp/hierarchy/hierarchyprovider.cxx                          |    2 
 ucb/source/ucp/hierarchy/hierarchyservices.cxx                          |    2 
 ucb/source/ucp/image/ucpimage.cxx                                       |    2 
 ucb/source/ucp/package/pkgprovider.cxx                                  |    2 
 ucb/source/ucp/package/pkgservices.cxx                                  |    2 
 ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx                     |    2 
 ucb/source/ucp/tdoc/tdoc_provider.cxx                                   |    2 
 ucb/source/ucp/tdoc/tdoc_services.cxx                                   |    2 
 ucb/source/ucp/webdav-neon/webdavprovider.cxx                           |    2 
 ucb/source/ucp/webdav-neon/webdavservices.cxx                           |    2 
 unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx      |    2 
 unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx      |    2 
 unotools/source/misc/unotoolsservices.cxx                               |    2 
 unoxml/source/rdf/CBlankNode.cxx                                        |    6 
 unoxml/source/rdf/CLiteral.cxx                                          |    6 
 unoxml/source/rdf/CNodes.hxx                                            |   18 
 unoxml/source/rdf/CURI.cxx                                              |    6 
 unoxml/source/rdf/librdf_repository.cxx                                 |    6 
 unoxml/source/rdf/librdf_repository.hxx                                 |    6 
 unoxml/source/rdf/librdf_services.cxx                                   |    2 
 unoxml/source/service/services.cxx                                      |    2 
 uui/source/interactionhandler.cxx                                       |    2 
 uui/source/passwordcontainer.cxx                                        |    2 
 uui/source/requeststringresolver.cxx                                    |    2 
 uui/source/services.cxx                                                 |    2 
 vbahelper/source/msforms/service.cxx                                    |    2 
 vcl/inc/factory.hxx                                                     |   28 
 vcl/source/app/session.cxx                                              |    6 
 vcl/source/app/svapp.cxx                                                |    4 
 vcl/source/app/svmain.cxx                                               |    4 
 vcl/source/bitmap/checksum.cxx                                          |    2 
 vcl/source/components/dtranscomp.cxx                                    |   16 
 vcl/source/components/factory.cxx                                       |    2 
 vcl/source/components/fontident.cxx                                     |    2 
 vcl/source/gdi/bitmap3.cxx                                              |    2 
 vcl/source/gdi/bitmap4.cxx                                              |    2 
 vcl/source/gdi/impvect.cxx                                              |    2 
 vcl/source/outdev/hatch.cxx                                             |    2 
 vcl/source/uitest/uno/uitest_uno.cxx                                    |    2 
 vcl/source/window/abstdlg.cxx                                           |    4 
 vcl/source/window/builder.cxx                                           |    2 
 vcl/unx/generic/app/salinst.cxx                                         |    2 
 vcl/unx/generic/app/sm.cxx                                              |    2 
 vcl/unx/generic/dtrans/X11_clipboard.hxx                                |    2 
 vcl/unx/generic/dtrans/X11_selection.hxx                                |    4 
 vcl/unx/generic/dtrans/X11_service.cxx                                  |    6 
 vcl/workben/fftester.cxx                                                |    2 
 writerfilter/source/filter/RtfFilter.cxx                                |    2 
 writerfilter/source/filter/WriterFilter.cxx                             |    2 
 writerperfect/source/calc/MSWorksCalcImportFilter.cxx                   |    2 
 writerperfect/source/calc/MWAWCalcImportFilter.cxx                      |    2 
 writerperfect/source/calc/NumbersImportFilter.cxx                       |    2 
 writerperfect/source/calc/StarOfficeCalcImportFilter.cxx                |    2 
 writerperfect/source/draw/CDRImportFilter.cxx                           |    2 
 writerperfect/source/draw/CMXImportFilter.cxx                           |    2 
 writerperfect/source/draw/FreehandImportFilter.cxx                      |    2 
 writerperfect/source/draw/MSPUBImportFilter.cxx                         |    2 
 writerperfect/source/draw/MWAWDrawImportFilter.cxx                      |    2 
 writerperfect/source/draw/PageMakerImportFilter.cxx                     |    2 
 writerperfect/source/draw/QXPImportFilter.cxx                           |    2 
 writerperfect/source/draw/StarOfficeDrawImportFilter.cxx                |    2 
 writerperfect/source/draw/VisioImportFilter.cxx                         |    2 
 writerperfect/source/draw/WPGImportFilter.cxx                           |    2 
 writerperfect/source/draw/ZMFImportFilter.cxx                           |    2 
 writerperfect/source/impress/KeynoteImportFilter.cxx                    |    2 
 writerperfect/source/impress/MWAWPresentationImportFilter.cxx           |    2 
 writerperfect/source/impress/StarOfficePresentationImportFilter.cxx     |    2 
 writerperfect/source/writer/AbiWordImportFilter.cxx                     |    2 
 writerperfect/source/writer/EBookImportFilter.cxx                       |    2 
 writerperfect/source/writer/EPUBExportFilter.cxx                        |    2 
 writerperfect/source/writer/EPUBExportUIComponent.cxx                   |    2 
 writerperfect/source/writer/MSWorksImportFilter.cxx                     |    2 
 writerperfect/source/writer/MWAWImportFilter.cxx                        |    2 
 writerperfect/source/writer/PagesImportFilter.cxx                       |    2 
 writerperfect/source/writer/StarOfficeWriterImportFilter.cxx            |    2 
 writerperfect/source/writer/WordPerfectImportFilter.cxx                 |    2 
 xmlhelp/source/cxxhelp/provider/provider.cxx                            |    2 
 xmlhelp/source/cxxhelp/provider/services.cxx                            |    2 
 xmloff/inc/facreg.hxx                                                   |  288 +++++-----
 xmloff/source/chart/SchXMLExport.cxx                                    |   42 -
 xmloff/source/chart/SchXMLImport.cxx                                    |   24 
 xmloff/source/core/facreg.cxx                                           |    2 
 xmloff/source/draw/animationimport.cxx                                  |    6 
 xmloff/source/meta/MetaExportComponent.cxx                              |    8 
 xmloff/source/meta/MetaImportComponent.cxx                              |    2 
 xmloff/source/meta/xmlversion.cxx                                       |    2 
 xmloff/source/text/XMLAutoTextEventExport.cxx                           |   12 
 xmloff/source/text/XMLAutoTextEventImport.cxx                           |    6 
 xmloff/source/transform/OOo2Oasis.cxx                                   |    6 
 xmloff/source/transform/Oasis2OOo.cxx                                   |    6 
 xmloff/source/transform/XMLFilterRegistration.cxx                       |    8 
 xmloff/source/transform/XMLFilterRegistration.hxx                       |   12 
 xmlscript/source/inc/unoservices.hxx                                    |    6 
 xmlscript/source/inc/xml_import.hxx                                     |    2 
 xmlscript/source/misc/unoservices.cxx                                   |    2 
 xmlscript/source/xml_helper/xml_byteseq.cxx                             |    6 
 xmlscript/source/xml_helper/xml_impctx.cxx                              |    4 
 xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx                        |    4 
 xmlscript/source/xmldlg_imexp/xmldlg_export.cxx                         |    2 
 xmlscript/source/xmldlg_imexp/xmldlg_import.cxx                         |    2 
 xmlscript/source/xmlflat_imexp/xmlbas_export.cxx                        |    4 
 xmlscript/source/xmlflat_imexp/xmlbas_import.cxx                        |    4 
 xmlscript/source/xmllib_imexp/xmllib_export.cxx                         |    4 
 xmlscript/source/xmllib_imexp/xmllib_import.cxx                         |    4 
 xmlscript/source/xmlmod_imexp/xmlmod_export.cxx                         |    2 
 xmlscript/source/xmlmod_imexp/xmlmod_import.cxx                         |    2 
 xmlsecurity/inc/framework/saxeventkeeperimpl.hxx                        |    2 
 xmlsecurity/inc/framework/signaturecreatorimpl.hxx                      |    2 
 xmlsecurity/inc/framework/signatureverifierimpl.hxx                     |    2 
 xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx                |    4 
 xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx                 |    4 
 xmlsecurity/source/component/documentdigitalsignatures.hxx              |    2 
 xmlsecurity/source/component/registerservices.cxx                       |    2 
 xmlsecurity/source/framework/saxeventkeeperimpl.cxx                     |    2 
 xmlsecurity/source/framework/signaturecreatorimpl.cxx                   |    2 
 xmlsecurity/source/framework/signatureverifierimpl.cxx                  |    2 
 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx                        |    4 
 xmlsecurity/source/xmlsec/nss/nssinitializer.hxx                        |    4 
 xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx                 |    4 
 xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx                 |    4 
 xmlsecurity/source/xmlsec/nss/xsec_nss.cxx                              |    2 
 xmlsecurity/source/xmlsec/serialnumberadapter.hxx                       |    2 
 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx             |    4 
 xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx              |    4 
 xmlsecurity/source/xmlsec/xsec_xmlsec.cxx                               |    2 
 xmlsecurity/source/xmlsec/xsec_xmlsec.hxx                               |    2 
 940 files changed, 2107 insertions(+), 2126 deletions(-)

New commits:
commit 3af500580b1c82eabd60335c9ebc458a3f68850c
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Dec 8 15:58:41 2017 +0200

    loplugin:salcall fix functions
    
    since cdecl is the default calling convention on Windows for
    such functions, the annotation is redundant.
    
    Change-Id: I1a85fa27e5ac65ce0e04a19bde74c90800ffaa2d
    Reviewed-on: https://gerrit.libreoffice.org/46164
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx
index 4b83ed611d12..46145f1c0a48 100644
--- a/UnoControls/source/base/registercontrols.cxx
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -32,7 +32,7 @@
 namespace {
 
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL FrameControl_createInstance(
+css::uno::Reference<css::uno::XInterface> FrameControl_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const &
         rServiceManager)
 {
@@ -42,7 +42,7 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL FrameControl_createInstance(
 }
 
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL ProgressBar_createInstance(
+css::uno::Reference<css::uno::XInterface> ProgressBar_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const &
         rServiceManager)
 {
@@ -52,7 +52,7 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL ProgressBar_createInstance(
 }
 
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL
+css::uno::Reference<css::uno::XInterface>
 ProgressMonitor_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const &
         rServiceManager)
@@ -63,7 +63,7 @@ ProgressMonitor_createInstance(
 }
 
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL
+css::uno::Reference<css::uno::XInterface>
 StatusIndicator_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const &
         rServiceManager)
@@ -75,7 +75,7 @@ StatusIndicator_createInstance(
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ctl_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * ctl_component_getFactory(
     char const * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void *)
 {
     css::uno::Reference<css::lang::XMultiServiceFactory > smgr(
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 1f452c7d2d2d..cbc9669b18c8 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -451,7 +451,7 @@ Reference< XAccessible > AccessibleFactory::createEditBrowseBoxTableCellAccess(
 */
 extern "C"
 {
-    SAL_DLLPUBLIC_EXPORT void* SAL_CALL getStandardAccessibleFactory()
+    SAL_DLLPUBLIC_EXPORT void* getStandardAccessibleFactory()
     {
         ::toolkit::IAccessibleFactory* pFactory = new AccessibleFactory;
         pFactory->acquire();
@@ -467,7 +467,7 @@ extern "C"
 */
 extern "C"
 {
-    SAL_DLLPUBLIC_EXPORT void* SAL_CALL getSvtAccessibilityComponentFactory()
+    SAL_DLLPUBLIC_EXPORT void* getSvtAccessibilityComponentFactory()
     {
         ::svt::IAccessibleFactory* pFactory = new AccessibleFactory;
         pFactory->acquire();
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index f4af2aada347..e4ec6379d7e0 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -1989,77 +1989,77 @@ void AnimationNode::fireChangeListener()
 } // namespace animcore
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_animations_ParallelTimeContainer_get_implementation(css::uno::XComponentContext*,
                                                              css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new animcore::AnimationNode(PAR));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_animations_SequenceTimeContainer_get_implementation(css::uno::XComponentContext*,
                                                              css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new animcore::AnimationNode(SEQ));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_animations_IterateContainer_get_implementation(css::uno::XComponentContext*,
                                                              css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new animcore::AnimationNode(ITERATE));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_animations_Animate_get_implementation(css::uno::XComponentContext*,
                                                              css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new animcore::AnimationNode(ANIMATE));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_animations_AnimateSet_get_implementation(css::uno::XComponentContext*,
                                                              css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new animcore::AnimationNode(SET));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_animations_AnimateColor_get_implementation(css::uno::XComponentContext*,
                                                              css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new animcore::AnimationNode(ANIMATECOLOR));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_animations_AnimateMotion_get_implementation(css::uno::XComponentContext*,
                                                              css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new animcore::AnimationNode(ANIMATEMOTION));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_animations_AnimateTransform_get_implementation(css::uno::XComponentContext*,
                                                              css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new animcore::AnimationNode(ANIMATETRANSFORM));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_animations_TransitionFilter_get_implementation(css::uno::XComponentContext*,
                                                              css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new animcore::AnimationNode(TRANSITIONFILTER));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_animations_Audio_get_implementation(css::uno::XComponentContext*,
                                                              css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new animcore::AnimationNode(AUDIO));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_animations_Command_get_implementation(css::uno::XComponentContext*,
                                                              css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 3f2ffcd9771f..0fb8a2b7d5a0 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -336,7 +336,7 @@ IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify, Timer *, void)
 } // namespace framework
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_comp_framework_SoundHandler_get_implementation(css::uno::XComponentContext*,
                                                             css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
index b4126fd9f9e5..abd01f5cfb62 100644
--- a/avmedia/source/gstreamer/gstuno.cxx
+++ b/avmedia/source/gstreamer/gstuno.cxx
@@ -34,12 +34,12 @@ using namespace ::com::sun::star;
 #  define SERVICE_NAME AVMEDIA_MANAGER_SERVICE_NAME // "com.sun.star.comp.avmedia.Manager_GStreamer"
 #endif
 
-static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >&  )
+static uno::Reference< uno::XInterface > create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >&  )
 {
     return uno::Reference< uno::XInterface >( *new ::avmedia::gstreamer::Manager );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediagst_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* avmediagst_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
 {
     uno::Reference< lang::XSingleServiceFactory > xFactory;
     void*                                   pRet = nullptr;
diff --git a/avmedia/source/vlc/vlcuno.cxx b/avmedia/source/vlc/vlcuno.cxx
index 0c505696261a..99ffd3522026 100644
--- a/avmedia/source/vlc/vlcuno.cxx
+++ b/avmedia/source/vlc/vlcuno.cxx
@@ -29,7 +29,7 @@ using namespace ::com::sun::star;
 #define IMPL_NAME    "com.sun.star.comp.media.Manager_VLC"
 #define SERVICE_NAME "com.sun.star.comp.avmedia.Manager_VLC"
 
-static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact )
+static uno::Reference< uno::XInterface > create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact )
 {
     SAL_INFO("avmedia", "create VLC Media player !");
 
@@ -42,7 +42,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno:
     return manager;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediavlc_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* avmediavlc_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
 {
     uno::Reference< lang::XSingleServiceFactory > xFactory;
     void*                                   pRet = nullptr;
diff --git a/basctl/source/basicide/register.cxx b/basctl/source/basicide/register.cxx
index 22d06f80bb2d..8219af8858a0 100644
--- a/basctl/source/basicide/register.cxx
+++ b/basctl/source/basicide/register.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star::lang;
 
 extern "C" {
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL basctl_component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* basctl_component_getFactory( const sal_Char* pImplementationName,
                                      void* pServiceManager,
                                      void* )
 {
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index f823dfedd115..b85090a04833 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -103,7 +103,7 @@ uno::Sequence< OUString > SIDEModel::getSupportedServiceNames_Static()
     return { "com.sun.star.script.BasicIDE" };
 }
 
-uno::Reference< uno::XInterface > SAL_CALL SIDEModel_createInstance(
+uno::Reference< uno::XInterface > SIDEModel_createInstance(
                 const uno::Reference< lang::XMultiServiceFactory > & )
 {
     SolarMutexGuard aGuard;
diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx
index 3d5fa6966cc6..b73fa5fa0814 100644
--- a/basctl/source/basicide/unomodel.hxx
+++ b/basctl/source/basicide/unomodel.hxx
@@ -60,7 +60,7 @@ public:
 };
 
 /// @throws com::sun::star::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL SIDEModel_createInstance(
+css::uno::Reference< css::uno::XInterface > SIDEModel_createInstance(
                 const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 } // namespace basctl
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index affeb0bcf4be..a6eab0fdcaba 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -574,7 +574,7 @@ bool SfxDialogLibrary::isLibraryElementValid(const css::uno::Any& rElement) cons
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_comp_sfx2_DialogLibraryContainer_get_implementation(css::uno::XComponentContext*,
                                                            css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 72126748d713..a80bec7938b7 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -1237,7 +1237,7 @@ void SAL_CALL SfxScriptLibrary::removeModuleInfo( const OUString& ModuleName )
 }   // namespace basic
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_comp_sfx2_ScriptLibraryContainer_get_implementation(css::uno::XComponentContext*,
                                                                  css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index d39d1f24e667..d1c7256c6ad5 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -86,7 +86,7 @@ OUString toString(css::uno::TypeDescription const & type) {
     return OUString(d->pTypeName);
 }
 
-extern "C" void SAL_CALL freeProxyCallback(
+extern "C" void freeProxyCallback(
     SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pProxy)
 {
     assert(pProxy != nullptr);
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index b1e3be93ea74..d82599363288 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -210,7 +210,7 @@ static cppu::ImplementationEntry const services[] = {
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL binaryurp_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * binaryurp_component_getFactory(
     char const * pImplName, void * pServiceManager, void * pRegistryKey)
 {
     return cppu::component_getFactoryHelper(
diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx
index 5f83660f1ddd..0e5a92b68f9e 100644
--- a/binaryurp/source/proxy.cxx
+++ b/binaryurp/source/proxy.cxx
@@ -42,17 +42,17 @@ namespace binaryurp {
 
 namespace {
 
-extern "C" void SAL_CALL proxy_acquireInterface(uno_Interface * pInterface) {
+extern "C" void proxy_acquireInterface(uno_Interface * pInterface) {
     assert(pInterface != nullptr);
     static_cast< Proxy * >(pInterface)->do_acquire();
 }
 
-extern "C" void SAL_CALL proxy_releaseInterface(uno_Interface * pInterface) {
+extern "C" void proxy_releaseInterface(uno_Interface * pInterface) {
     assert(pInterface != nullptr);
     static_cast< Proxy * >(pInterface)->do_release();
 }
 
-extern "C" void SAL_CALL proxy_dispatchInterface(
+extern "C" void proxy_dispatchInterface(
     uno_Interface * pUnoI, typelib_TypeDescription const * pMemberType,
     void * pReturn, void ** pArgs, uno_Any ** ppException)
 {
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 7ce1ba1244c3..fa5e91be704e 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -78,7 +78,7 @@ css::uno::Sequence< sal_Int8 > read(
     return buf;
 }
 
-extern "C" void SAL_CALL request(void * pThreadSpecificData) {
+extern "C" void request(void * pThreadSpecificData) {
     assert(pThreadSpecificData != nullptr);
     std::unique_ptr< IncomingRequest >(
         static_cast< IncomingRequest * >(pThreadSpecificData))->
diff --git a/bridges/inc/bridge.hxx b/bridges/inc/bridge.hxx
index d5c3ba9d9b40..b702dd9b6e07 100644
--- a/bridges/inc/bridge.hxx
+++ b/bridges/inc/bridge.hxx
@@ -33,20 +33,20 @@
 namespace bridges { namespace cpp_uno { namespace shared {
 
 // private:
-extern "C" void SAL_CALL freeMapping(uno_Mapping *);
+extern "C" void freeMapping(uno_Mapping *);
 
 // private:
-extern "C" void SAL_CALL acquireMapping(uno_Mapping *);
+extern "C" void acquireMapping(uno_Mapping *);
 
 // private:
-extern "C" void SAL_CALL releaseMapping(uno_Mapping *);
+extern "C" void releaseMapping(uno_Mapping *);
 
 // private:
-extern "C" void SAL_CALL cpp2unoMapping(
+extern "C" void cpp2unoMapping(
     uno_Mapping *, void **, void *, typelib_InterfaceTypeDescription *);
 
 // private:
-extern "C" void SAL_CALL uno2cppMapping(
+extern "C" void uno2cppMapping(
     uno_Mapping *, void **, void *, typelib_InterfaceTypeDescription *);
 
 /**
@@ -97,17 +97,17 @@ private:
 
     bool bExportCpp2Uno;
 
-    friend void SAL_CALL freeMapping(uno_Mapping * pMapping);
+    friend void freeMapping(uno_Mapping * pMapping);
 
-    friend void SAL_CALL acquireMapping(uno_Mapping * pMapping);
+    friend void acquireMapping(uno_Mapping * pMapping);
 
-    friend void SAL_CALL releaseMapping(uno_Mapping * pMapping);
+    friend void releaseMapping(uno_Mapping * pMapping);
 
-    friend void SAL_CALL cpp2unoMapping(
+    friend void cpp2unoMapping(
         uno_Mapping * pMapping, void ** ppUnoI, void * pCppI,
         typelib_InterfaceTypeDescription * pTypeDescr);
 
-    friend void SAL_CALL uno2cppMapping(
+    friend void uno2cppMapping(
         uno_Mapping * pMapping, void ** ppCppI, void * pUnoI,
         typelib_InterfaceTypeDescription * pTypeDescr);
 };
diff --git a/bridges/inc/cppinterfaceproxy.hxx b/bridges/inc/cppinterfaceproxy.hxx
index dfb1bdbf1e2b..d508146bdcb0 100644
--- a/bridges/inc/cppinterfaceproxy.hxx
+++ b/bridges/inc/cppinterfaceproxy.hxx
@@ -45,7 +45,7 @@ namespace bridges { namespace cpp_uno { namespace shared {
 
 class Bridge;
 
-extern "C" void SAL_CALL freeCppInterfaceProxy(
+extern "C" void freeCppInterfaceProxy(
     uno_ExtEnvironment * pEnv, void * pInterface);
 
 /**
@@ -97,7 +97,7 @@ private:
 
     VtableFactory::Slot * vtables[1];
 
-    friend void SAL_CALL freeCppInterfaceProxy(
+    friend void freeCppInterfaceProxy(
         uno_ExtEnvironment * pEnv, void * pInterface);
 };
 
diff --git a/bridges/inc/unointerfaceproxy.hxx b/bridges/inc/unointerfaceproxy.hxx
index 77cd8e98a346..374ac956caec 100644
--- a/bridges/inc/unointerfaceproxy.hxx
+++ b/bridges/inc/unointerfaceproxy.hxx
@@ -39,21 +39,21 @@ namespace bridges { namespace cpp_uno { namespace shared {
 
 class Bridge;
 
-extern "C" void SAL_CALL freeUnoInterfaceProxy(
+extern "C" void freeUnoInterfaceProxy(
     uno_ExtEnvironment * pEnv, void * pProxy);
 
 // private:
-extern "C" void SAL_CALL unoInterfaceProxyDispatch(
+extern "C" void unoInterfaceProxyDispatch(
     uno_Interface * pUnoI, typelib_TypeDescription const * pMemberDescr,
     void * pReturn, void * pArgs[], uno_Any ** ppException);
     // this function is not defined in the generic part, but instead has to be
     // defined individually for each CPP--UNO bridge
 
 // private:
-extern "C" void SAL_CALL acquireProxy(uno_Interface *);
+extern "C" void acquireProxy(uno_Interface *);
 
 // private:
-extern "C" void SAL_CALL releaseProxy(uno_Interface *);
+extern "C" void releaseProxy(uno_Interface *);
 
 /**
  * A uno proxy wrapping a cpp interface.
@@ -91,16 +91,16 @@ private:
     typelib_InterfaceTypeDescription * pTypeDescr;
     OUString oid;
 
-    friend void SAL_CALL freeUnoInterfaceProxy(
+    friend void freeUnoInterfaceProxy(
         uno_ExtEnvironment * pEnv, void * pProxy);
 
-    friend void SAL_CALL unoInterfaceProxyDispatch(
+    friend void unoInterfaceProxyDispatch(
         uno_Interface * pUnoI, typelib_TypeDescription const * pMemberDescr,
         void * pReturn, void * pArgs[], uno_Any ** ppException);
 
-    friend void SAL_CALL acquireProxy(uno_Interface * pUnoI);
+    friend void acquireProxy(uno_Interface * pUnoI);
 
-    friend void SAL_CALL releaseProxy(uno_Interface * pUnoI);
+    friend void releaseProxy(uno_Interface * pUnoI);
 };
 
 } } }
diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx
index 35217307a1b4..48b32331bf2e 100644
--- a/bridges/source/cpp_uno/shared/component.cxx
+++ b/bridges/source/cpp_uno/shared/component.cxx
@@ -42,7 +42,7 @@ namespace {
 static OUString * s_pStaticOidPart = nullptr;
 #endif
 
-const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart()
+const OUString & cppu_cppenv_getStaticOIdPart()
 {
 #if ! (defined(__GNUC__) && defined(__APPLE__))
     static OUString * s_pStaticOidPart = nullptr;
@@ -128,7 +128,7 @@ static void s_stub_computeObjectIdentifier(va_list * pParam)
     }
 }
 
-static void SAL_CALL computeObjectIdentifier(
+static void computeObjectIdentifier(
     uno_ExtEnvironment * pExtEnv, rtl_uString ** ppOId, void * pInterface )
 {
     uno_Environment_invoke(&pExtEnv->aBase, s_stub_computeObjectIdentifier, pExtEnv, ppOId, pInterface);
@@ -142,7 +142,7 @@ static void s_stub_acquireInterface(va_list * pParam)
     static_cast< ::com::sun::star::uno::XInterface * >( pCppI )->acquire();
 }
 
-static void SAL_CALL acquireInterface( uno_ExtEnvironment * pExtEnv, void * pCppI )
+static void acquireInterface( uno_ExtEnvironment * pExtEnv, void * pCppI )
 {
     uno_Environment_invoke(&pExtEnv->aBase, s_stub_acquireInterface, pExtEnv, pCppI);
 }
@@ -155,12 +155,12 @@ static void s_stub_releaseInterface(va_list * pParam)
     static_cast< ::com::sun::star::uno::XInterface * >( pCppI )->release();
 }
 
-static void SAL_CALL releaseInterface( uno_ExtEnvironment * pExtEnv, void * pCppI )
+static void releaseInterface( uno_ExtEnvironment * pExtEnv, void * pCppI )
 {
     uno_Environment_invoke(&pExtEnv->aBase, s_stub_releaseInterface, pExtEnv, pCppI);
 }
 
-static void SAL_CALL environmentDisposing(
+static void environmentDisposing(
     SAL_UNUSED_PARAMETER uno_Environment * )
 {
 }
@@ -169,7 +169,7 @@ static void SAL_CALL environmentDisposing(
 #define uno_initEnvironment CPPU_ENV_uno_initEnvironment
 #endif
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment(uno_Environment * pCppEnv)
+SAL_DLLPUBLIC_EXPORT void uno_initEnvironment(uno_Environment * pCppEnv)
     SAL_THROW_EXTERN_C()
 {
     assert(pCppEnv->pExtEnv);
@@ -189,7 +189,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment(uno_Environment * pCppEnv
 #define uno_ext_getMapping CPPU_ENV_uno_ext_getMapping
 #endif
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping(
+SAL_DLLPUBLIC_EXPORT void uno_ext_getMapping(
     uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo)
     SAL_THROW_EXTERN_C()
 {
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 47bd40069f4f..50419298d87f 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -64,7 +64,7 @@ using bridges::cpp_uno::shared::VtableFactory;
 
 namespace {
 
-extern "C" void * SAL_CALL allocExec(
+extern "C" void * allocExec(
     SAL_UNUSED_PARAMETER rtl_arena_type *, sal_Size * size)
 {
     std::size_t pagesize;
@@ -104,7 +104,7 @@ extern "C" void * SAL_CALL allocExec(
     return p;
 }
 
-extern "C" void SAL_CALL freeExec(
+extern "C" void freeExec(
     SAL_UNUSED_PARAMETER rtl_arena_type *, void * address, sal_Size size)
 {
 #if defined SAL_UNX
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx
index 3859b148c541..ac671d173e9c 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -39,7 +39,7 @@ extern "C"
 {
 
 
-void SAL_CALL Mapping_acquire( uno_Mapping * mapping )
+void Mapping_acquire( uno_Mapping * mapping )
     SAL_THROW_EXTERN_C()
 {
     Mapping const * that = static_cast< Mapping const * >( mapping );
@@ -47,7 +47,7 @@ void SAL_CALL Mapping_acquire( uno_Mapping * mapping )
 }
 
 
-void SAL_CALL Mapping_release( uno_Mapping * mapping )
+void Mapping_release( uno_Mapping * mapping )
     SAL_THROW_EXTERN_C()
 {
     Mapping const * that = static_cast< Mapping const * >( mapping );
@@ -55,7 +55,7 @@ void SAL_CALL Mapping_release( uno_Mapping * mapping )
 }
 
 
-void SAL_CALL Mapping_map_to_uno(
+void Mapping_map_to_uno(
     uno_Mapping * mapping, void ** ppOut,
     void * pIn, typelib_InterfaceTypeDescription * td )
     SAL_THROW_EXTERN_C()
@@ -114,7 +114,7 @@ void SAL_CALL Mapping_map_to_uno(
 }
 
 
-void SAL_CALL Mapping_map_to_java(
+void Mapping_map_to_java(
     uno_Mapping * mapping, void ** ppOut,
     void * pIn, typelib_InterfaceTypeDescription * td )
     SAL_THROW_EXTERN_C()
@@ -177,7 +177,7 @@ void SAL_CALL Mapping_map_to_java(
 }
 
 
-void SAL_CALL Bridge_free( uno_Mapping * mapping )
+void Bridge_free( uno_Mapping * mapping )
     SAL_THROW_EXTERN_C()
 {
     Mapping * that = static_cast< Mapping * >( mapping );
@@ -421,7 +421,7 @@ using namespace ::jni_uno;
 
 extern "C" {
 
-void SAL_CALL java_env_dispose(uno_Environment * env) {
+void java_env_dispose(uno_Environment * env) {
     auto * envData
         = static_cast<jni_uno::JniUnoEnvironmentData *>(env->pContext);
     if (envData != nullptr) {
@@ -455,7 +455,7 @@ void SAL_CALL java_env_dispose(uno_Environment * env) {
     }
 }
 
-void SAL_CALL java_env_disposing(uno_Environment * env) {
+void java_env_disposing(uno_Environment * env) {
     java_env_dispose(env);
     delete static_cast<jni_uno::JniUnoEnvironmentData *>(env->pContext);
 }
@@ -465,7 +465,7 @@ void SAL_CALL java_env_disposing(uno_Environment * env) {
 #endif
 
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * java_env )
+SAL_DLLPUBLIC_EXPORT void uno_initEnvironment( uno_Environment * java_env )
     SAL_THROW_EXTERN_C()
 {
     try {
@@ -510,7 +510,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * java_e
 #endif
 
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping(
+SAL_DLLPUBLIC_EXPORT void uno_ext_getMapping(
     uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
     SAL_THROW_EXTERN_C()
 {
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index 45bcbaedc3f0..ecdab00e4512 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -39,19 +39,19 @@ extern "C"
 {
 
 
-void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy )
+void UNO_proxy_free( uno_ExtEnvironment * env, void * proxy )
     SAL_THROW_EXTERN_C();
 
 
-void SAL_CALL UNO_proxy_acquire( uno_Interface * pUnoI )
+void UNO_proxy_acquire( uno_Interface * pUnoI )
     SAL_THROW_EXTERN_C();
 
 
-void SAL_CALL UNO_proxy_release( uno_Interface * pUnoI )
+void UNO_proxy_release( uno_Interface * pUnoI )
     SAL_THROW_EXTERN_C();
 
 
-void SAL_CALL UNO_proxy_dispatch(
+void UNO_proxy_dispatch(
     uno_Interface * pUnoI, typelib_TypeDescription const * member_td,
     void * uno_ret, void * uno_args[], uno_Any ** uno_exc )
     SAL_THROW_EXTERN_C();
@@ -502,7 +502,7 @@ extern "C"
 {
 
 
-void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy )
+void UNO_proxy_free( uno_ExtEnvironment * env, void * proxy )
     SAL_THROW_EXTERN_C()
 {
     UNO_proxy * that = static_cast< UNO_proxy * >( proxy );
@@ -540,7 +540,7 @@ void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy )
 }
 
 
-void SAL_CALL UNO_proxy_acquire( uno_Interface * pUnoI )
+void UNO_proxy_acquire( uno_Interface * pUnoI )
     SAL_THROW_EXTERN_C()
 {
     UNO_proxy const * that = static_cast< UNO_proxy const * >( pUnoI );
@@ -548,7 +548,7 @@ void SAL_CALL UNO_proxy_acquire( uno_Interface * pUnoI )
 }
 
 
-void SAL_CALL UNO_proxy_release( uno_Interface * pUnoI )
+void UNO_proxy_release( uno_Interface * pUnoI )
     SAL_THROW_EXTERN_C()
 {
     UNO_proxy const * that = static_cast< UNO_proxy const * >( pUnoI );
@@ -556,7 +556,7 @@ void SAL_CALL UNO_proxy_release( uno_Interface * pUnoI )
 }
 
 
-void SAL_CALL UNO_proxy_dispatch(
+void UNO_proxy_dispatch(
     uno_Interface * pUnoI, typelib_TypeDescription const * member_td,
     void * uno_ret, void * uno_args [], uno_Any ** uno_exc )
     SAL_THROW_EXTERN_C()
diff --git a/bridges/source/jni_uno/nativethreadpool.cxx b/bridges/source/jni_uno/nativethreadpool.cxx
index 547001a7f51e..4fe4a0a2fb8d 100644
--- a/bridges/source/jni_uno/nativethreadpool.cxx
+++ b/bridges/source/jni_uno/nativethreadpool.cxx
@@ -64,7 +64,7 @@ void throwOutOfMemory(JNIEnv * env) {
 
 extern "C" {
 
-static void SAL_CALL executeRequest(void * data) {
+static void executeRequest(void * data) {
     Job * job = static_cast< Job * >(data);
     try {
         jvmaccess::VirtualMachine::AttachGuard guard(job->pool->virtualMachine);
diff --git a/canvas/source/cairo/cairo_services.cxx b/canvas/source/cairo/cairo_services.cxx
index 0c484d3644f3..5117764668c3 100644
--- a/canvas/source/cairo/cairo_services.cxx
+++ b/canvas/source/cairo/cairo_services.cxx
@@ -74,7 +74,7 @@ namespace cairocanvas
 
 // The C shared lib entry points
 extern "C"
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL cairocanvas_component_getFactory( sal_Char const* pImplName,
+SAL_DLLPUBLIC_EXPORT void* cairocanvas_component_getFactory( sal_Char const* pImplName,
                                          void*, void* )
 {
     return sdecl::component_getFactoryHelper( pImplName, {&cairocanvas::cairoCanvasDecl, &cairocanvas::cairoSpriteCanvasDecl} );
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index 8ec48901728c..f971df139f31 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -475,7 +475,7 @@ Reference<XInterface> CanvasFactory::createInstanceWithArguments(
 } // anon namespace
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_comp_rendering_CanvasFactory_get_implementation(css::uno::XComponentContext* context,
                                                              css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx
index 1da1a464281f..3f913fd64ab4 100644
--- a/canvas/source/opengl/ogl_spritecanvas.cxx
+++ b/canvas/source/opengl/ogl_spritecanvas.cxx
@@ -175,7 +175,7 @@ namespace oglcanvas
 
 // The C shared lib entry points
 extern "C"
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL oglcanvas_component_getFactory( sal_Char const* pImplName,
+SAL_DLLPUBLIC_EXPORT void* oglcanvas_component_getFactory( sal_Char const* pImplName,
                                          void*, void* )
 {
     return sdecl::component_getFactoryHelper( pImplName, {&oglcanvas::oglSpriteCanvasDecl} );
diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx
index e957db00bf64..1915b746cf55 100644
--- a/canvas/source/simplecanvas/simplecanvasimpl.cxx
+++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx
@@ -375,7 +375,7 @@ namespace
 }
 
 // The C shared lib entry points
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL simplecanvas_component_getFactory( sal_Char const* pImplName,
+extern "C" SAL_DLLPUBLIC_EXPORT void* simplecanvas_component_getFactory( sal_Char const* pImplName,
                                          void*, void* )
 {
     return sdecl::component_getFactoryHelper( pImplName, {&simpleCanvasDecl} );
diff --git a/canvas/source/vcl/services.cxx b/canvas/source/vcl/services.cxx
index 9c4d0ab9e9fb..89e24d2e337c 100644
--- a/canvas/source/vcl/services.cxx
+++ b/canvas/source/vcl/services.cxx
@@ -74,7 +74,7 @@ namespace vclcanvas
 
 // The C shared lib entry points
 extern "C"
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL vclcanvas_component_getFactory( sal_Char const* pImplName,
+SAL_DLLPUBLIC_EXPORT void* vclcanvas_component_getFactory( sal_Char const* pImplName,
                                          void*, void* )
 {
     return sdecl::component_getFactoryHelper( pImplName, {&vclcanvas::vclCanvasDecl, &vclcanvas::vclSpriteCanvasDecl} );
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 97f605edf7bc..cd62dbfe61dd 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1456,7 +1456,7 @@ css::uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getSupportedServic
 } //  namespace wrapper
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation(css::uno::XComponentContext *context,
                                                                 css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index 43950c39a147..c0563986ea91 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -90,7 +90,7 @@ uno::Reference<beans::XPropertySetInfo>  SAL_CALL ChartTypeUnoDlg::getPropertySe
 
 } //namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_ChartTypeDialog_get_implementation(css::uno::XComponentContext *context,
                                                             css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 7139f0208d06..fa64f29277fe 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -360,7 +360,7 @@ void SAL_CALL CreationWizardUnoDlg::removeVetoableChangeListener( const OUString
 
 } //namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_WizardDialog_get_implementation(css::uno::XComponentContext *context,
                                                          css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index a505335cfa9a..bd58a05b2d8c 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1608,7 +1608,7 @@ ViewElementListProvider ChartController::getViewElementListProvider()
 
 } //namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_ChartController_get_implementation(css::uno::XComponentContext *context,
                                                             css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index c26afdc54b84..cc15fc5a035e 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -191,7 +191,7 @@ void SAL_CALL ChartFrameLoader::cancel()
 
 } //namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_ChartFrameLoader_get_implementation(css::uno::XComponentContext *context,
                                                              css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 2f9ec11510c8..927dae225462 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -312,7 +312,7 @@ uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::create
 
 } // chart2
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_ElementSelectorToolbarController_get_implementation(css::uno::XComponentContext *,
                                                                             css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/controller/main/ToolbarController.cxx b/chart2/source/controller/main/ToolbarController.cxx
index e6ccf06a0b5c..103e8b4bb97f 100644
--- a/chart2/source/controller/main/ToolbarController.cxx
+++ b/chart2/source/controller/main/ToolbarController.cxx
@@ -118,7 +118,7 @@ css::uno::Sequence<OUString> ChartToolbarController::getSupportedServiceNames()
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 org_libreoffice_chart2_Chart2ToolboxController(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const & rProperties)
 {
     return cppu::acquire(new ::chart::ChartToolbarController(rProperties));
diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
index 518479a83c8d..4034156f289d 100644
--- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
+++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
@@ -136,7 +136,7 @@ css::uno::Sequence<OUString> ChartPanelFactory::getSupportedServiceNames()
 
 } } // end of namespace chart::sidebar
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 org_libreoffice_comp_chart2_sidebar_ChartPanelFactory(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new ::chart::sidebar::ChartPanelFactory());
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 4d7720e72d9b..b18207ac277c 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -768,14 +768,14 @@ OUString XMLReportFilterHelper::getMediaType(bool )
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_XMLFilter_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new ::chart::XMLFilter(context));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_report_XMLFilter_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 9f385af2bb29..639c347582da 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -620,7 +620,7 @@ css::uno::Sequence< OUString > SAL_CALL Axis::getSupportedServiceNames()
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_Axis_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index 1a54ff46a0c3..e2f2f5f2fda0 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -145,14 +145,14 @@ css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem3d::getSupporte
 
 }  // namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_CartesianCoordinateSystem2d_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new ::chart::CartesianCoordinateSystem2d(context));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_CartesianCoordinateSystem3d_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 055f3a94fe50..1a0d3899019c 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -1334,7 +1334,7 @@ bool ChartModel::isDataFromPivotTable()
 
 }  // namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_ChartModel_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 0d2a6342db6c..ff805227b3f5 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -555,7 +555,7 @@ css::uno::Sequence< OUString > SAL_CALL DataSeries::getSupportedServiceNames()
 
 }  // namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_DataSeries_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index 136db02b14e2..6dd8b747de32 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -697,7 +697,7 @@ css::uno::Sequence< OUString > SAL_CALL Diagram::getSupportedServiceNames()
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_Diagram_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index 4f26acc95e3f..0a89c555a0e1 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -232,7 +232,7 @@ css::uno::Sequence< OUString > SAL_CALL FormattedString::getSupportedServiceName
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_FormattedString_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index 0c106f70668d..479d261367f3 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -237,7 +237,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( GridProperties, GridProperties_Base, ::propert
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_GridProperties_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index fc9ab86de607..4694e3b744c8 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -295,7 +295,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Legend, Legend_Base, ::property::OPropertySet
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_Legend_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index e90a42797c6d..0a88bc4af34d 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -219,7 +219,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( PageBackground, PageBackground_Base, ::property::
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_PageBackground_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx
index d6c58ee24c76..a47f5a2add6c 100644
--- a/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -143,14 +143,14 @@ css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem3d::getSupportedSer
 
 }  // namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_PolarCoordinateSystem2d_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new ::chart::PolarCoordinateSystem2d(context));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_PolarCoordinateSystem3d_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index 6dbd924d08dc..058087529d31 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -377,7 +377,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Title, Title_Base, ::property::OPropertySet )
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_Title_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx
index 45ebcf72b310..b10d6110ae3b 100644
--- a/chart2/source/model/template/AreaChartType.cxx
+++ b/chart2/source/model/template/AreaChartType.cxx
@@ -69,7 +69,7 @@ css::uno::Sequence< OUString > SAL_CALL AreaChartType::getSupportedServiceNames(
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_AreaChartType_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx
index 6f11dd5458a2..bfdf6ec47249 100644
--- a/chart2/source/model/template/BarChartType.cxx
+++ b/chart2/source/model/template/BarChartType.cxx
@@ -79,7 +79,7 @@ css::uno::Sequence< OUString > SAL_CALL BarChartType::getSupportedServiceNames()
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_BarChartType_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index 8179594e2ceb..49a43c3134f9 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -214,7 +214,7 @@ css::uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedServiceName
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_BubbleChartType_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index 81f084540815..619af6cb08f7 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -330,7 +330,7 @@ css::uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedServic
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_CandleStickChartType_get_implementation(css::uno::XComponentContext *context,
                                                          css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index a94253a577ac..4d174d968130 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -616,7 +616,7 @@ css::uno::Sequence< OUString > SAL_CALL ChartTypeManager::getSupportedServiceNam
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_ChartTypeManager_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx
index 0655689d8f4e..668cdb9d2e0b 100644
--- a/chart2/source/model/template/ColumnChartType.cxx
+++ b/chart2/source/model/template/ColumnChartType.cxx
@@ -196,7 +196,7 @@ css::uno::Sequence< OUString > SAL_CALL ColumnChartType::getSupportedServiceName
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_ColumnChartType_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx
index e693671f9b07..dfb78ecf6a44 100644
--- a/chart2/source/model/template/FilledNetChartType.cxx
+++ b/chart2/source/model/template/FilledNetChartType.cxx
@@ -79,7 +79,7 @@ css::uno::Sequence< OUString > SAL_CALL FilledNetChartType::getSupportedServiceN
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_FilledNetChartType_get_implementation(css::uno::XComponentContext *context,
                                                          css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/template/GL3DBarChartType.cxx b/chart2/source/model/template/GL3DBarChartType.cxx
index 0e45c8d8d6fe..e40e43477d05 100644
--- a/chart2/source/model/template/GL3DBarChartType.cxx
+++ b/chart2/source/model/template/GL3DBarChartType.cxx
@@ -156,7 +156,7 @@ css::uno::Reference<css::beans::XPropertySetInfo> GL3DBarChartType::getPropertyS
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_GL3DBarChartType_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx
index 3c25980e2eaa..b82dd9f8d6af 100644
--- a/chart2/source/model/template/LineChartType.cxx
+++ b/chart2/source/model/template/LineChartType.cxx
@@ -198,7 +198,7 @@ css::uno::Sequence< OUString > SAL_CALL LineChartType::getSupportedServiceNames(
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_LineChartType_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx
index 829a2f27d41d..b124d9cbda93 100644
--- a/chart2/source/model/template/NetChartType.cxx
+++ b/chart2/source/model/template/NetChartType.cxx
@@ -179,7 +179,7 @@ css::uno::Sequence< OUString > SAL_CALL NetChartType::getSupportedServiceNames()
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_NetChartType_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index f99ab3c1a408..689ef9b491a2 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -233,7 +233,7 @@ css::uno::Sequence< OUString > SAL_CALL PieChartType::getSupportedServiceNames()
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_PieChartType_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index 0e5e2c66cc62..3e5a1fb0c633 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -255,7 +255,7 @@ css::uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedServiceNam
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_ScatterChartType_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index 5db3cbdb45f0..72f2e544e79e 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -365,7 +365,7 @@ void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _
 }
 }  // namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_CachedDataSequence_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index 72e3ca7e6a7f..4484beadd204 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -180,7 +180,7 @@ css::uno::Sequence< OUString > SAL_CALL ConfigColorScheme::getSupportedServiceNa
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_ConfigDefaultColorScheme_get_implementation(css::uno::XComponentContext *context,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx
index 91c33b10bd81..9d17d4b4b6e7 100644
--- a/chart2/source/tools/DataSource.cxx
+++ b/chart2/source/tools/DataSource.cxx
@@ -71,7 +71,7 @@ css::uno::Sequence< OUString > SAL_CALL DataSource::getSupportedServiceNames()
 
 } // namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_DataSource_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 682a13827ba1..d6380b0cb050 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -471,7 +471,7 @@ using impl::ErrorBar_Base;
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_ErrorBar_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index a8e0c93759f9..f272c9feb9ce 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -1517,7 +1517,7 @@ css::uno::Sequence< OUString > SAL_CALL InternalDataProvider::getSupportedServic
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart_InternalDataProvider_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx
index 85c0a2747d4f..d47d26ebdc1a 100644
--- a/chart2/source/tools/LabeledDataSequence.cxx
+++ b/chart2/source/tools/LabeledDataSequence.cxx
@@ -158,7 +158,7 @@ css::uno::Sequence< OUString > SAL_CALL LabeledDataSequence::getSupportedService
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_LabeledDataSequence_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index 04816377ae1c..8dee11b28e75 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -535,49 +535,49 @@ uno::Reference< util::XCloneable > SAL_CALL MovingAverageRegressionCurve::create
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_ExponentialRegressionCurve_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new ::chart::ExponentialRegressionCurve );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_LinearRegressionCurve_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new ::chart::LinearRegressionCurve );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_LogarithmicRegressionCurve_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new ::chart::LogarithmicRegressionCurve );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_MeanValueRegressionCurve_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new ::chart::MeanValueRegressionCurve );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_PotentialRegressionCurve_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new ::chart::PotentialRegressionCurve );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_PolynomialRegressionCurve_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new ::chart::PolynomialRegressionCurve );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_MovingAverageRegressionCurve_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index c7ac08ec1928..4cdda2b80272 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -322,7 +322,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( RegressionEquation, RegressionEquation_Base, ::pr
 
 } //  namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_RegressionEquation_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx
index 7440a5e3264c..34adacf97e13 100644
--- a/chart2/source/tools/Scaling.cxx
+++ b/chart2/source/tools/Scaling.cxx
@@ -244,28 +244,28 @@ css::uno::Sequence< OUString > SAL_CALL PowerScaling::getSupportedServiceNames()
 
 } //namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_chart2_LinearScaling_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new chart::LinearScaling );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_chart2_ExponentialScaling_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new chart::ExponentialScaling );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_chart2_LogarithmicScaling_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new chart::LogarithmicScaling );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_chart2_PowerScaling_get_implementation(css::uno::XComponentContext *,
         css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx
index 8bb4f3debfbc..b340869bddc6 100644
--- a/chart2/source/view/main/AbstractShapeFactory.cxx
+++ b/chart2/source/view/main/AbstractShapeFactory.cxx
@@ -57,7 +57,7 @@ typedef opengl::OpenglShapeFactory* (*getOpenglShapeFactory_)(void);
 
 #ifndef DISABLE_DYNLOADING
 
-void SAL_CALL thisModule() {}
+void thisModule() {}
 
 osl::Module* getOpenGLModule()
 {
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 4fa863406671..2fb8a1f67c20 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -3408,7 +3408,7 @@ void ChartView::updateOpenGLWindow()
 
 } //namespace chart
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_chart2_ChartView_get_implementation(css::uno::XComponentContext *context,
                                                          css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx
index c3df018c14ee..8879359b6566 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.cxx
@@ -128,7 +128,7 @@ Sequence< OUString > SAL_CALL AnyCompareFactory::getSupportedServiceNames(  )
     return aSeq;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 AnyCompareFactory_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
index e095ebc785db..cf0e37b59dee 100644
--- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
@@ -147,7 +147,7 @@ css::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSuppo
     return aSeq;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 IndexedPropertyValuesContainer_get_implementation(
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx
index 771c9ac5a262..17ddb300edd4 100644
--- a/comphelper/source/container/NamedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx
@@ -156,7 +156,7 @@ css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupport
     return aSeq;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 NamedPropertyValuesContainer_get_implementation(
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
diff --git a/comphelper/source/misc/comphelper_services.cxx b/comphelper/source/misc/comphelper_services.cxx
index e126e55ecdce..54009eaf9425 100644
--- a/comphelper/source/misc/comphelper_services.cxx
+++ b/comphelper/source/misc/comphelper_services.cxx
@@ -50,7 +50,7 @@ namespace comphelper { namespace module
 } } // namespace comphelper::module
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL comphelp_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* comphelp_component_getFactory(
     const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*,
     SAL_UNUSED_PARAMETER void* )
 {
diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx
index ea22167ac261..76d2cd1a761a 100644
--- a/comphelper/source/misc/instancelocker.cxx
+++ b/comphelper/source/misc/instancelocker.cxx
@@ -440,7 +440,7 @@ void OLockListener::Init()
     m_bInitialized = true;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_embed_InstanceLocker(
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx
index 37b1d0d02882..b2997c9fa867 100644
--- a/comphelper/source/misc/officerestartmanager.cxx
+++ b/comphelper/source/misc/officerestartmanager.cxx
@@ -164,7 +164,7 @@ struct Singleton:
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_task_OfficeRestartManager(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 63d88868add6..a1850d4b6fc8 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -259,7 +259,7 @@ struct Singleton:
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_util_OfficeInstallationDirectories(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx
index 243c3920c7cd..718d04b56fb9 100644
--- a/comphelper/source/property/opropertybag.cxx
+++ b/comphelper/source/property/opropertybag.cxx
@@ -37,7 +37,7 @@
 
 using namespace ::com::sun::star;
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_comphelper_OPropertyBag (
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx
index 61afcdc85391..b85701c30321 100644
--- a/comphelper/source/streaming/memorystream.cxx
+++ b/comphelper/source/streaming/memorystream.cxx
@@ -226,7 +226,7 @@ void SAL_CALL UNOMemoryStream::truncate()
 
 } // namespace comphelper
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_MemoryStream(
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx
index 7dcc1a71022f..fbf3cbab04b1 100644
--- a/comphelper/source/streaming/seqinputstreamserv.cxx
+++ b/comphelper/source/streaming/seqinputstreamserv.cxx
@@ -210,7 +210,7 @@ void SAL_CALL SequenceInputStreamService::initialize( const uno::Sequence< css::
 
 } // anonymous namespace
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_SequenceInputStreamService(
                                              css::uno::XComponentContext *,
                                              css::uno::Sequence<css::uno::Any> const &)
diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx
index 69deca26ed28..7175ad2789d1 100644
--- a/comphelper/source/streaming/seqoutputstreamserv.cxx
+++ b/comphelper/source/streaming/seqoutputstreamserv.cxx
@@ -134,7 +134,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL SequenceOutputStreamService::getWrittenByte
 
 } // anonymous namespace
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_SequenceOutputStreamService(
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
diff --git a/compilerplugins/clang/salcall.cxx b/compilerplugins/clang/salcall.cxx
index 250994c07f5e..16657e848d5a 100644
--- a/compilerplugins/clang/salcall.cxx
+++ b/compilerplugins/clang/salcall.cxx
@@ -222,32 +222,13 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
     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 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)
+    if (!decl->isThisDeclarationADefinition() && !(methodDecl && methodDecl->isPure()))
         return true;
-
     // can only check when we have a definition since this is the most likely time
     // when the address of the method will be taken
-    if (!(methodDecl && methodDecl->isPure()) && !decl->isThisDeclarationADefinition())
-        return true;
-    if (m_addressOfSet.find(decl->getCanonicalDecl()) != m_addressOfSet.end())
-        return true;
-
-    // ignore extern "C" UNO factory constructor functions
-    if (decl->isExternC())
+    if (methodDecl)
     {
-        if (loplugin::TypeCheck(decl->getReturnType())
-                .Pointer()
-                .Class("XInterface")
-                .Namespace("uno")
-                .Namespace("star")
-                .Namespace("sun")
-                .Namespace("com")
-                .GlobalNamespace())
-            return true;
-        if (loplugin::TypeCheck(decl->getReturnType()).Pointer().Void())
+        if (m_addressOfSet.find(decl->getCanonicalDecl()) != m_addressOfSet.end())
             return true;
     }
 
diff --git a/configmgr/source/configurationprovider.hxx b/configmgr/source/configurationprovider.hxx
index f29a8c728976..143ce9548fcd 100644
--- a/configmgr/source/configurationprovider.hxx
+++ b/configmgr/source/configurationprovider.hxx
@@ -41,13 +41,13 @@ css::uno::Reference< css::uno::XInterface > createDefault(
     css::uno::Reference< css::uno::XComponentContext >
         const & context);
 
-OUString SAL_CALL getImplementationName();
+OUString getImplementationName();
 
-css::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString >
 getSupportedServiceNames();
 
 css::uno::Reference< css::lang::XSingleComponentFactory >
-SAL_CALL createFactory(
+createFactory(
     cppu::ComponentFactoryFunc, OUString const &,
     css::uno::Sequence< OUString > const &, rtl_ModuleCount *);
 
diff --git a/configmgr/source/configurationregistry.hxx b/configmgr/source/configurationregistry.hxx
index 1bfda104dc1c..75c35884e044 100644
--- a/configmgr/source/configurationregistry.hxx
+++ b/configmgr/source/configurationregistry.hxx
@@ -35,14 +35,14 @@ namespace com { namespace sun { namespace star {
 
 namespace configmgr { namespace configuration_registry {
 
-css::uno::Reference< css::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface >
 create(
     css::uno::Reference< css::uno::XComponentContext >
         const & context);
 
-OUString SAL_CALL getImplementationName();
+OUString getImplementationName();
 
-css::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString >
 getSupportedServiceNames();
 
 } }
diff --git a/configmgr/source/defaultprovider.hxx b/configmgr/source/defaultprovider.hxx
index c3825ea46a88..d054137bf1d1 100644
--- a/configmgr/source/defaultprovider.hxx
+++ b/configmgr/source/defaultprovider.hxx
@@ -35,14 +35,14 @@ namespace com { namespace sun { namespace star {
 
 namespace configmgr { namespace default_provider {
 
-css::uno::Reference< css::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface >
 create(
     css::uno::Reference< css::uno::XComponentContext >
         const & context);
 
-OUString SAL_CALL getImplementationName();
+OUString getImplementationName();
 
-css::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString >
 getSupportedServiceNames();
 
 } }
diff --git a/configmgr/source/readonlyaccess.hxx b/configmgr/source/readonlyaccess.hxx
index 9b8d903d5504..c8d1a336c321 100644
--- a/configmgr/source/readonlyaccess.hxx
+++ b/configmgr/source/readonlyaccess.hxx
@@ -23,14 +23,14 @@ namespace com { namespace sun { namespace star {
 
 namespace configmgr { namespace read_only_access {
 
-css::uno::Reference< css::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface >
 create(
     css::uno::Reference< css::uno::XComponentContext >
         const &);
 
-OUString SAL_CALL getImplementationName();
+OUString getImplementationName();
 
-css::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString >
 getSupportedServiceNames();
 
 } }
diff --git a/configmgr/source/readwriteaccess.hxx b/configmgr/source/readwriteaccess.hxx
index 82f8300ccfe0..d891662d15aa 100644
--- a/configmgr/source/readwriteaccess.hxx
+++ b/configmgr/source/readwriteaccess.hxx
@@ -23,14 +23,14 @@ namespace com { namespace sun { namespace star {
 
 namespace configmgr { namespace read_write_access {
 
-css::uno::Reference< css::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface >
 create(
     css::uno::Reference< css::uno::XComponentContext >
         const &);
 
-OUString SAL_CALL getImplementationName();
+OUString getImplementationName();
 
-css::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString >
 getSupportedServiceNames();
 
 } }
diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx
index 6affa5f1b79f..27675f93d766 100644
--- a/configmgr/source/services.cxx
+++ b/configmgr/source/services.cxx
@@ -38,7 +38,7 @@
 
 namespace {
 
-css::uno::Reference< css::uno::XInterface > SAL_CALL dummy(
+css::uno::Reference< css::uno::XInterface > dummy(
     SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext >
         const &)
 {
@@ -74,7 +74,7 @@ static cppu::ImplementationEntry const services[] = {
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL configmgr_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * configmgr_component_getFactory(
     char const * pImplName, void * pServiceManager, void * pRegistryKey)
 {
     return cppu::component_getFactoryHelper(
diff --git a/configmgr/source/update.hxx b/configmgr/source/update.hxx
index c1ede9b21caf..6ea08645fd6b 100644
--- a/configmgr/source/update.hxx
+++ b/configmgr/source/update.hxx
@@ -35,14 +35,14 @@ namespace com { namespace sun { namespace star {
 
 namespace configmgr { namespace update {
 
-css::uno::Reference< css::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface >
 create(
     css::uno::Reference< css::uno::XComponentContext >
         const &);
 
-OUString SAL_CALL getImplementationName();
+OUString getImplementationName();
 
-css::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString >
 getSupportedServiceNames();
 
 } }
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 224e96c91924..4e6ae28ac7de 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -874,7 +874,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
     namespace connectivity
     {
         /// @throws Exception
-        Reference< XInterface >  SAL_CALL ODatabaseMetaDataResultSet_CreateInstance(const Reference< XComponentContext >& )
+        Reference< XInterface > ODatabaseMetaDataResultSet_CreateInstance(const Reference< XComponentContext >& )
         {
             return *(new ODatabaseMetaDataResultSet());
         }
@@ -896,7 +896,7 @@ extern "C"
 {
 
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbtools_component_getFactory(const sal_Char* implName, void* serviceManager, void* registryKey)
+SAL_DLLPUBLIC_EXPORT void* dbtools_component_getFactory(const sal_Char* implName, void* serviceManager, void* registryKey)
 {
     return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries);
 }
diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx
index d17800159fed..81138a32fb54 100644
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -31,7 +31,7 @@ extern "C"
 {
 
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbpool2_component_getFactory(const sal_Char* _pImplName, void * _pServiceManager, void* /*_pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* dbpool2_component_getFactory(const sal_Char* _pImplName, void * _pServiceManager, void* /*_pRegistryKey*/)
 {
     void* pRet = nullptr;
 
diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx
index d9617ab0d460..88c3e298e077 100644
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -26,7 +26,7 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
-typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
+typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
         (
             const Reference< XMultiServiceFactory > & rServiceManager,
             const OUString & rComponentName,
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index 6bfae82bcada..25c9fffc3322 100644
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
@@ -49,7 +49,7 @@ OUString SAL_CALL ODriver::getImplementationName(  )
 // service names from file::OFileDriver
 
 
-css::uno::Reference< css::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface >
     connectivity::calc::ODriver_CreateInstance(const css::uno::Reference<
         css::lang::XMultiServiceFactory >& _rxFactory)
 {
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index d1f1e5adebcf..c1d840965f30 100644
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -26,7 +26,7 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
-typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
+typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
         (
             const Reference< XMultiServiceFactory > & rServiceManager,
             const OUString & rComponentName,
@@ -75,7 +75,7 @@ struct ProviderRequest
 };
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL connectivity_calc_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* connectivity_calc_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index 9dbcdddd3e21..eae07c4707fa 100644
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
@@ -47,7 +47,7 @@ OUString SAL_CALL ODriver::getImplementationName(  )
 }
 
 
-css::uno::Reference< css::uno::XInterface >  SAL_CALL connectivity::dbase::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
+css::uno::Reference< css::uno::XInterface > connectivity::dbase::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
 {
     return *(new ODriver( comphelper::getComponentContext(_rxFactory) ));
 }
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index da3636b03953..a45443680f42 100644
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -26,7 +26,7 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
-typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
+typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
         (
             const Reference< XMultiServiceFactory > & rServiceManager,
             const OUString & rComponentName,
@@ -75,7 +75,7 @@ struct ProviderRequest
 };
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbase_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* dbase_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index 921ad6e6427b..6ed8daf0676e 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -111,7 +111,7 @@ Sequence< OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames(  )
 }
 
 
-css::uno::Reference< css::uno::XInterface >  SAL_CALL connectivity::evoab::OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
+css::uno::Reference< css::uno::XInterface > connectivity::evoab::OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
 {
     return *(new OEvoabDriver(_rxFactory));
 }
diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx
index df7cd46c6e3c..0fafcc90b80b 100644
--- a/connectivity/source/drivers/evoab2/NDriver.hxx
+++ b/connectivity/source/drivers/evoab2/NDriver.hxx
@@ -34,7 +34,7 @@ namespace connectivity
     namespace evoab
     {
         /// @throws css::uno::Exception
-        css::uno::Reference< css::uno::XInterface > SAL_CALL OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
+        css::uno::Reference< css::uno::XInterface > OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
 
 
         typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver,
diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx
index 8599b69e9b8d..3fa7a83a36e7 100644
--- a/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/connectivity/source/drivers/evoab2/NServices.cxx
@@ -27,7 +27,7 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
-typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
+typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
         (
             const Reference< XMultiServiceFactory > & rServiceManager,
             const OUString & rComponentName,
@@ -77,7 +77,7 @@ struct ProviderRequest
 };
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL evoab2_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* evoab2_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index 99eafb987168..b3b129d3fbe2 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -47,7 +47,7 @@ namespace connectivity
 {
     namespace firebird
     {
-        Reference< XInterface >  SAL_CALL FirebirdDriver_CreateInstance(
+        Reference< XInterface > FirebirdDriver_CreateInstance(
             const Reference< XMultiServiceFactory >& _rxFactory)
         {
             SAL_INFO("connectivity.firebird", "FirebirdDriver_CreateInstance()" );
diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx
index c314fc69fe4f..7394f6ad238f 100644
--- a/connectivity/source/drivers/firebird/Driver.hxx
+++ b/connectivity/source/drivers/firebird/Driver.hxx
@@ -39,7 +39,7 @@ namespace connectivity
         static const int FIREBIRD_SQL_DIALECT = 3;
 
         /// @throws css::uno::Exception
-        css::uno::Reference< css::uno::XInterface > SAL_CALL FirebirdDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
+        css::uno::Reference< css::uno::XInterface > FirebirdDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
 
         typedef ::cppu::WeakComponentImplHelper<   css::sdbc::XDriver,
                                                    css::sdbcx::XDataDefinitionSupplier,
diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx
index 5f2c2e2fc9d5..75b247c32fe5 100644
--- a/connectivity/source/drivers/firebird/Services.cxx
+++ b/connectivity/source/drivers/firebird/Services.cxx
@@ -29,7 +29,7 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
-typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
+typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
         (
             const Reference< XMultiServiceFactory > & rServiceManager,
             const OUString & rComponentName,
@@ -77,7 +77,7 @@ struct ProviderRequest
 };
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL firebird_sdbc_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* firebird_sdbc_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void*)
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index d4bde3ba363f..97f35622ac8e 100644
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
@@ -50,7 +50,7 @@ OUString SAL_CALL ODriver::getImplementationName(  )
 }
 
 
-css::uno::Reference< css::uno::XInterface >  SAL_CALL connectivity::flat::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
+css::uno::Reference< css::uno::XInterface > connectivity::flat::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
 {
     return *(new ODriver( comphelper::getComponentContext(_rxFactory) ));
 }
diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index 5cd3092a329d..2771617c82b7 100644
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -26,7 +26,7 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
-typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
+typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
         (
             const Reference< XMultiServiceFactory > & rServiceManager,
             const OUString & rComponentName,
@@ -75,7 +75,7 @@ struct ProviderRequest
 };
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL flat_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* flat_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 215de60a03e0..5b3c9f208214 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -76,7 +76,7 @@ namespace connectivity
 
     namespace hsqldb
     {
-        Reference< XInterface >  SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac)
+        Reference< XInterface > ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac)
         {
             return *(new ODriverDelegator(comphelper::getComponentContext(_rxFac)));
         }
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index 5bec6c648ade..6d1294b9b072 100644
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -27,7 +27,7 @@ using css::uno::Sequence;
 using css::lang::XSingleServiceFactory;
 using css::lang::XMultiServiceFactory;
 
-typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
+typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
         (
             const Reference< XMultiServiceFactory > & rServiceManager,
             const OUString & rComponentName,
@@ -76,7 +76,7 @@ struct ProviderRequest
 };
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL hsqldb_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* hsqldb_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index ed912aad3398..0466d98309aa 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -65,7 +65,7 @@ Sequence< OUString > java_sql_Driver::getSupportedServiceNames_Static(  )
     return aSNS;
 }
 
-css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::java_sql_Driver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
+css::uno::Reference< css::uno::XInterface > connectivity::java_sql_Driver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
 {
     return *(new java_sql_Driver( comphelper::getComponentContext(_rxFactory)));
 }
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
index 6f78fcc51108..c5977439638b 100644
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -26,7 +26,7 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
-typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
+typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
         (
             const Reference< XMultiServiceFactory > & rServiceManager,
             const OUString & rComponentName,
@@ -74,7 +74,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL jdbc_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* jdbc_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx
index 469e342912c6..faf214f703da 100644
--- a/connectivity/source/drivers/macab/MacabServices.cxx
+++ b/connectivity/source/drivers/macab/MacabServices.cxx
@@ -27,7 +27,7 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
-typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
+typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
         (
             const Reference< XMultiServiceFactory > & rServiceManager,
             const OUString & rComponentName,
diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx
index 58b714c72df7..7cd1dba4145c 100644
--- a/connectivity/source/drivers/mork/MDriver.cxx
+++ b/connectivity/source/drivers/mork/MDriver.cxx
@@ -14,7 +14,7 @@
 
 using namespace connectivity::mork;
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_sdbc_MorkDriver_get_implementation(
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_sdbc_MorkDriver_get_implementation(
     css::uno::XComponentContext* context,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index d84e8a1eaedd..1eb3b91b66bc 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -36,7 +36,7 @@ using ::com::sun::star::lang::XMultiServiceFactory;
 
 static MozillaBootstrap *pMozillaBootstrap=nullptr;
 static Reference<XMozillaBootstrap> xMozillaBootstrap;
-extern "C" SAL_DLLPUBLIC_EXPORT void*  SAL_CALL OMozillaBootstrap_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& )
+extern "C" SAL_DLLPUBLIC_EXPORT void* OMozillaBootstrap_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& )
 {
     if (!pMozillaBootstrap)
     {
@@ -144,13 +144,13 @@ OUString SAL_CALL MozillaBootstrap::setCurrentProfile( css::mozilla::MozillaProd
     return -1;
 }
 
-static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
+static Reference< XInterface > createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
 {
         MozillaBootstrap * pBootstrap = static_cast<MozillaBootstrap*>(OMozillaBootstrap_CreateInstance(rServiceManager));
         return *pBootstrap;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozbootstrap_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* mozbootstrap_component_getFactory(
                                         const sal_Char* pImplementationName,
                                         void* pServiceManager,
                                         void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index b814d5f31e9c..a79db52b95bf 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -42,7 +42,7 @@ namespace connectivity
 
     namespace mysql
     {
-        Reference< XInterface >  SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac)
+        Reference< XInterface > ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac)
         {
             return *(new ODriverDelegator( comphelper::getComponentContext(_rxFac) ));
         }
diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx
index 20f337e80530..b08ce3425255 100644
--- a/connectivity/source/drivers/mysql/Yservices.cxx
+++ b/connectivity/source/drivers/mysql/Yservices.cxx
@@ -26,7 +26,7 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
-typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
+typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
         (
             const Reference< XMultiServiceFactory > & rServiceManager,
             const OUString & rComponentName,
@@ -35,7 +35,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount*
         );
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mysql_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* mysql_component_getFactory(
                     const sal_Char* pImplementationName,

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list