summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UnoControls/source/base/registercontrols.cxx10
-rw-r--r--accessibility/source/helper/acc_factory.cxx4
-rw-r--r--animations/source/animcore/animcore.cxx22
-rw-r--r--avmedia/source/framework/soundhandler.cxx2
-rw-r--r--avmedia/source/gstreamer/gstuno.cxx4
-rw-r--r--avmedia/source/vlc/vlcuno.cxx4
-rw-r--r--basctl/source/basicide/register.cxx2
-rw-r--r--basctl/source/basicide/unomodel.cxx2
-rw-r--r--basctl/source/basicide/unomodel.hxx2
-rw-r--r--basic/source/uno/dlgcont.cxx2
-rw-r--r--basic/source/uno/scriptcont.cxx2
-rw-r--r--binaryurp/source/bridge.cxx2
-rw-r--r--binaryurp/source/bridgefactory.cxx2
-rw-r--r--binaryurp/source/proxy.cxx6
-rw-r--r--binaryurp/source/reader.cxx2
-rw-r--r--bridges/inc/bridge.hxx20
-rw-r--r--bridges/inc/cppinterfaceproxy.hxx4
-rw-r--r--bridges/inc/unointerfaceproxy.hxx16
-rw-r--r--bridges/source/cpp_uno/shared/component.cxx14
-rw-r--r--bridges/source/cpp_uno/shared/vtablefactory.cxx4
-rw-r--r--bridges/source/jni_uno/jni_bridge.cxx18
-rw-r--r--bridges/source/jni_uno/jni_uno2java.cxx16
-rw-r--r--bridges/source/jni_uno/nativethreadpool.cxx2
-rw-r--r--canvas/source/cairo/cairo_services.cxx2
-rw-r--r--canvas/source/factory/cf_service.cxx2
-rw-r--r--canvas/source/opengl/ogl_spritecanvas.cxx2
-rw-r--r--canvas/source/simplecanvas/simplecanvasimpl.cxx2
-rw-r--r--canvas/source/vcl/services.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx2
-rw-r--r--chart2/source/controller/main/ChartController.cxx2
-rw-r--r--chart2/source/controller/main/ChartFrameloader.cxx2
-rw-r--r--chart2/source/controller/main/ElementSelector.cxx2
-rw-r--r--chart2/source/controller/main/ToolbarController.cxx2
-rw-r--r--chart2/source/controller/sidebar/Chart2PanelFactory.cxx2
-rw-r--r--chart2/source/model/filter/XMLFilter.cxx4
-rw-r--r--chart2/source/model/main/Axis.cxx2
-rw-r--r--chart2/source/model/main/CartesianCoordinateSystem.cxx4
-rw-r--r--chart2/source/model/main/ChartModel.cxx2
-rw-r--r--chart2/source/model/main/DataSeries.cxx2
-rw-r--r--chart2/source/model/main/Diagram.cxx2
-rw-r--r--chart2/source/model/main/FormattedString.cxx2
-rw-r--r--chart2/source/model/main/GridProperties.cxx2
-rw-r--r--chart2/source/model/main/Legend.cxx2
-rw-r--r--chart2/source/model/main/PageBackground.cxx2
-rw-r--r--chart2/source/model/main/PolarCoordinateSystem.cxx4
-rw-r--r--chart2/source/model/main/Title.cxx2
-rw-r--r--chart2/source/model/template/AreaChartType.cxx2
-rw-r--r--chart2/source/model/template/BarChartType.cxx2
-rw-r--r--chart2/source/model/template/BubbleChartType.cxx2
-rw-r--r--chart2/source/model/template/CandleStickChartType.cxx2
-rw-r--r--chart2/source/model/template/ChartTypeManager.cxx2
-rw-r--r--chart2/source/model/template/ColumnChartType.cxx2
-rw-r--r--chart2/source/model/template/FilledNetChartType.cxx2
-rw-r--r--chart2/source/model/template/GL3DBarChartType.cxx2
-rw-r--r--chart2/source/model/template/LineChartType.cxx2
-rw-r--r--chart2/source/model/template/NetChartType.cxx2
-rw-r--r--chart2/source/model/template/PieChartType.cxx2
-rw-r--r--chart2/source/model/template/ScatterChartType.cxx2
-rw-r--r--chart2/source/tools/CachedDataSequence.cxx2
-rw-r--r--chart2/source/tools/ConfigColorScheme.cxx2
-rw-r--r--chart2/source/tools/DataSource.cxx2
-rw-r--r--chart2/source/tools/ErrorBar.cxx2
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx2
-rw-r--r--chart2/source/tools/LabeledDataSequence.cxx2
-rw-r--r--chart2/source/tools/RegressionCurveModel.cxx14
-rw-r--r--chart2/source/tools/RegressionEquation.cxx2
-rw-r--r--chart2/source/tools/Scaling.cxx8
-rw-r--r--chart2/source/view/main/AbstractShapeFactory.cxx2
-rw-r--r--chart2/source/view/main/ChartView.cxx2
-rw-r--r--comphelper/source/compare/AnyCompareFactory.cxx2
-rw-r--r--comphelper/source/container/IndexedPropertyValuesContainer.cxx2
-rw-r--r--comphelper/source/container/NamedPropertyValuesContainer.cxx2
-rw-r--r--comphelper/source/misc/comphelper_services.cxx2
-rw-r--r--comphelper/source/misc/instancelocker.cxx2
-rw-r--r--comphelper/source/misc/officerestartmanager.cxx2
-rw-r--r--comphelper/source/officeinstdir/officeinstallationdirectories.cxx2
-rw-r--r--comphelper/source/property/opropertybag.cxx2
-rw-r--r--comphelper/source/streaming/memorystream.cxx2
-rw-r--r--comphelper/source/streaming/seqinputstreamserv.cxx2
-rw-r--r--comphelper/source/streaming/seqoutputstreamserv.cxx2
-rw-r--r--compilerplugins/clang/salcall.cxx25
-rw-r--r--configmgr/source/configurationprovider.hxx6
-rw-r--r--configmgr/source/configurationregistry.hxx6
-rw-r--r--configmgr/source/defaultprovider.hxx6
-rw-r--r--configmgr/source/readonlyaccess.hxx6
-rw-r--r--configmgr/source/readwriteaccess.hxx6
-rw-r--r--configmgr/source/services.cxx4
-rw-r--r--configmgr/source/update.hxx6
-rw-r--r--connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx4
-rw-r--r--connectivity/source/cpool/Zregistration.cxx2
-rw-r--r--connectivity/source/drivers/ado/Aservices.cxx2
-rw-r--r--connectivity/source/drivers/calc/CDriver.cxx2
-rw-r--r--connectivity/source/drivers/calc/Cservices.cxx4
-rw-r--r--connectivity/source/drivers/dbase/DDriver.cxx2
-rw-r--r--connectivity/source/drivers/dbase/Dservices.cxx4
-rw-r--r--connectivity/source/drivers/evoab2/NDriver.cxx2
-rw-r--r--connectivity/source/drivers/evoab2/NDriver.hxx2
-rw-r--r--connectivity/source/drivers/evoab2/NServices.cxx4
-rw-r--r--connectivity/source/drivers/firebird/Driver.cxx2
-rw-r--r--connectivity/source/drivers/firebird/Driver.hxx2
-rw-r--r--connectivity/source/drivers/firebird/Services.cxx4
-rw-r--r--connectivity/source/drivers/flat/EDriver.cxx2
-rw-r--r--connectivity/source/drivers/flat/Eservices.cxx4
-rw-r--r--connectivity/source/drivers/hsqldb/HDriver.cxx2
-rw-r--r--connectivity/source/drivers/hsqldb/Hservices.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/JDriver.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/jservices.cxx4
-rw-r--r--connectivity/source/drivers/macab/MacabServices.cxx2
-rw-r--r--connectivity/source/drivers/mork/MDriver.cxx2
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx6
-rw-r--r--connectivity/source/drivers/mysql/YDriver.cxx2
-rw-r--r--connectivity/source/drivers/mysql/Yservices.cxx4
-rw-r--r--connectivity/source/drivers/odbc/ORealDriver.cxx2
-rw-r--r--connectivity/source/drivers/odbc/ORealDriver.hxx2
-rw-r--r--connectivity/source/drivers/odbc/oservices.cxx4
-rw-r--r--connectivity/source/drivers/postgresql/pq_connection.cxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_driver.cxx2
-rw-r--r--connectivity/source/drivers/writer/WDriver.cxx2
-rw-r--r--connectivity/source/drivers/writer/Wservices.cxx4
-rw-r--r--connectivity/source/inc/calc/CDriver.hxx2
-rw-r--r--connectivity/source/inc/dbase/DDriver.hxx2
-rw-r--r--connectivity/source/inc/flat/EDriver.hxx2
-rw-r--r--connectivity/source/inc/hsqldb/HDriver.hxx2
-rw-r--r--connectivity/source/inc/java/sql/Driver.hxx2
-rw-r--r--connectivity/source/inc/mysql/YDriver.hxx2
-rw-r--r--connectivity/source/inc/writer/WDriver.hxx2
-rw-r--r--connectivity/source/manager/mregistration.cxx2
-rw-r--r--cppcanvas/source/uno/uno_mtfrenderer.cxx2
-rw-r--r--cppu/source/AffineBridge/AffineBridge.cxx4
-rw-r--r--cppu/source/LogBridge/LogBridge.cxx4
-rw-r--r--cppu/source/UnsafeBridge/UnsafeBridge.cxx4
-rw-r--r--cppu/source/helper/purpenv/Proxy.hxx2
-rw-r--r--cppu/source/helper/purpenv/helper_purpenv_Environment.cxx46
-rw-r--r--cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx8
-rw-r--r--cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx8
-rw-r--r--cppu/source/threadpool/current.cxx2
-rw-r--r--cppu/source/threadpool/jobqueue.hxx2
-rw-r--r--cppu/source/typelib/typelib.cxx6
-rw-r--r--cppu/source/typelib/typelib.hxx6
-rw-r--r--cppu/source/uno/IdentityMapping.cxx8
-rw-r--r--cppu/source/uno/cascade_mapping.cxx8
-rw-r--r--cppu/source/uno/lbenv.cxx32
-rw-r--r--cppu/source/uno/lbmap.cxx8
-rw-r--r--cppuhelper/source/exc_thrower.cxx4
-rw-r--r--cppuhelper/source/implbase_ex.cxx2
-rw-r--r--cppuhelper/source/macro_expander.cxx2
-rw-r--r--cppuhelper/source/servicemanager.hxx2
-rw-r--r--cppuhelper/source/tdmgr.cxx2
-rw-r--r--cui/source/dialogs/colorpicker.cxx6
-rw-r--r--cui/source/inc/colorpicker.hxx6
-rw-r--r--cui/source/uno/services.cxx2
-rw-r--r--dbaccess/source/core/api/RowSet.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/ComponentDefinition.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/commanddefinition.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/datasource.cxx2
-rw-r--r--dbaccess/source/core/misc/services.cxx2
-rw-r--r--dbaccess/source/ext/macromigration/dbmm_services.cxx2
-rw-r--r--dbaccess/source/filter/xml/dbloader2.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlExport.cxx6
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlservices.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlservices.hxx12
-rw-r--r--dbaccess/source/inc/registrationhelper.hxx2
-rw-r--r--dbaccess/source/sdbtools/misc/sdbt_services.cxx2
-rw-r--r--dbaccess/source/ui/app/AppController.cxx2
-rw-r--r--dbaccess/source/ui/browser/dbloader.cxx2
-rw-r--r--dbaccess/source/ui/browser/exsrcbrw.cxx2
-rw-r--r--dbaccess/source/ui/browser/sbagrid.cxx2
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx2
-rw-r--r--dbaccess/source/ui/inc/uiservices.hxx48
-rw-r--r--dbaccess/source/ui/misc/uiservices.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/limitboxcontroller.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx4
-rw-r--r--dbaccess/source/ui/relationdesign/RelationController.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableController.cxx2
-rw-r--r--dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx2
-rw-r--r--dbaccess/source/ui/uno/ColumnControl.cxx2
-rw-r--r--dbaccess/source/ui/uno/ColumnModel.cxx2
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlg.cxx2
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx2
-rw-r--r--dbaccess/source/ui/uno/TableFilterDlg.cxx2
-rw-r--r--dbaccess/source/ui/uno/UserSettingsDlg.cxx2
-rw-r--r--dbaccess/source/ui/uno/admindlg.cxx2
-rw-r--r--dbaccess/source/ui/uno/composerdialogs.cxx2
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx2
-rw-r--r--dbaccess/source/ui/uno/dbinteraction.cxx2
-rw-r--r--dbaccess/source/ui/uno/textconnectionsettings_uno.cxx2
-rw-r--r--dbaccess/source/ui/uno/unoDirectSql.cxx2
-rw-r--r--dbaccess/source/ui/uno/unosqlmessage.cxx2
-rw-r--r--desktop/source/app/officeipcthread.cxx2
-rw-r--r--desktop/source/app/officeipcthread.hxx2
-rw-r--r--desktop/source/deployment/dp_services.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_service.cxx2
-rw-r--r--desktop/source/deployment/inc/dp_registry.hxx2
-rw-r--r--desktop/source/deployment/registry/dp_registry.cxx2
-rw-r--r--desktop/source/migration/services/basicmigration.cxx2
-rw-r--r--desktop/source/migration/services/basicmigration.hxx6
-rw-r--r--desktop/source/migration/services/cexports.cxx2
-rw-r--r--desktop/source/migration/services/cexportsoo3.cxx2
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.cxx2
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.hxx6
-rw-r--r--desktop/source/migration/services/wordbookmigration.cxx2
-rw-r--r--desktop/source/migration/services/wordbookmigration.hxx6
-rw-r--r--desktop/source/offacc/acceptor.cxx2
-rw-r--r--desktop/source/splash/services_spl.cxx2
-rw-r--r--desktop/source/splash/splash.hxx6
-rw-r--r--desktop/source/splash/unxsplash.hxx4
-rw-r--r--drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx2
-rw-r--r--drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx2
-rw-r--r--drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx6
-rw-r--r--dtrans/source/cnttype/mcnttfactory.cxx2
-rw-r--r--dtrans/source/cnttype/mctfentry.cxx4
-rw-r--r--editeng/source/uno/unofield.cxx2
-rw-r--r--embeddedobj/source/commonembedding/register.cxx2
-rw-r--r--embeddedobj/source/msole/oleregister.cxx2
-rw-r--r--emfio/source/emfuno/emfuno.cxx2
-rw-r--r--emfio/source/emfuno/xemfparser.cxx2
-rw-r--r--emfio/source/emfuno/xemfparser.hxx6
-rw-r--r--eventattacher/source/eventattacher.cxx4
-rw-r--r--extensions/source/abpilot/unodialogabp.cxx2
-rw-r--r--extensions/source/bibliography/bibload.cxx6
-rw-r--r--extensions/source/config/ldap/componentdef.cxx4
-rw-r--r--extensions/source/dbpilots/dbpservices.cxx4
-rw-r--r--extensions/source/dbpilots/dbpservices.hxx6
-rw-r--r--extensions/source/dbpilots/wizardservices.cxx6
-rw-r--r--extensions/source/inc/componentmodule.hxx2
-rw-r--r--extensions/source/logging/consolehandler.cxx2
-rw-r--r--extensions/source/logging/csvformatter.cxx2
-rw-r--r--extensions/source/logging/filehandler.cxx2
-rw-r--r--extensions/source/logging/logger.cxx2
-rw-r--r--extensions/source/logging/plaintextformatter.cxx2
-rw-r--r--extensions/source/propctrlr/MasterDetailLinkDialog.cxx2
-rw-r--r--extensions/source/propctrlr/buttonnavigationhandler.cxx2
-rw-r--r--extensions/source/propctrlr/cellbindinghandler.cxx2
-rw-r--r--extensions/source/propctrlr/controlfontdialog.cxx2
-rw-r--r--extensions/source/propctrlr/defaultforminspection.cxx2
-rw-r--r--extensions/source/propctrlr/defaulthelpprovider.cxx2
-rw-r--r--extensions/source/propctrlr/editpropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/eformspropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/eventhandler.cxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx2
-rw-r--r--extensions/source/propctrlr/formcontroller.cxx2
-rw-r--r--extensions/source/propctrlr/formgeometryhandler.cxx2
-rw-r--r--extensions/source/propctrlr/genericpropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/objectinspectormodel.cxx2
-rw-r--r--extensions/source/propctrlr/pcrservices.cxx4
-rw-r--r--extensions/source/propctrlr/pcrservices.hxx38
-rw-r--r--extensions/source/propctrlr/pcrunodialogs.cxx2
-rw-r--r--extensions/source/propctrlr/propcontroller.cxx2
-rw-r--r--extensions/source/propctrlr/stringrepresentation.cxx14
-rw-r--r--extensions/source/propctrlr/submissionhandler.cxx2
-rw-r--r--extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx2
-rw-r--r--extensions/source/scanner/scanner.cxx2
-rw-r--r--extensions/source/scanner/scanner.hxx2
-rw-r--r--extensions/source/scanner/scnserv.cxx2
-rw-r--r--extensions/source/update/check/updatecheckjob.cxx6
-rw-r--r--extensions/source/update/feed/updatefeed.cxx4
-rw-r--r--extensions/source/update/ui/updatecheckui.cxx4
-rw-r--r--filter/source/config/cache/registration.cxx2
-rw-r--r--filter/source/flash/swfdialog.cxx4
-rw-r--r--filter/source/flash/swffilter.cxx4
-rw-r--r--filter/source/flash/swfuno.cxx2
-rw-r--r--filter/source/flash/swfuno.hxx8
-rw-r--r--filter/source/graphic/Services.cxx2
-rw-r--r--filter/source/graphicfilter/egif/egif.cxx2
-rw-r--r--filter/source/graphicfilter/eps/eps.cxx2
-rw-r--r--filter/source/graphicfilter/etiff/etiff.cxx2
-rw-r--r--filter/source/graphicfilter/icgm/cgm.cxx2
-rw-r--r--filter/source/graphicfilter/idxf/idxf.cxx2
-rw-r--r--filter/source/graphicfilter/ieps/ieps.cxx2
-rw-r--r--filter/source/graphicfilter/ios2met/ios2met.cxx2
-rw-r--r--filter/source/graphicfilter/ipbm/ipbm.cxx2
-rw-r--r--filter/source/graphicfilter/ipcd/ipcd.cxx2
-rw-r--r--filter/source/graphicfilter/ipcx/ipcx.cxx2
-rw-r--r--filter/source/graphicfilter/ipict/ipict.cxx2
-rw-r--r--filter/source/graphicfilter/ipsd/ipsd.cxx2
-rw-r--r--filter/source/graphicfilter/iras/iras.cxx2
-rw-r--r--filter/source/graphicfilter/itga/itga.cxx2
-rw-r--r--filter/source/graphicfilter/itiff/itiff.cxx2
-rw-r--r--filter/source/msfilter/escherex.cxx2
-rw-r--r--filter/source/msfilter/msvbahelper.cxx2
-rw-r--r--filter/source/msfilter/services.cxx2
-rw-r--r--filter/source/odfflatxml/OdfFlatXml.cxx2
-rw-r--r--filter/source/pdf/pdfdialog.cxx4
-rw-r--r--filter/source/pdf/pdfdialog.hxx4
-rw-r--r--filter/source/pdf/pdffilter.cxx4
-rw-r--r--filter/source/pdf/pdffilter.hxx4
-rw-r--r--filter/source/pdf/pdfinteract.cxx4
-rw-r--r--filter/source/pdf/pdfinteract.hxx4
-rw-r--r--filter/source/pdf/pdfuno.cxx2
-rw-r--r--filter/source/storagefilterdetect/fdcomp.cxx2
-rw-r--r--filter/source/svg/svgdialog.cxx4
-rw-r--r--filter/source/svg/svgdialog.hxx4
-rw-r--r--filter/source/svg/svgfilter.cxx2
-rw-r--r--filter/source/t602/filterenv.cxx2
-rw-r--r--filter/source/t602/t602filter.cxx10
-rw-r--r--filter/source/t602/t602filter.hxx8
-rw-r--r--filter/source/textfilterdetect/filterdetect.cxx2
-rw-r--r--filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx4
-rw-r--r--filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx4
-rw-r--r--filter/source/xmlfilteradaptor/genericfilter.cxx2
-rw-r--r--filter/source/xmlfilterdetect/fdcomp.cxx2
-rw-r--r--filter/source/xmlfilterdetect/filterdetect.hxx6
-rw-r--r--filter/source/xsltdialog/xmlfilterdialogcomponent.cxx6
-rw-r--r--filter/source/xsltfilter/XSLTFilter.cxx6
-rw-r--r--forms/source/component/Button.cxx4
-rw-r--r--forms/source/component/CheckBox.cxx4
-rw-r--r--forms/source/component/ComboBox.cxx4
-rw-r--r--forms/source/component/Currency.cxx4
-rw-r--r--forms/source/component/DatabaseForm.cxx2
-rw-r--r--forms/source/component/Date.cxx4
-rw-r--r--forms/source/component/Edit.cxx4
-rw-r--r--forms/source/component/File.cxx2
-rw-r--r--forms/source/component/Filter.cxx2
-rw-r--r--forms/source/component/FixedText.cxx2
-rw-r--r--forms/source/component/FormattedField.cxx2
-rw-r--r--forms/source/component/FormattedFieldWrapper.cxx4
-rw-r--r--forms/source/component/FormsCollection.cxx2
-rw-r--r--forms/source/component/Grid.cxx2
-rw-r--r--forms/source/component/GroupBox.cxx4
-rw-r--r--forms/source/component/Hidden.cxx2
-rw-r--r--forms/source/component/ImageButton.cxx4
-rw-r--r--forms/source/component/ImageControl.cxx4
-rw-r--r--forms/source/component/ListBox.cxx4
-rw-r--r--forms/source/component/Numeric.cxx4
-rw-r--r--forms/source/component/Pattern.cxx4
-rw-r--r--forms/source/component/RadioButton.cxx4
-rw-r--r--forms/source/component/Time.cxx4
-rw-r--r--forms/source/component/imgprod.cxx2
-rw-r--r--forms/source/component/navigationbar.cxx2
-rw-r--r--forms/source/component/scrollbar.cxx2
-rw-r--r--forms/source/component/spinbutton.cxx2
-rw-r--r--forms/source/richtext/richtextcontrol.cxx2
-rw-r--r--forms/source/richtext/richtextmodel.cxx2
-rw-r--r--forms/source/runtime/formoperations.cxx2
-rw-r--r--forms/source/solar/component/navbarcontrol.cxx2
-rw-r--r--forms/source/xforms/model.cxx2
-rw-r--r--forms/source/xforms/xforms_services.cxx2
-rw-r--r--forms/source/xforms/xpathlib/extension.cxx2
-rw-r--r--formula/source/core/api/services.cxx2
-rw-r--r--fpicker/source/office/fps_office.cxx2
-rw-r--r--framework/source/accelerators/documentacceleratorconfiguration.cxx2
-rw-r--r--framework/source/accelerators/globalacceleratorconfiguration.cxx2
-rw-r--r--framework/source/accelerators/moduleacceleratorconfiguration.cxx2
-rw-r--r--framework/source/fwe/classes/sfxhelperfunctions.cxx20
-rw-r--r--framework/source/helper/statusindicatorfactory.cxx2
-rw-r--r--framework/source/jobs/jobdispatch.cxx2
-rw-r--r--framework/source/jobs/jobexecutor.cxx2
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx2
-rw-r--r--framework/source/services/ContextChangeEventMultiplexer.cxx2
-rw-r--r--framework/source/services/autorecovery.cxx2
-rw-r--r--framework/source/services/desktop.cxx2
-rw-r--r--framework/source/services/frame.cxx2
-rw-r--r--framework/source/services/modulemanager.cxx2
-rw-r--r--framework/source/services/pathsettings.cxx2
-rw-r--r--framework/source/services/sessionlistener.cxx2
-rw-r--r--framework/source/services/substitutepathvars.cxx2
-rw-r--r--framework/source/services/taskcreatorsrv.cxx2
-rw-r--r--framework/source/services/urltransformer.cxx2
-rw-r--r--framework/source/uiconfiguration/imagemanager.cxx2
-rw-r--r--framework/source/uiconfiguration/moduleuicfgsupplier.cxx2
-rw-r--r--framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx2
-rw-r--r--framework/source/uiconfiguration/uicategorydescription.cxx2
-rw-r--r--framework/source/uiconfiguration/uiconfigurationmanager.cxx2
-rw-r--r--framework/source/uiconfiguration/windowstateconfiguration.cxx2
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx2
-rw-r--r--framework/source/uielement/langselectionstatusbarcontroller.cxx2
-rw-r--r--framework/source/uielement/objectmenucontroller.cxx2
-rw-r--r--framework/source/uielement/popuptoolbarcontroller.cxx6
-rw-r--r--framework/source/uielement/recentfilesmenucontroller.cxx2
-rw-r--r--framework/source/uielement/resourcemenucontroller.cxx6
-rw-r--r--framework/source/uielement/subtoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/thesaurusmenucontroller.cxx2
-rw-r--r--framework/source/uielement/uicommanddescription.cxx2
-rw-r--r--framework/source/uifactory/addonstoolbarfactory.cxx2
-rw-r--r--framework/source/uifactory/menubarfactory.cxx2
-rw-r--r--framework/source/uifactory/statusbarfactory.cxx2
-rw-r--r--framework/source/uifactory/toolbarfactory.cxx2
-rw-r--r--framework/source/uifactory/uicontrollerfactory.cxx6
-rw-r--r--framework/source/uifactory/uielementfactorymanager.cxx2
-rw-r--r--framework/source/uifactory/windowcontentfactorymanager.cxx2
-rw-r--r--hwpfilter/source/hwpreader.cxx2
-rw-r--r--hwpfilter/source/hwpreader.hxx2
-rw-r--r--i18npool/source/breakiterator/breakiteratorImpl.cxx6
-rw-r--r--i18npool/source/breakiterator/breakiterator_th.cxx4
-rw-r--r--i18npool/source/breakiterator/breakiterator_unicode.cxx2
-rw-r--r--i18npool/source/breakiterator/xdictionary.cxx2
-rw-r--r--i18npool/source/calendar/calendar_gregorian.cxx4
-rw-r--r--i18npool/source/characterclassification/cclass_unicode.cxx2
-rw-r--r--i18npool/source/characterclassification/characterclassificationImpl.cxx2
-rw-r--r--i18npool/source/characterclassification/unoscripttypedetector.cxx2
-rw-r--r--i18npool/source/collator/collatorImpl.cxx2
-rw-r--r--i18npool/source/collator/collator_unicode.cxx2
-rw-r--r--i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx2
-rw-r--r--i18npool/source/indexentry/indexentrysupplier_asian.cxx2
-rw-r--r--i18npool/source/inputchecker/inputsequencechecker.cxx2
-rw-r--r--i18npool/source/inputchecker/inputsequencechecker_th.cxx2
-rw-r--r--i18npool/source/localedata/localedata.cxx12
-rw-r--r--i18npool/source/nativenumber/nativenumbersupplier.cxx22
-rw-r--r--i18npool/source/numberformatcode/numberformatcode.cxx2
-rw-r--r--i18npool/source/ordinalsuffix/ordinalsuffix.cxx2
-rw-r--r--i18npool/source/registerservices/registerservices.cxx4
-rw-r--r--i18npool/source/search/textsearch.cxx4
-rw-r--r--i18npool/source/textconversion/textconversion.cxx2
-rw-r--r--i18npool/source/textconversion/textconversionImpl.cxx2
-rw-r--r--i18npool/source/textconversion/textconversion_ko.cxx2
-rw-r--r--i18npool/source/textconversion/textconversion_zh.cxx2
-rw-r--r--i18npool/source/transliteration/ignoreKana.cxx2
-rw-r--r--i18npool/source/transliteration/ignoreWidth.cxx2
-rw-r--r--i18npool/source/transliteration/textToPronounce_zh.cxx2
-rw-r--r--i18npool/source/transliteration/transliterationImpl.cxx2
-rw-r--r--i18npool/source/transliteration/transliteration_caseignore.cxx2
-rw-r--r--i18nutil/source/utility/casefolding.cxx2
-rw-r--r--idlc/inc/astexpression.hxx2
-rw-r--r--idlc/inc/idlc.hxx4
-rw-r--r--idlc/inc/idlctypes.hxx4
-rw-r--r--idlc/source/astexpression.cxx2
-rw-r--r--idlc/source/idlc.cxx12
-rw-r--r--include/comphelper/componentmodule.hxx2
-rw-r--r--include/comphelper/extract.hxx2
-rw-r--r--include/cppunittester/protectorfactory.hxx2
-rw-r--r--include/editeng/unofield.hxx2
-rw-r--r--include/filter/msfilter/msvbahelper.hxx6
-rw-r--r--include/framework/sfxhelperfunctions.hxx20
-rw-r--r--include/linguistic/misc.hxx2
-rw-r--r--include/registry/typereg_reader.hxx68
-rw-r--r--include/registry/writer.h18
-rw-r--r--include/sfx2/dockwin.hxx4
-rw-r--r--include/sfx2/sfxmodelfactory.hxx2
-rw-r--r--include/sfx2/stbitem.hxx2
-rw-r--r--include/sfx2/tbxctrl.hxx2
-rw-r--r--include/store/store.h26
-rw-r--r--include/svtools/accessiblefactory.hxx2
-rw-r--r--include/svx/UnoNamespaceMap.hxx2
-rw-r--r--include/svx/XPropertyTable.hxx12
-rw-r--r--include/svx/unofill.hxx12
-rw-r--r--include/toolkit/helper/accessiblefactory.hxx2
-rw-r--r--include/vcl/checksum.hxx2
-rw-r--r--include/xmlscript/xml_helper.hxx6
-rw-r--r--include/xmlscript/xmldlg_imexp.hxx8
-rw-r--r--include/xmlscript/xmllib_imexp.hxx8
-rw-r--r--include/xmlscript/xmlmod_imexp.hxx4
-rw-r--r--io/source/TextInputStream/TextInputStream.cxx2
-rw-r--r--io/source/TextOutputStream/TextOutputStream.cxx2
-rw-r--r--io/source/acceptor/acceptor.cxx2
-rw-r--r--io/source/connector/connector.cxx2
-rw-r--r--io/source/services.cxx2
-rw-r--r--io/source/services.hxx24
-rw-r--r--io/source/stm/odata.cxx8
-rw-r--r--io/source/stm/omark.cxx4
-rw-r--r--io/source/stm/opipe.cxx2
-rw-r--r--io/source/stm/opump.cxx2
-rw-r--r--javaunohelper/source/preload.cxx2
-rw-r--r--lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx4
-rw-r--r--lingucomponent/source/languageguessing/guesslang.cxx4
-rw-r--r--lingucomponent/source/spellcheck/spell/sspellimp.cxx4
-rw-r--r--lingucomponent/source/thesaurus/libnth/nthesimp.cxx4
-rw-r--r--linguistic/source/convdiclist.cxx4
-rw-r--r--linguistic/source/dlistimp.cxx4
-rw-r--r--linguistic/source/gciterator.cxx4
-rw-r--r--linguistic/source/hhconvdic.cxx2
-rw-r--r--linguistic/source/lngopt.cxx4
-rw-r--r--linguistic/source/lngreg.cxx2
-rw-r--r--linguistic/source/lngreg.hxx10
-rw-r--r--linguistic/source/lngsvcmgr.cxx4
-rw-r--r--linguistic/source/misc.cxx2
-rw-r--r--lotuswordpro/source/filter/LotusWordProImportFilter.cxx4
-rw-r--r--mysqlc/source/mysqlc_driver.cxx4
-rw-r--r--mysqlc/source/mysqlc_driver.hxx4
-rw-r--r--mysqlc/source/mysqlc_services.cxx6
-rw-r--r--odk/qa/checkapi/checkapi.cxx2
-rw-r--r--oox/inc/services.hxx42
-rw-r--r--oox/source/core/fasttokenhandler.cxx6
-rw-r--r--oox/source/core/filterdetect.cxx2
-rw-r--r--oox/source/core/services.cxx2
-rw-r--r--oox/source/docprop/ooxmldocpropimport.cxx6
-rw-r--r--oox/source/ppt/dgmimport.cxx6
-rw-r--r--oox/source/ppt/dgmlayout.cxx6
-rw-r--r--oox/source/ppt/pptimport.cxx6
-rw-r--r--oox/source/shape/ShapeContextHandler.cxx6
-rw-r--r--package/source/manifest/ManifestReader.cxx2
-rw-r--r--package/source/manifest/ManifestWriter.cxx2
-rw-r--r--package/source/manifest/UnoRegister.cxx2
-rw-r--r--package/source/xstor/register.cxx2
-rw-r--r--package/source/zippackage/ZipPackage.cxx2
-rw-r--r--pyuno/inc/pyuno.hxx4
-rw-r--r--pyuno/source/loader/pyuno_loader.cxx2
-rw-r--r--remotebridges/source/unourl_resolver/unourl_resolver.cxx4
-rw-r--r--reportdesign/source/core/api/services.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlservices.cxx2
-rw-r--r--reportdesign/source/ui/misc/rptuiservices.cxx2
-rw-r--r--sal/osl/all/compat.cxx4
-rw-r--r--sal/osl/all/filepath.cxx2
-rw-r--r--sal/osl/unx/file_path_helper.cxx16
-rw-r--r--sal/osl/unx/file_path_helper.hxx16
-rw-r--r--sal/osl/unx/pipe.cxx4
-rw-r--r--sal/osl/unx/process.cxx4
-rw-r--r--sal/osl/unx/process_impl.cxx2
-rw-r--r--sal/osl/unx/profile.cxx4
-rw-r--r--sal/osl/unx/secimpl.hxx2
-rw-r--r--sal/osl/unx/security.cxx14
-rw-r--r--sal/osl/unx/socket.cxx40
-rw-r--r--sal/qa/osl/module/osl_Module_DLL.cxx2
-rw-r--r--sal/qa/osl/process/osl_Thread.cxx2
-rw-r--r--sal/rtl/alloc_arena.cxx8
-rw-r--r--sal/rtl/alloc_global.cxx12
-rw-r--r--sal/rtl/cipher.cxx6
-rw-r--r--sal/rtl/digest.cxx8
-rw-r--r--sal/rtl/string.cxx2
-rw-r--r--sal/textenc/textenc.cxx2
-rw-r--r--salhelper/source/dynload.cxx2
-rw-r--r--salhelper/test/Symbols/samplelib.hxx10
-rw-r--r--salhelper/test/dynamicloader/samplelib.hxx6
-rw-r--r--sax/source/expatwrap/sax_expat.cxx2
-rw-r--r--sax/source/expatwrap/saxwriter.cxx2
-rw-r--r--sax/source/fastparser/fastparser.cxx2
-rw-r--r--sax/source/fastparser/legacyfastparser.cxx2
-rw-r--r--sc/inc/appluno.hxx38
-rw-r--r--sc/inc/filter.hxx2
-rw-r--r--sc/inc/rangelst.hxx2
-rw-r--r--sc/inc/rangenam.hxx2
-rw-r--r--sc/source/core/tool/rangelst.cxx2
-rw-r--r--sc/source/core/tool/rangenam.cxx2
-rw-r--r--sc/source/filter/excel/excel.cxx10
-rw-r--r--sc/source/filter/ftools/ftools.cxx2
-rw-r--r--sc/source/filter/oox/excelfilter.cxx2
-rw-r--r--sc/source/filter/oox/ooxformulaparser.cxx2
-rw-r--r--sc/source/filter/orcus/filterdetect.cxx2
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx20
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx34
-rw-r--r--sc/source/ui/attrdlg/scabstdlg.cxx4
-rw-r--r--sc/source/ui/docshell/docsh.cxx2
-rw-r--r--sc/source/ui/docshell/impex.cxx2
-rw-r--r--sc/source/ui/sidebar/ScPanelFactory.cxx2
-rw-r--r--sc/source/ui/unoobj/afmtuno.cxx2
-rw-r--r--sc/source/ui/unoobj/appluno.cxx8
-rw-r--r--sc/source/ui/unoobj/exceldetect.cxx2
-rw-r--r--sc/source/ui/unoobj/filtuno.cxx2
-rw-r--r--sc/source/ui/unoobj/funcuno.cxx2
-rw-r--r--sc/source/ui/unoobj/scdetect.cxx2
-rw-r--r--sc/source/ui/unoobj/unodoc.cxx6
-rw-r--r--sc/source/ui/vba/service.cxx2
-rw-r--r--sc/source/ui/vba/vbaeventshelper.cxx2
-rw-r--r--sc/source/ui/vba/vbaglobals.cxx2
-rw-r--r--sc/source/ui/vba/vbatextframe.cxx2
-rw-r--r--scaddins/source/analysis/analysis.cxx4
-rw-r--r--scaddins/source/analysis/analysis.hxx2
-rw-r--r--scaddins/source/datefunc/datefunc.cxx4
-rw-r--r--scaddins/source/pricing/pricing.cxx4
-rw-r--r--sccomp/source/solver/CoinMPSolver.cxx2
-rw-r--r--sccomp/source/solver/LpsolveSolver.cxx2
-rw-r--r--sccomp/source/solver/SwarmSolver.cxx2
-rw-r--r--scripting/source/basprov/basprov.cxx4
-rw-r--r--scripting/source/dlgprov/dlgprov.cxx10
-rw-r--r--scripting/source/dlgprov/dlgprov.hxx4
-rw-r--r--scripting/source/protocolhandler/scripthandler.cxx2
-rw-r--r--scripting/source/provider/BrowseNodeFactoryImpl.cxx6
-rw-r--r--scripting/source/provider/MasterScriptProvider.cxx6
-rw-r--r--scripting/source/provider/MasterScriptProvider.hxx12
-rw-r--r--scripting/source/provider/MasterScriptProviderFactory.cxx6
-rw-r--r--scripting/source/stringresource/stringresource.cxx8
-rw-r--r--scripting/source/vbaevents/eventhelper.cxx4
-rw-r--r--sd/source/filter/cgm/sdcgmfilter.cxx4
-rw-r--r--sd/source/filter/eppt/eppt.cxx4
-rw-r--r--sd/source/filter/eppt/pptx-epptooxml.cxx2
-rw-r--r--sd/source/filter/html/HtmlOptionsDialog.cxx2
-rw-r--r--sd/source/filter/ppt/pptin.cxx4
-rw-r--r--sd/source/filter/sdfilter.cxx2
-rw-r--r--sd/source/filter/sdpptwrp.cxx6
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx4
-rw-r--r--sd/source/ui/controller/displaymodecontroller.cxx2
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.cxx4
-rw-r--r--sd/source/ui/dlg/sdabstdlg.cxx4
-rw-r--r--sd/source/ui/framework/configuration/Configuration.cxx2
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationController.cxx2
-rw-r--r--sd/source/ui/framework/configuration/ResourceId.cxx2
-rw-r--r--sd/source/ui/framework/factories/BasicPaneFactory.cxx2
-rw-r--r--sd/source/ui/framework/factories/BasicToolBarFactory.cxx2
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.cxx2
-rw-r--r--sd/source/ui/framework/factories/PresentationFactory.cxx2
-rw-r--r--sd/source/ui/framework/module/ModuleController.cxx2
-rw-r--r--sd/source/ui/inc/facreg.hxx12
-rw-r--r--sd/source/ui/presenter/PresenterHelper.cxx2
-rw-r--r--sd/source/ui/presenter/PresenterPreviewCache.cxx2
-rw-r--r--sd/source/ui/presenter/PresenterTextView.cxx2
-rw-r--r--sd/source/ui/presenter/SlideRenderer.cxx2
-rw-r--r--sd/source/ui/sidebar/PanelFactory.cxx2
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterService.cxx2
-rw-r--r--sd/source/ui/unoidl/UnoDocumentSettings.cxx2
-rw-r--r--sd/source/ui/unoidl/UnoDocumentSettings.hxx2
-rw-r--r--sd/source/ui/unoidl/facreg.cxx2
-rw-r--r--sd/source/ui/unoidl/randomnode.cxx2
-rw-r--r--sd/source/ui/unoidl/sddetect.cxx2
-rw-r--r--sd/source/ui/unoidl/unodoc.cxx12
-rw-r--r--sd/source/ui/unoidl/unomodule.cxx2
-rw-r--r--sdext/source/minimizer/pppoptimizeruno.cxx2
-rw-r--r--sdext/source/pdfimport/services.cxx4
-rw-r--r--sdext/source/presenter/PresenterComponent.cxx2
-rw-r--r--sfx2/inc/fwkhelper.hxx2
-rw-r--r--sfx2/source/appl/app.cxx6
-rw-r--r--sfx2/source/appl/appbaslib.cxx4
-rw-r--r--sfx2/source/appl/appdispatchprovider.cxx2
-rw-r--r--sfx2/source/appl/appinit.cxx2
-rw-r--r--sfx2/source/appl/appserv.cxx4
-rw-r--r--sfx2/source/appl/fwkhelper.cxx2
-rw-r--r--sfx2/source/appl/macroloader.cxx2
-rw-r--r--sfx2/source/appl/shutdownicon.cxx4
-rw-r--r--sfx2/source/appl/xpackcreator.cxx2
-rw-r--r--sfx2/source/control/dispatch.cxx2
-rw-r--r--sfx2/source/control/objface.cxx4
-rw-r--r--sfx2/source/dialog/backingcomp.cxx2
-rw-r--r--sfx2/source/dialog/dockwin.cxx4
-rw-r--r--sfx2/source/doc/SfxDocumentMetaData.cxx24
-rw-r--r--sfx2/source/doc/doctemplates.cxx2
-rw-r--r--sfx2/source/doc/iframe.cxx2
-rw-r--r--sfx2/source/doc/ownsubfilterservice.cxx2
-rw-r--r--sfx2/source/notify/globalevents.cxx2
-rw-r--r--sfx2/source/statbar/stbitem.cxx2
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx2
-rw-r--r--sfx2/source/view/classificationcontroller.cxx2
-rw-r--r--sfx2/source/view/frmload.cxx2
-rw-r--r--shell/source/backends/desktopbe/desktopbackend.cxx8
-rw-r--r--shell/source/backends/localebe/localebecdef.cxx4
-rw-r--r--shell/source/cmdmail/cmdmailentry.cxx4
-rw-r--r--shell/source/cmdmail/cmdmailsuppl.cxx2
-rw-r--r--shell/source/sessioninstall/services.cxx4
-rw-r--r--shell/source/unix/exec/shellexec.cxx2
-rw-r--r--shell/source/unix/exec/shellexecentry.cxx4
-rw-r--r--slideshow/source/engine/opengl/TransitionerImpl.cxx2
-rw-r--r--slideshow/source/engine/slide/targetpropertiescreator.cxx2
-rw-r--r--slideshow/source/engine/slide/targetpropertiescreator.hxx2
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx2
-rw-r--r--sot/source/sdstor/storage.cxx2
-rw-r--r--sot/source/unoolestorage/xolesimplestorage.cxx2
-rw-r--r--starmath/source/detreg.cxx2
-rw-r--r--starmath/source/mathmlexport.cxx12
-rw-r--r--starmath/source/mathmlimport.cxx20
-rw-r--r--starmath/source/mathtype.cxx2
-rw-r--r--starmath/source/register.cxx2
-rw-r--r--starmath/source/register.hxx24
-rw-r--r--starmath/source/unodoc.cxx6
-rw-r--r--starmath/source/unofilter.cxx2
-rw-r--r--stoc/source/corereflection/crefl.cxx2
-rw-r--r--stoc/source/defaultregistry/defaultregistry.cxx2
-rw-r--r--stoc/source/implementationregistration/implreg.cxx2
-rw-r--r--stoc/source/inspect/introspection.cxx2
-rw-r--r--stoc/source/invocation/invocation.cxx4
-rw-r--r--stoc/source/invocation_adapterfactory/iafactory.cxx10
-rw-r--r--stoc/source/javaloader/javaloader.cxx4
-rw-r--r--stoc/source/javavm/javavm.cxx4
-rw-r--r--stoc/source/loader/dllcomponentloader.cxx2
-rw-r--r--stoc/source/namingservice/namingservice.cxx4
-rw-r--r--stoc/source/proxy_factory/proxyfac.cxx12
-rw-r--r--stoc/source/security/access_controller.cxx2
-rw-r--r--stoc/source/security/file_policy.cxx2
-rw-r--r--stoc/source/servicemanager/servicemanager.cxx6
-rw-r--r--stoc/source/simpleregistry/simpleregistry.cxx2
-rw-r--r--stoc/source/typeconv/convert.cxx2
-rw-r--r--stoc/source/uriproc/ExternalUriReferenceTranslator.cxx2
-rw-r--r--stoc/source/uriproc/UriReferenceFactory.cxx2
-rw-r--r--stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx2
-rw-r--r--stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx2
-rw-r--r--stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx2
-rw-r--r--store/source/storbios.cxx2
-rw-r--r--store/source/store.cxx26
-rw-r--r--svgio/source/svguno/svguno.cxx2
-rw-r--r--svgio/source/svguno/xsvgparser.cxx2
-rw-r--r--svgio/source/svguno/xsvgparser.hxx6
-rw-r--r--svl/source/fsstor/fsfactory.cxx2
-rw-r--r--svl/source/numbers/numfmuno.cxx2
-rw-r--r--svl/source/numbers/supservs.cxx2
-rw-r--r--svl/source/passwordcontainer/passwordcontainer.cxx2
-rw-r--r--svl/source/uno/pathservice.cxx2
-rw-r--r--svtools/source/filter/SvFilterOptionsDialog.cxx2
-rw-r--r--svtools/source/graphic/graphicunofactory.cxx2
-rw-r--r--svtools/source/graphic/provider.cxx2
-rw-r--r--svtools/source/graphic/renderer.cxx2
-rw-r--r--svtools/source/hatchwindow/documentcloser.cxx2
-rw-r--r--svtools/source/hatchwindow/hatchwindowfactory.cxx2
-rw-r--r--svtools/source/misc/svtaccessiblefactory.cxx2
-rw-r--r--svtools/source/svhtml/htmlkywd.cxx6
-rw-r--r--svtools/source/svrtf/rtfkeywd.cxx2
-rw-r--r--svtools/source/uno/addrtempuno.cxx2
-rw-r--r--svtools/source/uno/fpicker.cxx4
-rw-r--r--svtools/source/uno/fpicker.hxx8
-rw-r--r--svtools/source/uno/miscservices.cxx2
-rw-r--r--svtools/source/uno/wizard/unowizard.cxx2
-rw-r--r--svx/source/core/coreservices.cxx2
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeEngine.cxx2
-rw-r--r--svx/source/dialog/SafeModeUI.cxx2
-rw-r--r--svx/source/fmcomp/fmgridif.cxx2
-rw-r--r--svx/source/fmcomp/gridcols.cxx2
-rw-r--r--svx/source/form/formcontroller.cxx2
-rw-r--r--svx/source/form/legacyformcontroller.cxx2
-rw-r--r--svx/source/form/xfm_addcondition.cxx6
-rw-r--r--svx/source/inc/coreservices.hxx36
-rw-r--r--svx/source/inc/fmservs.hxx12
-rw-r--r--svx/source/mnuctrls/smarttagmenu.cxx2
-rw-r--r--svx/source/sdr/primitive2d/primitivefactory2d.cxx2
-rw-r--r--svx/source/sidebar/PanelFactory.cxx2
-rw-r--r--svx/source/svdraw/svdhdl.cxx2
-rw-r--r--svx/source/tbxctrls/bulletsnumbering.cxx2
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx24
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx12
-rw-r--r--svx/source/tbxctrls/linectrl.cxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx8
-rw-r--r--svx/source/tbxctrls/tbunocontroller.cxx2
-rw-r--r--svx/source/tbxctrls/tbunosearchcontrollers.cxx18
-rw-r--r--svx/source/unodialogs/textconversiondlgs/services.cxx2
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx2
-rw-r--r--svx/source/unodraw/UnoNamespaceMap.cxx6
-rw-r--r--svx/source/unodraw/XPropertyTable.cxx12
-rw-r--r--svx/source/unodraw/gluepts.cxx2
-rw-r--r--svx/source/unodraw/gluepts.hxx2
-rw-r--r--svx/source/unodraw/recoveryui.cxx2
-rw-r--r--svx/source/unodraw/unobtabl.cxx2
-rw-r--r--svx/source/unodraw/unoctabl.cxx2
-rw-r--r--svx/source/unodraw/unodtabl.cxx2
-rw-r--r--svx/source/unodraw/unogtabl.cxx2
-rw-r--r--svx/source/unodraw/unohtabl.cxx2
-rw-r--r--svx/source/unodraw/unomtabl.cxx2
-rw-r--r--svx/source/unodraw/unoshap2.cxx4
-rw-r--r--svx/source/unodraw/unoshcol.cxx2
-rw-r--r--svx/source/unodraw/unottabl.cxx2
-rw-r--r--svx/source/unogallery/unogalthemeprovider.cxx2
-rw-r--r--svx/source/xml/xmlgrhlp.cxx4
-rw-r--r--sw/inc/shellio.hxx6
-rw-r--r--sw/source/core/bastyp/calc.cxx2
-rw-r--r--sw/source/core/docnode/finalthreadmanager.cxx2
-rw-r--r--sw/source/core/inc/unofreg.hxx12
-rw-r--r--sw/source/core/layout/dumpfilter.cxx2
-rw-r--r--sw/source/filter/basflt/fltini.cxx4
-rw-r--r--sw/source/filter/docx/swdocxreader.cxx2
-rw-r--r--sw/source/filter/html/svxcss1.cxx2
-rw-r--r--sw/source/filter/html/swhtml.cxx2
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx4
-rw-r--r--sw/source/filter/ww8/docxexportfilter.cxx6
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx4
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.cxx4
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.hxx4
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par.cxx10
-rw-r--r--sw/source/filter/xml/xmlexp.cxx20
-rw-r--r--sw/source/filter/xml/xmlimp.cxx14
-rw-r--r--sw/source/ui/uno/swdetect.cxx2
-rw-r--r--sw/source/ui/vba/service.cxx2
-rw-r--r--sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx4
-rw-r--r--sw/source/uibase/dialog/swabstdlg.cxx4
-rw-r--r--sw/source/uibase/ribbar/workctrl.cxx6
-rw-r--r--sw/source/uibase/sidebar/SwPanelFactory.cxx2
-rw-r--r--sw/source/uibase/uno/SwXFilterOptions.cxx2
-rw-r--r--sw/source/uibase/uno/unoatxt.cxx2
-rw-r--r--sw/source/uibase/uno/unodoc.cxx10
-rw-r--r--sw/source/uibase/uno/unofreg.cxx4
-rw-r--r--sw/source/uibase/uno/unomod.cxx2
-rw-r--r--sw/source/uibase/uno/unomodule.cxx6
-rw-r--r--test/source/vclbootstrapprotector.cxx2
-rw-r--r--testtools/source/bridgetest/bridgetest.cxx4
-rw-r--r--testtools/source/bridgetest/constructors.cxx14
-rw-r--r--testtools/source/bridgetest/cppobj.cxx4
-rw-r--r--toolkit/source/awt/asynccallback.cxx2
-rw-r--r--toolkit/source/awt/vclxmenu.cxx4
-rw-r--r--toolkit/source/awt/vclxpointer.cxx2
-rw-r--r--toolkit/source/awt/vclxprinter.cxx2
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx10
-rw-r--r--toolkit/source/controls/animatedimages.cxx4
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx16
-rw-r--r--toolkit/source/controls/formattedcontrol.cxx4
-rw-r--r--toolkit/source/controls/grid/defaultgridcolumnmodel.cxx2
-rw-r--r--toolkit/source/controls/grid/defaultgriddatamodel.cxx2
-rw-r--r--toolkit/source/controls/grid/gridcolumn.cxx2
-rw-r--r--toolkit/source/controls/grid/gridcontrol.cxx4
-rw-r--r--toolkit/source/controls/grid/sortablegriddatamodel.cxx2
-rw-r--r--toolkit/source/controls/roadmapcontrol.cxx4
-rw-r--r--toolkit/source/controls/spinningprogress.cxx2
-rw-r--r--toolkit/source/controls/stdtabcontroller.cxx2
-rw-r--r--toolkit/source/controls/stdtabcontrollermodel.cxx2
-rw-r--r--toolkit/source/controls/tabpagecontainer.cxx4
-rw-r--r--toolkit/source/controls/tabpagemodel.cxx4
-rw-r--r--toolkit/source/controls/tkscrollbar.cxx4
-rw-r--r--toolkit/source/controls/tkspinbutton.cxx4
-rw-r--r--toolkit/source/controls/tree/treecontrol.cxx4
-rw-r--r--toolkit/source/controls/tree/treedatamodel.cxx2
-rw-r--r--toolkit/source/controls/unocontrolcontainer.cxx2
-rw-r--r--toolkit/source/controls/unocontrolcontainermodel.cxx2
-rw-r--r--toolkit/source/controls/unocontrols.cxx72
-rw-r--r--toolkit/source/helper/accessibilityclient.cxx2
-rw-r--r--ucb/source/cacher/cachedcontentresultset.cxx2
-rw-r--r--ucb/source/cacher/cachedcontentresultsetstub.cxx2
-rw-r--r--ucb/source/cacher/cacheddynamicresultset.cxx2
-rw-r--r--ucb/source/cacher/cacheddynamicresultsetstub.cxx2
-rw-r--r--ucb/source/cacher/cacheserv.cxx2
-rw-r--r--ucb/source/core/FileAccess.cxx2
-rw-r--r--ucb/source/core/FileAccess.hxx2
-rw-r--r--ucb/source/core/cmdenv.cxx2
-rw-r--r--ucb/source/core/provprox.cxx2
-rw-r--r--ucb/source/core/ucb.cxx2
-rw-r--r--ucb/source/core/ucbprops.cxx2
-rw-r--r--ucb/source/core/ucbserv.cxx2
-rw-r--r--ucb/source/core/ucbstore.cxx2
-rw-r--r--ucb/source/sorter/sortdynres.cxx2
-rw-r--r--ucb/source/sorter/sortmain.cxx2
-rw-r--r--ucb/source/ucp/cmis/cmis_provider.cxx4
-rw-r--r--ucb/source/ucp/expand/ucpexpand.cxx8
-rw-r--r--ucb/source/ucp/ext/ucpext_services.cxx2
-rw-r--r--ucb/source/ucp/file/prov.cxx2
-rw-r--r--ucb/source/ucp/ftp/ftpcontentprovider.cxx2
-rw-r--r--ucb/source/ucp/ftp/ftpservices.cxx2
-rw-r--r--ucb/source/ucp/gio/gio_provider.cxx4
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydatasource.cxx2
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyprovider.cxx2
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyservices.cxx2
-rw-r--r--ucb/source/ucp/image/ucpimage.cxx2
-rw-r--r--ucb/source/ucp/package/pkgprovider.cxx2
-rw-r--r--ucb/source/ucp/package/pkgservices.cxx2
-rw-r--r--ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx2
-rw-r--r--ucb/source/ucp/tdoc/tdoc_provider.cxx2
-rw-r--r--ucb/source/ucp/tdoc/tdoc_services.cxx2
-rw-r--r--ucb/source/ucp/webdav-neon/webdavprovider.cxx2
-rw-r--r--ucb/source/ucp/webdav-neon/webdavservices.cxx2
-rw-r--r--unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx2
-rw-r--r--unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx2
-rw-r--r--unotools/source/misc/unotoolsservices.cxx2
-rw-r--r--unoxml/source/rdf/CBlankNode.cxx6
-rw-r--r--unoxml/source/rdf/CLiteral.cxx6
-rw-r--r--unoxml/source/rdf/CNodes.hxx18
-rw-r--r--unoxml/source/rdf/CURI.cxx6
-rw-r--r--unoxml/source/rdf/librdf_repository.cxx6
-rw-r--r--unoxml/source/rdf/librdf_repository.hxx6
-rw-r--r--unoxml/source/rdf/librdf_services.cxx2
-rw-r--r--unoxml/source/service/services.cxx2
-rw-r--r--uui/source/interactionhandler.cxx2
-rw-r--r--uui/source/passwordcontainer.cxx2
-rw-r--r--uui/source/requeststringresolver.cxx2
-rw-r--r--uui/source/services.cxx2
-rw-r--r--vbahelper/source/msforms/service.cxx2
-rw-r--r--vcl/inc/factory.hxx28
-rw-r--r--vcl/source/app/session.cxx6
-rw-r--r--vcl/source/app/svapp.cxx4
-rw-r--r--vcl/source/app/svmain.cxx4
-rw-r--r--vcl/source/bitmap/checksum.cxx2
-rw-r--r--vcl/source/components/dtranscomp.cxx16
-rw-r--r--vcl/source/components/factory.cxx2
-rw-r--r--vcl/source/components/fontident.cxx2
-rw-r--r--vcl/source/gdi/bitmap3.cxx2
-rw-r--r--vcl/source/gdi/bitmap4.cxx2
-rw-r--r--vcl/source/gdi/impvect.cxx2
-rw-r--r--vcl/source/outdev/hatch.cxx2
-rw-r--r--vcl/source/uitest/uno/uitest_uno.cxx2
-rw-r--r--vcl/source/window/abstdlg.cxx4
-rw-r--r--vcl/source/window/builder.cxx2
-rw-r--r--vcl/unx/generic/app/salinst.cxx2
-rw-r--r--vcl/unx/generic/app/sm.cxx2
-rw-r--r--vcl/unx/generic/dtrans/X11_clipboard.hxx2
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.hxx4
-rw-r--r--vcl/unx/generic/dtrans/X11_service.cxx6
-rw-r--r--vcl/workben/fftester.cxx2
-rw-r--r--writerfilter/source/filter/RtfFilter.cxx2
-rw-r--r--writerfilter/source/filter/WriterFilter.cxx2
-rw-r--r--writerperfect/source/calc/MSWorksCalcImportFilter.cxx2
-rw-r--r--writerperfect/source/calc/MWAWCalcImportFilter.cxx2
-rw-r--r--writerperfect/source/calc/NumbersImportFilter.cxx2
-rw-r--r--writerperfect/source/calc/StarOfficeCalcImportFilter.cxx2
-rw-r--r--writerperfect/source/draw/CDRImportFilter.cxx2
-rw-r--r--writerperfect/source/draw/CMXImportFilter.cxx2
-rw-r--r--writerperfect/source/draw/FreehandImportFilter.cxx2
-rw-r--r--writerperfect/source/draw/MSPUBImportFilter.cxx2
-rw-r--r--writerperfect/source/draw/MWAWDrawImportFilter.cxx2
-rw-r--r--writerperfect/source/draw/PageMakerImportFilter.cxx2
-rw-r--r--writerperfect/source/draw/QXPImportFilter.cxx2
-rw-r--r--writerperfect/source/draw/StarOfficeDrawImportFilter.cxx2
-rw-r--r--writerperfect/source/draw/VisioImportFilter.cxx2
-rw-r--r--writerperfect/source/draw/WPGImportFilter.cxx2
-rw-r--r--writerperfect/source/draw/ZMFImportFilter.cxx2
-rw-r--r--writerperfect/source/impress/KeynoteImportFilter.cxx2
-rw-r--r--writerperfect/source/impress/MWAWPresentationImportFilter.cxx2
-rw-r--r--writerperfect/source/impress/StarOfficePresentationImportFilter.cxx2
-rw-r--r--writerperfect/source/writer/AbiWordImportFilter.cxx2
-rw-r--r--writerperfect/source/writer/EBookImportFilter.cxx2
-rw-r--r--writerperfect/source/writer/EPUBExportFilter.cxx2
-rw-r--r--writerperfect/source/writer/EPUBExportUIComponent.cxx2
-rw-r--r--writerperfect/source/writer/MSWorksImportFilter.cxx2
-rw-r--r--writerperfect/source/writer/MWAWImportFilter.cxx2
-rw-r--r--writerperfect/source/writer/PagesImportFilter.cxx2
-rw-r--r--writerperfect/source/writer/StarOfficeWriterImportFilter.cxx2
-rw-r--r--writerperfect/source/writer/WordPerfectImportFilter.cxx2
-rw-r--r--xmlhelp/source/cxxhelp/provider/provider.cxx2
-rw-r--r--xmlhelp/source/cxxhelp/provider/services.cxx2
-rw-r--r--xmloff/inc/facreg.hxx288
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx42
-rw-r--r--xmloff/source/chart/SchXMLImport.cxx24
-rw-r--r--xmloff/source/core/facreg.cxx2
-rw-r--r--xmloff/source/draw/animationimport.cxx6
-rw-r--r--xmloff/source/meta/MetaExportComponent.cxx8
-rw-r--r--xmloff/source/meta/MetaImportComponent.cxx2
-rw-r--r--xmloff/source/meta/xmlversion.cxx2
-rw-r--r--xmloff/source/text/XMLAutoTextEventExport.cxx12
-rw-r--r--xmloff/source/text/XMLAutoTextEventImport.cxx6
-rw-r--r--xmloff/source/transform/OOo2Oasis.cxx6
-rw-r--r--xmloff/source/transform/Oasis2OOo.cxx6
-rw-r--r--xmloff/source/transform/XMLFilterRegistration.cxx8
-rw-r--r--xmloff/source/transform/XMLFilterRegistration.hxx12
-rw-r--r--xmlscript/source/inc/unoservices.hxx6
-rw-r--r--xmlscript/source/inc/xml_import.hxx2
-rw-r--r--xmlscript/source/misc/unoservices.cxx2
-rw-r--r--xmlscript/source/xml_helper/xml_byteseq.cxx6
-rw-r--r--xmlscript/source/xml_helper/xml_impctx.cxx4
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx4
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_export.cxx2
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_import.cxx2
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_export.cxx4
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_import.cxx4
-rw-r--r--xmlscript/source/xmllib_imexp/xmllib_export.cxx4
-rw-r--r--xmlscript/source/xmllib_imexp/xmllib_import.cxx4
-rw-r--r--xmlscript/source/xmlmod_imexp/xmlmod_export.cxx2
-rw-r--r--xmlscript/source/xmlmod_imexp/xmlmod_import.cxx2
-rw-r--r--xmlsecurity/inc/framework/saxeventkeeperimpl.hxx2
-rw-r--r--xmlsecurity/inc/framework/signaturecreatorimpl.hxx2
-rw-r--r--xmlsecurity/inc/framework/signatureverifierimpl.hxx2
-rw-r--r--xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx4
-rw-r--r--xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx4
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.hxx2
-rw-r--r--xmlsecurity/source/component/registerservices.cxx2
-rw-r--r--xmlsecurity/source/framework/saxeventkeeperimpl.cxx2
-rw-r--r--xmlsecurity/source/framework/signaturecreatorimpl.cxx2
-rw-r--r--xmlsecurity/source/framework/signatureverifierimpl.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/nssinitializer.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/nssinitializer.hxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/xsec_nss.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/serialnumberadapter.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/xsec_xmlsec.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/xsec_xmlsec.hxx2
940 files changed, 2107 insertions, 2126 deletions
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,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx
index ee59b0d8ae15..3cfe29794a05 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
@@ -258,7 +258,7 @@ oslGenericFunction ORealObdcDriver::getOdbcFunction(ODBC3SQLFunctionId _nIndex)
}
-css::uno::Reference< css::uno::XInterface > SAL_CALL ODBCDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
+css::uno::Reference< css::uno::XInterface > ODBCDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
{
return *(new ORealObdcDriver(_rxFactory));
}
diff --git a/connectivity/source/drivers/odbc/ORealDriver.hxx b/connectivity/source/drivers/odbc/ORealDriver.hxx
index 5a103d80fec3..b4b092b87697 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.hxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.hxx
@@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star {
namespace connectivity { namespace odbc {
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface >
ODBCDriver_CreateInstance( css::uno::Reference< css::lang::XMultiServiceFactory > const & factory);
} }
diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx
index 4d13ae9bdef9..a4a5cd4e6aa1 100644
--- a/connectivity/source/drivers/odbc/oservices.cxx
+++ b/connectivity/source/drivers/odbc/oservices.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,
@@ -76,7 +76,7 @@ struct ProviderRequest
};
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL odbc_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* odbc_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 76ac4de02d57..6c5eb35ed5df 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -708,7 +708,7 @@ static const struct cppu::ImplementationEntry g_entries[] =
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL postgresql_sdbc_impl_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * postgresql_sdbc_impl_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index 40a6abf09026..e877776b3a3a 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -274,7 +274,7 @@ static const struct cppu::ImplementationEntry g_entries[] =
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL postgresql_sdbc_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * postgresql_sdbc_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * )
{
// need to extract the defaultcontext, because the way, sdbc
diff --git a/connectivity/source/drivers/writer/WDriver.cxx b/connectivity/source/drivers/writer/WDriver.cxx
index d19f2fb2425b..d07d2f326b31 100644
--- a/connectivity/source/drivers/writer/WDriver.cxx
+++ b/connectivity/source/drivers/writer/WDriver.cxx
@@ -43,7 +43,7 @@ OUString SAL_CALL ODriver::getImplementationName()
return getImplementationName_Static();
}
-uno::Reference< css::uno::XInterface > SAL_CALL
+uno::Reference< css::uno::XInterface >
ODriver_CreateInstance(const uno::Reference<
lang::XMultiServiceFactory >& _rxFactory)
{
diff --git a/connectivity/source/drivers/writer/Wservices.cxx b/connectivity/source/drivers/writer/Wservices.cxx
index 8b1a7cb314f4..ad59d7639153 100644
--- a/connectivity/source/drivers/writer/Wservices.cxx
+++ b/connectivity/source/drivers/writer/Wservices.cxx
@@ -22,7 +22,7 @@
using namespace com::sun::star;
-typedef uno::Reference< lang::XSingleServiceFactory > (SAL_CALL* createFactoryFunc)
+typedef uno::Reference< lang::XSingleServiceFactory > (* createFactoryFunc)
(
const uno::Reference< lang::XMultiServiceFactory >& rServiceManager,
const OUString& rComponentName,
@@ -74,7 +74,7 @@ struct ProviderRequest
};
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL connectivity_writer_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* connectivity_writer_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/connectivity/source/inc/calc/CDriver.hxx b/connectivity/source/inc/calc/CDriver.hxx
index 831284c7c68b..89e92f4144c4 100644
--- a/connectivity/source/inc/calc/CDriver.hxx
+++ b/connectivity/source/inc/calc/CDriver.hxx
@@ -29,7 +29,7 @@ namespace connectivity
namespace calc
{
/// @throws css::uno::Exception
- css::uno::Reference< css::uno::XInterface > SAL_CALL
+ css::uno::Reference< css::uno::XInterface >
ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
class ODriver : public file::OFileDriver
diff --git a/connectivity/source/inc/dbase/DDriver.hxx b/connectivity/source/inc/dbase/DDriver.hxx
index d8d340af840f..9378b4c5f693 100644
--- a/connectivity/source/inc/dbase/DDriver.hxx
+++ b/connectivity/source/inc/dbase/DDriver.hxx
@@ -29,7 +29,7 @@ namespace connectivity
namespace dbase
{
/// @throws css::uno::Exception
- css::uno::Reference< css::uno::XInterface > SAL_CALL ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
+ css::uno::Reference< css::uno::XInterface > ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
class ODriver : public file::OFileDriver
{
diff --git a/connectivity/source/inc/flat/EDriver.hxx b/connectivity/source/inc/flat/EDriver.hxx
index 036d845cc61b..c818b363203a 100644
--- a/connectivity/source/inc/flat/EDriver.hxx
+++ b/connectivity/source/inc/flat/EDriver.hxx
@@ -29,7 +29,7 @@ namespace connectivity
namespace flat
{
/// @throws css::uno::Exception
- css::uno::Reference< css::uno::XInterface > SAL_CALL ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
+ css::uno::Reference< css::uno::XInterface > ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
class ODriver : public file::OFileDriver
{
diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx
index 675d63993242..b88e1227de1c 100644
--- a/connectivity/source/inc/hsqldb/HDriver.hxx
+++ b/connectivity/source/inc/hsqldb/HDriver.hxx
@@ -39,7 +39,7 @@ namespace connectivity
namespace hsqldb
{
/// @throws css::uno::Exception
- css::uno::Reference< css::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
+ css::uno::Reference< css::uno::XInterface > ODriverDelegator_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver
, css::sdbcx::XDataDefinitionSupplier
diff --git a/connectivity/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx
index 09a2c03b40a0..d01f3896b7ef 100644
--- a/connectivity/source/inc/java/sql/Driver.hxx
+++ b/connectivity/source/inc/java/sql/Driver.hxx
@@ -30,7 +30,7 @@
namespace connectivity
{
/// @throws css::uno::Exception
- css::uno::Reference< css::uno::XInterface > SAL_CALL java_sql_Driver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
+ css::uno::Reference< css::uno::XInterface > java_sql_Driver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
class java_sql_Driver : public ::cppu::WeakImplHelper< css::sdbc::XDriver,css::lang::XServiceInfo>
{
diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx
index 23b9f89fb961..fc4b7b35f493 100644
--- a/connectivity/source/inc/mysql/YDriver.hxx
+++ b/connectivity/source/inc/mysql/YDriver.hxx
@@ -43,7 +43,7 @@ namespace connectivity
namespace mysql
{
/// @throws css::uno::Exception
- css::uno::Reference< css::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxMSF);
+ css::uno::Reference< css::uno::XInterface > ODriverDelegator_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxMSF);
typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver
, css::sdbcx::XDataDefinitionSupplier
diff --git a/connectivity/source/inc/writer/WDriver.hxx b/connectivity/source/inc/writer/WDriver.hxx
index d531da480f7f..614c8321d1a0 100644
--- a/connectivity/source/inc/writer/WDriver.hxx
+++ b/connectivity/source/inc/writer/WDriver.hxx
@@ -29,7 +29,7 @@ namespace connectivity
namespace writer
{
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface >
ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
class ODriver : public file::OFileDriver
diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx
index 11bc4f73eb8d..40cd37698f70 100644
--- a/connectivity/source/manager/mregistration.cxx
+++ b/connectivity/source/manager/mregistration.cxx
@@ -29,7 +29,7 @@ extern "C"
{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbc2_component_getFactory(const sal_Char* _pImplName, void * _pServiceManager, void* /*_pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* sdbc2_component_getFactory(const sal_Char* _pImplName, void * _pServiceManager, void* /*_pRegistryKey*/)
{
void* pRet = nullptr;
diff --git a/cppcanvas/source/uno/uno_mtfrenderer.cxx b/cppcanvas/source/uno/uno_mtfrenderer.cxx
index a13b995e6e3a..557f5902f872 100644
--- a/cppcanvas/source/uno/uno_mtfrenderer.cxx
+++ b/cppcanvas/source/uno/uno_mtfrenderer.cxx
@@ -54,7 +54,7 @@ namespace sdecl = comphelper::service_decl;
// The C shared lib entry points
extern "C"
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL mtfrenderer_component_getFactory( sal_Char const* pImplName,
+SAL_DLLPUBLIC_EXPORT void* mtfrenderer_component_getFactory( sal_Char const* pImplName,
void*, void* )
{
return sdecl::component_getFactoryHelper( pImplName, {&MtfRendererDecl} );
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index bf0455f689a1..b63b8777a0dd 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -340,13 +340,13 @@ bool AffineBridge::v_isValid(rtl::OUString * pReason)
#endif
-extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_initEnvironment(uno_Environment * pEnv)
+extern "C" void SAL_DLLPUBLIC_EXPORT uno_initEnvironment(uno_Environment * pEnv)
SAL_THROW_EXTERN_C()
{
cppu::helper::purpenv::Environment_initWithEnterable(pEnv, new AffineBridge());
}
-extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_ext_getMapping(uno_Mapping ** ppMapping,
+extern "C" void SAL_DLLPUBLIC_EXPORT uno_ext_getMapping(uno_Mapping ** ppMapping,
uno_Environment * pFrom,
uno_Environment * pTo )
{
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index 2e891603c152..395d7d8ef164 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -249,13 +249,13 @@ void LogProbe(
#endif
-extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_initEnvironment(uno_Environment * pEnv)
+extern "C" void SAL_DLLPUBLIC_EXPORT uno_initEnvironment(uno_Environment * pEnv)
SAL_THROW_EXTERN_C()
{
cppu::helper::purpenv::Environment_initWithEnterable(pEnv, new LogBridge());
}
-extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_ext_getMapping(uno_Mapping ** ppMapping,
+extern "C" void SAL_DLLPUBLIC_EXPORT uno_ext_getMapping(uno_Mapping ** ppMapping,
uno_Environment * pFrom,
uno_Environment * pTo )
{
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index 772f2a7bd703..892390b7a263 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -124,13 +124,13 @@ bool UnsafeBridge::v_isValid(rtl::OUString * pReason)
return result;
}
-extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_initEnvironment(uno_Environment * pEnv)
+extern "C" void SAL_DLLPUBLIC_EXPORT uno_initEnvironment(uno_Environment * pEnv)
SAL_THROW_EXTERN_C()
{
cppu::helper::purpenv::Environment_initWithEnterable(pEnv, new UnsafeBridge());
}
-extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_ext_getMapping(uno_Mapping ** ppMapping,
+extern "C" void SAL_DLLPUBLIC_EXPORT uno_ext_getMapping(uno_Mapping ** ppMapping,
uno_Environment * pFrom,
uno_Environment * pTo )
{
diff --git a/cppu/source/helper/purpenv/Proxy.hxx b/cppu/source/helper/purpenv/Proxy.hxx
index 3c270fa6421a..f53702ef93d3 100644
--- a/cppu/source/helper/purpenv/Proxy.hxx
+++ b/cppu/source/helper/purpenv/Proxy.hxx
@@ -72,7 +72,7 @@ public:
};
-extern "C" void SAL_CALL Proxy_free(uno_ExtEnvironment * pEnv, void * pProxy) SAL_THROW_EXTERN_C();
+extern "C" void Proxy_free(uno_ExtEnvironment * pEnv, void * pProxy) SAL_THROW_EXTERN_C();
#endif
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index 4143e4838515..8d24442faa11 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -28,32 +28,32 @@
#include <osl/interlck.h>
extern "C" {
-typedef void SAL_CALL EnvFun_P (uno_Environment *);
-typedef void SAL_CALL EnvFun_PP_P(uno_Environment ** ppHardEnv, uno_Environment *);
-typedef void SAL_CALL ExtEnv_registerProxyInterface (uno_ExtEnvironment *,
+typedef void EnvFun_P (uno_Environment *);
+typedef void EnvFun_PP_P(uno_Environment ** ppHardEnv, uno_Environment *);
+typedef void ExtEnv_registerProxyInterface (uno_ExtEnvironment *,
void ** ppProxy,
uno_freeProxyFunc freeProxy,
rtl_uString * pOId,
typelib_InterfaceTypeDescription * pTypeDescr);
-typedef void SAL_CALL ExtEnv_revokeInterface (uno_ExtEnvironment *,
+typedef void ExtEnv_revokeInterface (uno_ExtEnvironment *,
void * pInterface);
-typedef void SAL_CALL ExtEnv_getObjectIdentifier (uno_ExtEnvironment *,
+typedef void ExtEnv_getObjectIdentifier (uno_ExtEnvironment *,
rtl_uString **,
void *);
-typedef void SAL_CALL ExtEnv_getRegisteredInterface (uno_ExtEnvironment *,
+typedef void ExtEnv_getRegisteredInterface (uno_ExtEnvironment *,
void **,
rtl_uString *,
typelib_InterfaceTypeDescription *);
-typedef void SAL_CALL ExtEnv_getRegisteredInterfaces(uno_ExtEnvironment *,
+typedef void ExtEnv_getRegisteredInterfaces(uno_ExtEnvironment *,
void *** pppInterfaces,
sal_Int32 * pnLen,
uno_memAlloc memAlloc);
-typedef void SAL_CALL ExtEnv_computeObjectIdentifier(uno_ExtEnvironment *,
+typedef void ExtEnv_computeObjectIdentifier(uno_ExtEnvironment *,
rtl_uString ** ppOId,
void * pInterface);
-typedef void SAL_CALL ExtEnv_acquireInterface (uno_ExtEnvironment *,
+typedef void ExtEnv_acquireInterface (uno_ExtEnvironment *,
void * pInterface);
-typedef void SAL_CALL ExtEnv_releaseInterface (uno_ExtEnvironment *,
+typedef void ExtEnv_releaseInterface (uno_ExtEnvironment *,
void * pInterface);
}
@@ -116,38 +116,38 @@ protected:
};
extern "C" {
-static void SAL_CALL s_acquire(uno_Environment * pEnv) //SAL_THROW_EXTERN_C()
+static void s_acquire(uno_Environment * pEnv) //SAL_THROW_EXTERN_C()
{
Base * pBase = static_cast<Base *>(pEnv->pReserved);
pBase->acquire();
}
-static void SAL_CALL s_release(uno_Environment * pEnv) SAL_THROW_EXTERN_C()
+static void s_release(uno_Environment * pEnv) SAL_THROW_EXTERN_C()
{
Base * pBase = static_cast<Base *>(pEnv->pReserved);
pBase->release();
}
-static void SAL_CALL s_harden(uno_Environment ** ppHardEnv, uno_Environment * pEnv) SAL_THROW_EXTERN_C()
+static void s_harden(uno_Environment ** ppHardEnv, uno_Environment * pEnv) SAL_THROW_EXTERN_C()
{
Base * pBase = static_cast<Base *>(pEnv->pReserved);
pBase->harden(ppHardEnv);
}
-static void SAL_CALL s_acquireWeak(uno_Environment * pEnv) SAL_THROW_EXTERN_C()
+static void s_acquireWeak(uno_Environment * pEnv) SAL_THROW_EXTERN_C()
{
Base * pBase = static_cast<Base *>(pEnv->pReserved);
pBase->acquireWeak();
}
-static void SAL_CALL s_releaseWeak(uno_Environment * pEnv) SAL_THROW_EXTERN_C()
+static void s_releaseWeak(uno_Environment * pEnv) SAL_THROW_EXTERN_C()
{
Base * pBase = static_cast<Base *>(pEnv->pReserved);
pBase->releaseWeak();
}
-static void SAL_CALL s_registerProxyInterface(uno_ExtEnvironment * pExtEnv,
+static void s_registerProxyInterface(uno_ExtEnvironment * pExtEnv,
void ** ppProxy,
uno_freeProxyFunc freeProxy,
rtl_uString * pOId,
@@ -157,13 +157,13 @@ static void SAL_CALL s_registerProxyInterface(uno_ExtEnvironment
pBase->registerProxyInterface(ppProxy, freeProxy, pOId, pTypeDescr);
}
-static void SAL_CALL s_revokeInterface(uno_ExtEnvironment * pExtEnv, void * pInterface)
+static void s_revokeInterface(uno_ExtEnvironment * pExtEnv, void * pInterface)
{
Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved);
pBase->revokeInterface(pInterface);
}
-static void SAL_CALL s_getObjectIdentifier(uno_ExtEnvironment * pExtEnv,
+static void s_getObjectIdentifier(uno_ExtEnvironment * pExtEnv,
rtl_uString ** ppOId,
void * pInterface)
{
@@ -171,7 +171,7 @@ static void SAL_CALL s_getObjectIdentifier(uno_ExtEnvironment * pExtEnv,
pBase->getObjectIdentifier(pInterface, reinterpret_cast<rtl::OUString *>(ppOId));
}
-static void SAL_CALL s_getRegisteredInterface(uno_ExtEnvironment * pExtEnv,
+static void s_getRegisteredInterface(uno_ExtEnvironment * pExtEnv,
void ** ppInterface,
rtl_uString * pOId,
typelib_InterfaceTypeDescription * pTypeDescr)
@@ -180,7 +180,7 @@ static void SAL_CALL s_getRegisteredInterface(uno_ExtEnvironment * pExtEnv,
pBase->getRegisteredInterface(ppInterface, pOId, pTypeDescr);
}
-static void SAL_CALL s_getRegisteredInterfaces(uno_ExtEnvironment * pExtEnv,
+static void s_getRegisteredInterfaces(uno_ExtEnvironment * pExtEnv,
void *** pppInterface,
sal_Int32 * pnLen,
uno_memAlloc memAlloc)
@@ -189,7 +189,7 @@ static void SAL_CALL s_getRegisteredInterfaces(uno_ExtEnvironment * pExtEnv,
pBase->getRegisteredInterfaces(pppInterface, pnLen, memAlloc);
}
-static void SAL_CALL s_computeObjectIdentifier(uno_ExtEnvironment * pExtEnv,
+static void s_computeObjectIdentifier(uno_ExtEnvironment * pExtEnv,
rtl_uString ** ppOId,
void * pInterface)
{
@@ -197,12 +197,12 @@ static void SAL_CALL s_computeObjectIdentifier(uno_ExtEnvironment * pExtEnv,
pBase->computeObjectIdentifier(pInterface, reinterpret_cast<rtl::OUString *>(ppOId));
}
-static void SAL_CALL s_acquireInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) {
+static void s_acquireInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) {
Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved);
pBase->acquireInterface(pInterface);
}
-static void SAL_CALL s_releaseInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) {
+static void s_releaseInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) {
Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved);
pBase->releaseInterface(pInterface);
}
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
index f065d3c7ecca..41a338f27a53 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
@@ -55,7 +55,7 @@ public:
void release();
};
-static void SAL_CALL s_mapInterface(
+static void s_mapInterface(
uno_Mapping * puno_Mapping,
void ** ppOut,
void * pUnoI,
@@ -69,14 +69,14 @@ static void SAL_CALL s_mapInterface(
}
extern "C" {
-static void SAL_CALL s_acquire(uno_Mapping * puno_Mapping)
+static void s_acquire(uno_Mapping * puno_Mapping)
SAL_THROW_EXTERN_C()
{
Mapping * pMapping = static_cast<Mapping *>(puno_Mapping);
pMapping->acquire();
}
-static void SAL_CALL s_release(uno_Mapping * puno_Mapping)
+static void s_release(uno_Mapping * puno_Mapping)
SAL_THROW_EXTERN_C()
{
Mapping * pMapping = static_cast<Mapping * >(puno_Mapping);
@@ -93,7 +93,7 @@ static void s_getIdentifier_v(va_list * pParam)
pEnv->getObjectIdentifier(pEnv, ppOid, pUnoI);
}
-static void SAL_CALL s_free(uno_Mapping * puno_Mapping)
+static void s_free(uno_Mapping * puno_Mapping)
SAL_THROW_EXTERN_C()
{
Mapping * pMapping = static_cast<Mapping *>(puno_Mapping);
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
index 048f393d6466..e0ce8b74aa27 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
@@ -98,7 +98,7 @@ static bool relatesToInterface(typelib_TypeDescription * pTypeDescr)
return false;
}
-extern "C" { static void SAL_CALL s_Proxy_dispatch(
+extern "C" { static void s_Proxy_dispatch(
uno_Interface * pUnoI,
typelib_TypeDescription const * pMemberType,
void * pReturn,
@@ -158,20 +158,20 @@ extern "C" { static void SAL_CALL s_Proxy_dispatch(
ppException );
}}
-extern "C" void SAL_CALL Proxy_free(SAL_UNUSED_PARAMETER uno_ExtEnvironment * /*pEnv*/, void * pProxy) SAL_THROW_EXTERN_C()
+extern "C" void Proxy_free(SAL_UNUSED_PARAMETER uno_ExtEnvironment * /*pEnv*/, void * pProxy) SAL_THROW_EXTERN_C()
{
Proxy * pThis = static_cast<Proxy * >(static_cast<uno_Interface *>(pProxy));
delete pThis;
}
extern "C" {
-static void SAL_CALL s_Proxy_acquire(uno_Interface * pUnoI) SAL_THROW_EXTERN_C()
+static void s_Proxy_acquire(uno_Interface * pUnoI) SAL_THROW_EXTERN_C()
{
Proxy * pProxy = static_cast<Proxy *>(pUnoI);
pProxy->acquire();
}
-static void SAL_CALL s_Proxy_release(uno_Interface * pUnoI) SAL_THROW_EXTERN_C()
+static void s_Proxy_release(uno_Interface * pUnoI) SAL_THROW_EXTERN_C()
{
Proxy * pProxy = static_cast<Proxy *>(pUnoI);
pProxy->release();
diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx
index f0bb7e750a94..fa2545d05e1c 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -134,7 +134,7 @@ public:
}
};
-extern "C" void SAL_CALL delete_IdContainer( void * p )
+extern "C" void delete_IdContainer( void * p )
{
if (p)
{
diff --git a/cppu/source/threadpool/jobqueue.hxx b/cppu/source/threadpool/jobqueue.hxx
index 9dc20f3cd75e..abfdfa19d661 100644
--- a/cppu/source/threadpool/jobqueue.hxx
+++ b/cppu/source/threadpool/jobqueue.hxx
@@ -29,7 +29,7 @@
namespace cppu_threadpool
{
- extern "C" typedef void (SAL_CALL RequestFun)(void *);
+ extern "C" typedef void (RequestFun)(void *);
struct Job
{
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 4ef5aaf18ac7..a99746ef0600 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -540,7 +540,7 @@ bool complete(typelib_TypeDescription ** ppTypeDescr, bool initTables) {
}
-extern "C" void SAL_CALL typelib_typedescription_newEmpty(
+extern "C" void typelib_typedescription_newEmpty(
typelib_TypeDescription ** ppRet,
typelib_TypeClass eTypeClass, rtl_uString * pTypeName )
SAL_THROW_EXTERN_C()
@@ -1605,7 +1605,7 @@ extern "C" sal_Bool SAL_CALL typelib_typedescription_equals(
}
-extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize(
+extern "C" sal_Int32 typelib_typedescription_getAlignedUnoSize(
const typelib_TypeDescription * pTypeDescription,
sal_Int32 nOffset, sal_Int32 & rMaxIntegralTypeSize )
SAL_THROW_EXTERN_C()
@@ -2215,7 +2215,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_getDescription(
}
-extern "C" void SAL_CALL typelib_typedescriptionreference_getByName(
+extern "C" void typelib_typedescriptionreference_getByName(
typelib_TypeDescriptionReference ** ppRet, rtl_uString const * pName )
SAL_THROW_EXTERN_C()
{
diff --git a/cppu/source/typelib/typelib.hxx b/cppu/source/typelib/typelib.hxx
index 30f0f22c986c..b10b6eba8757 100644
--- a/cppu/source/typelib/typelib.hxx
+++ b/cppu/source/typelib/typelib.hxx
@@ -20,20 +20,20 @@
#ifndef INCLUDED_CPPU_SOURCE_TYPELIB_HXX
#define INCLUDED_CPPU_SOURCE_TYPELIB_HXX
-extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize(
+extern "C" sal_Int32 typelib_typedescription_getAlignedUnoSize(
const typelib_TypeDescription * pTypeDescription,
sal_Int32 nOffset,
sal_Int32 & rMaxIntegralTypeSize )
SAL_THROW_EXTERN_C();
-extern "C" void SAL_CALL typelib_typedescription_newEmpty(
+extern "C" void typelib_typedescription_newEmpty(
typelib_TypeDescription ** ppRet,
typelib_TypeClass eTypeClass,
rtl_uString * pTypeName )
SAL_THROW_EXTERN_C();
-extern "C" void SAL_CALL typelib_typedescriptionreference_getByName(
+extern "C" void typelib_typedescriptionreference_getByName(
typelib_TypeDescriptionReference ** ppRet,
rtl_uString const * pName )
SAL_THROW_EXTERN_C();
diff --git a/cppu/source/uno/IdentityMapping.cxx b/cppu/source/uno/IdentityMapping.cxx
index 659c9cdc7385..36f0d15192c4 100644
--- a/cppu/source/uno/IdentityMapping.cxx
+++ b/cppu/source/uno/IdentityMapping.cxx
@@ -39,12 +39,12 @@ struct IdentityMapping : public uno_Mapping
extern "C"
{
-static void SAL_CALL s_free(uno_Mapping * pMapping)
+static void s_free(uno_Mapping * pMapping)
{
delete static_cast<IdentityMapping *>(pMapping);
}
-static void SAL_CALL s_acquire(uno_Mapping * pMapping)
+static void s_acquire(uno_Mapping * pMapping)
{
static rtl::OUString s_purpose;
@@ -59,13 +59,13 @@ static void SAL_CALL s_acquire(uno_Mapping * pMapping)
}
}
-static void SAL_CALL s_release(uno_Mapping * pMapping)
+static void s_release(uno_Mapping * pMapping)
{
if (!osl_atomic_decrement(&static_cast<IdentityMapping *>(pMapping )->m_nRef))
uno_revokeMapping(pMapping);
}
-static void SAL_CALL s_mapInterface(uno_Mapping * pMapping,
+static void s_mapInterface(uno_Mapping * pMapping,
void ** ppOut,
void * pInterface,
SAL_UNUSED_PARAMETER typelib_InterfaceTypeDescription * /*pInterfaceTypeDescr*/)
diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx
index 81ef313cfcf3..60a8704e8347 100644
--- a/cppu/source/uno/cascade_mapping.cxx
+++ b/cppu/source/uno/cascade_mapping.cxx
@@ -54,19 +54,19 @@ public:
};
extern "C" {
-static void SAL_CALL s_acquire(uno_Mapping * mapping)
+static void s_acquire(uno_Mapping * mapping)
{
MediatorMapping * pMediatorMapping = static_cast<MediatorMapping *>(mapping);
pMediatorMapping->acquire();
}
-static void SAL_CALL s_release(uno_Mapping * mapping)
+static void s_release(uno_Mapping * mapping)
{
MediatorMapping * pMediatorMapping = static_cast<MediatorMapping *>(mapping);
pMediatorMapping->release();
}
-static void SAL_CALL s_mapInterface(
+static void s_mapInterface(
uno_Mapping * mapping,
void ** ppOut,
void * pInterface,
@@ -144,7 +144,7 @@ void MediatorMapping::mapInterface(
*ppOut = ret;
}
-extern "C" { static void SAL_CALL s_MediatorMapping_free(uno_Mapping * pMapping)
+extern "C" { static void s_MediatorMapping_free(uno_Mapping * pMapping)
SAL_THROW_EXTERN_C()
{
delete static_cast<MediatorMapping *>(pMapping);
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 76bf88e6e002..8ca96dc0a7ae 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -226,7 +226,7 @@ extern "C"
{
-static void SAL_CALL defenv_registerInterface(
+static void defenv_registerInterface(
uno_ExtEnvironment * pEnv, void ** ppInterface,
rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
{
@@ -273,7 +273,7 @@ static void SAL_CALL defenv_registerInterface(
}
-static void SAL_CALL defenv_registerProxyInterface(
+static void defenv_registerProxyInterface(
uno_ExtEnvironment * pEnv, void ** ppInterface, uno_freeProxyFunc freeProxy,
rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
{
@@ -331,7 +331,7 @@ static void SAL_CALL defenv_registerProxyInterface(
}
-static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam)
+static void s_stub_defenv_revokeInterface(va_list * pParam)
{
uno_ExtEnvironment * pEnv = va_arg(*pParam, uno_ExtEnvironment *);
void * pInterface = va_arg(*pParam, void *);
@@ -418,13 +418,13 @@ static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam)
}
}
-static void SAL_CALL defenv_revokeInterface(uno_ExtEnvironment * pEnv, void * pInterface)
+static void defenv_revokeInterface(uno_ExtEnvironment * pEnv, void * pInterface)
{
uno_Environment_invoke(&pEnv->aBase, s_stub_defenv_revokeInterface, pEnv, pInterface);
}
-static void SAL_CALL defenv_getObjectIdentifier(
+static void defenv_getObjectIdentifier(
uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface )
{
OSL_ENSURE( pEnv && ppOId && pInterface, "### null ptr!" );
@@ -454,7 +454,7 @@ static void SAL_CALL defenv_getObjectIdentifier(
}
-static void SAL_CALL defenv_getRegisteredInterface(
+static void defenv_getRegisteredInterface(
uno_ExtEnvironment * pEnv, void ** ppInterface,
rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
{
@@ -484,7 +484,7 @@ static void SAL_CALL defenv_getRegisteredInterface(
}
-static void SAL_CALL defenv_getRegisteredInterfaces(
+static void defenv_getRegisteredInterfaces(
uno_ExtEnvironment * pEnv, void *** pppInterfaces, sal_Int32 * pnLen,
uno_memAlloc memAlloc )
{
@@ -510,7 +510,7 @@ static void SAL_CALL defenv_getRegisteredInterfaces(
}
-static void SAL_CALL defenv_acquire( uno_Environment * pEnv )
+static void defenv_acquire( uno_Environment * pEnv )
{
uno_DefaultEnvironment * that = reinterpret_cast<uno_DefaultEnvironment *>(pEnv);
osl_atomic_increment( &that->nWeakRef );
@@ -518,7 +518,7 @@ static void SAL_CALL defenv_acquire( uno_Environment * pEnv )
}
-static void SAL_CALL defenv_release( uno_Environment * pEnv )
+static void defenv_release( uno_Environment * pEnv )
{
uno_DefaultEnvironment * that = reinterpret_cast<uno_DefaultEnvironment *>(pEnv);
if (! osl_atomic_decrement( &that->nRef ))
@@ -539,14 +539,14 @@ static void SAL_CALL defenv_release( uno_Environment * pEnv )
}
-static void SAL_CALL defenv_acquireWeak( uno_Environment * pEnv )
+static void defenv_acquireWeak( uno_Environment * pEnv )
{
uno_DefaultEnvironment * that = reinterpret_cast<uno_DefaultEnvironment *>(pEnv);
osl_atomic_increment( &that->nWeakRef );
}
-static void SAL_CALL defenv_releaseWeak( uno_Environment * pEnv )
+static void defenv_releaseWeak( uno_Environment * pEnv )
{
uno_DefaultEnvironment * that = reinterpret_cast<uno_DefaultEnvironment *>(pEnv);
if (! osl_atomic_decrement( &that->nWeakRef ))
@@ -556,7 +556,7 @@ static void SAL_CALL defenv_releaseWeak( uno_Environment * pEnv )
}
-static void SAL_CALL defenv_harden(
+static void defenv_harden(
uno_Environment ** ppHardEnv, uno_Environment * pEnv )
{
if (*ppHardEnv)
@@ -584,7 +584,7 @@ static void SAL_CALL defenv_harden(
}
-static void SAL_CALL defenv_dispose( SAL_UNUSED_PARAMETER uno_Environment * )
+static void defenv_dispose( SAL_UNUSED_PARAMETER uno_Environment * )
{
}
}
@@ -837,7 +837,7 @@ extern "C"
{
-static void SAL_CALL unoenv_computeObjectIdentifier(
+static void unoenv_computeObjectIdentifier(
uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface )
{
assert(pEnv && ppOId && pInterface && "### null ptr!");
@@ -872,7 +872,7 @@ static void SAL_CALL unoenv_computeObjectIdentifier(
}
-static void SAL_CALL unoenv_acquireInterface(
+static void unoenv_acquireInterface(
SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pUnoI_ )
{
uno_Interface * pUnoI = static_cast< uno_Interface * >(pUnoI_);
@@ -880,7 +880,7 @@ static void SAL_CALL unoenv_acquireInterface(
}
-static void SAL_CALL unoenv_releaseInterface(
+static void unoenv_releaseInterface(
SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pUnoI_ )
{
uno_Interface * pUnoI = static_cast< uno_Interface * >(pUnoI_);
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 74e167eb336c..4c8aa60895ab 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -197,12 +197,12 @@ struct uno_Mediate_Mapping : public uno_Mapping
extern "C"
{
-static void SAL_CALL mediate_free( uno_Mapping * pMapping )
+static void mediate_free( uno_Mapping * pMapping )
{
delete static_cast< uno_Mediate_Mapping * >( pMapping );
}
-static void SAL_CALL mediate_acquire( uno_Mapping * pMapping )
+static void mediate_acquire( uno_Mapping * pMapping )
{
if (1 == osl_atomic_increment(
& static_cast< uno_Mediate_Mapping * >( pMapping )->nRef ))
@@ -215,7 +215,7 @@ static void SAL_CALL mediate_acquire( uno_Mapping * pMapping )
}
}
-static void SAL_CALL mediate_release( uno_Mapping * pMapping )
+static void mediate_release( uno_Mapping * pMapping )
{
if (! osl_atomic_decrement(
& static_cast< uno_Mediate_Mapping * >( pMapping )->nRef ))
@@ -224,7 +224,7 @@ static void SAL_CALL mediate_release( uno_Mapping * pMapping )
}
}
-static void SAL_CALL mediate_mapInterface(
+static void mediate_mapInterface(
uno_Mapping * pMapping,
void ** ppOut, void * pInterface,
typelib_InterfaceTypeDescription * pInterfaceTypeDescr )
diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index 4e39ae6c8b5a..9b0a060ef26b 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -65,12 +65,12 @@ extern "C"
{
-void SAL_CALL ExceptionThrower_acquire_release_nop(
+void ExceptionThrower_acquire_release_nop(
SAL_UNUSED_PARAMETER uno_Interface * )
{}
-void SAL_CALL ExceptionThrower_dispatch(
+void ExceptionThrower_dispatch(
uno_Interface * pUnoI, typelib_TypeDescription const * pMemberType,
void * pReturn, void * pArgs [], uno_Any ** ppException )
{
diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx
index d01f61983a91..a3ee6708ca17 100644
--- a/cppuhelper/source/implbase_ex.cxx
+++ b/cppuhelper/source/implbase_ex.cxx
@@ -47,7 +47,7 @@ namespace cppu
/** Shared mutex for implementation helper initialization.
Not for public use.
*/
-::osl::Mutex & SAL_CALL getImplHelperInitMutex()
+::osl::Mutex & getImplHelperInitMutex()
{
return theImplHelperInitMutex::get();
}
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index c0b2cda55fee..01971f695c03 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -167,7 +167,7 @@ OUString Bootstrap_MacroExpander::expandMacros( OUString const & exp )
}
-Reference< XInterface > SAL_CALL service_create(
+Reference< XInterface > service_create(
SAL_UNUSED_PARAMETER Reference< XComponentContext > const & )
{
return static_cast< ::cppu::OWeakObject * >( new Bootstrap_MacroExpander );
diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx
index 9838841403c1..2f7a749058bd 100644
--- a/cppuhelper/source/servicemanager.hxx
+++ b/cppuhelper/source/servicemanager.hxx
@@ -45,7 +45,7 @@ namespace cppuhelper {
extern "C" {
-typedef css::uno::XInterface * SAL_CALL ImplementationConstructorFn(
+typedef css::uno::XInterface * ImplementationConstructorFn(
css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &);
}
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index f86dca136753..6a1ca23740b0 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -564,7 +564,7 @@ static typelib_TypeDescription * createCTD(
extern "C"
{
-static void SAL_CALL typelib_callback(
+static void typelib_callback(
void * pContext, typelib_TypeDescription ** ppRet, rtl_uString * pTypeName )
{
OSL_ENSURE( pContext && ppRet && pTypeName, "### null ptr!" );
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 2d9d0c4e53ed..8431201742fd 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1406,17 +1406,17 @@ private:
Reference<css::awt::XWindow> mxParent;
};
-OUString SAL_CALL ColorPicker_getImplementationName()
+OUString ColorPicker_getImplementationName()
{
return OUString( "com.sun.star.cui.ColorPicker" );
}
-Reference< XInterface > SAL_CALL ColorPicker_createInstance( Reference< XComponentContext > const & )
+Reference< XInterface > ColorPicker_createInstance( Reference< XComponentContext > const & )
{
return static_cast<XWeak*>( new ColorPicker );
}
-Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames()
+Sequence< OUString > ColorPicker_getSupportedServiceNames()
{
Sequence< OUString > seq { "com.sun.star.ui.dialogs.ColorPicker" };
return seq;
diff --git a/cui/source/inc/colorpicker.hxx b/cui/source/inc/colorpicker.hxx
index b2b24ba0d7c0..53f0fa611142 100644
--- a/cui/source/inc/colorpicker.hxx
+++ b/cui/source/inc/colorpicker.hxx
@@ -36,13 +36,13 @@ namespace com { namespace sun { namespace star { namespace uno {
namespace cui {
-OUString SAL_CALL ColorPicker_getImplementationName();
+OUString ColorPicker_getImplementationName();
-css::uno::Reference<css::uno::XInterface> SAL_CALL ColorPicker_createInstance(
+css::uno::Reference<css::uno::XInterface> ColorPicker_createInstance(
css::uno::Reference<css::uno::XComponentContext> const &);
/// @throws css::uno::RuntimeException
-css::uno::Sequence<OUString> SAL_CALL ColorPicker_getSupportedServiceNames();
+css::uno::Sequence<OUString> ColorPicker_getSupportedServiceNames();
}
#endif
diff --git a/cui/source/uno/services.cxx b/cui/source/uno/services.cxx
index 34799d37bf8d..af06b9d07659 100644
--- a/cui/source/uno/services.cxx
+++ b/cui/source/uno/services.cxx
@@ -34,7 +34,7 @@ namespace
};
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL cui_component_getFactory( char const * implName, void * serviceManager, void * registryKey)
+extern "C" SAL_DLLPUBLIC_EXPORT void * cui_component_getFactory( char const * implName, void * serviceManager, void * registryKey)
{
return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries);
}
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index db702ab5b268..4ac176e343e4 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -94,7 +94,7 @@ using namespace ::com::sun::star::util;
using namespace ::cppu;
using namespace ::osl;
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_dba_ORowSet_get_implementation(css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index dc76bfa4b39b..f3ed8e73e388 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -267,7 +267,7 @@ void OComponentDefinition::columnAppended( const Reference< XPropertySet >& _rxS
} // namespace dbaccess
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_dba_OComponentDefinition(css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 6f78cfd4fe64..44d2011a83e2 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -122,7 +122,7 @@ void SAL_CALL OCommandDefinition::rename( const OUString& newName )
} // namespace dbaccess
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_dba_OCommandDefinition(css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index f148e24c3ea0..9c652ceec9d1 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
@@ -253,7 +253,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_dba_DataAccessDescriptorFactory(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index aa0c22f1d87c..e5c34a8f53e7 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -2175,7 +2175,7 @@ OUString SAL_CALL ODatabaseDocument::getUntitledPrefix()
} // namespace dbaccess
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_dba_ODatabaseDocument(css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 258a93ae1548..059a8f67a410 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -1311,7 +1311,7 @@ Reference< XInterface > ODatabaseSource::getThis() const
} // namespace dbaccess
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_dba_ODatabaseSource(css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx
index 6ba082d811a0..e1b3b5bef241 100644
--- a/dbaccess/source/core/misc/services.cxx
+++ b/dbaccess/source/core/misc/services.cxx
@@ -48,7 +48,7 @@ namespace dba{
};
}
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dba_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* dba_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* pRegistryKey)
diff --git a/dbaccess/source/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx
index 1ced4c105042..2482e70722ce 100644
--- a/dbaccess/source/ext/macromigration/dbmm_services.cxx
+++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx
@@ -20,7 +20,7 @@
#include <cppuhelper/factory.hxx>
#include "macromigrationwizard.hxx"
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbmm_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* dbmm_component_getFactory(
const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*,
SAL_UNUSED_PARAMETER void* )
{
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index e43e45c34919..d7c8f18af9f6 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -215,7 +215,7 @@ Sequence< OUString > DBTypeDetection::getSupportedServiceNames_Static() throw(
} // namespace dbaxml
-extern "C" void SAL_CALL createRegistryInfo_DBTypeDetection()
+extern "C" void createRegistryInfo_DBTypeDetection()
{
static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::DBTypeDetection > aAutoRegistration;
}
@@ -571,7 +571,7 @@ IMPL_LINK_NOARG( DBContentLoader, OnStartTableWizard, void*, void )
}
-extern "C" void SAL_CALL createRegistryInfo_DBContentLoader2()
+extern "C" void createRegistryInfo_DBContentLoader2()
{
static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::DBContentLoader > aAutoRegistration;
}
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index f0df68fe23f0..1dbd082cd983 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -85,18 +85,18 @@ namespace dbaxml
};
}
-extern "C" void SAL_CALL createRegistryInfo_ODBFilterExport( )
+extern "C" void createRegistryInfo_ODBFilterExport( )
{
static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBExport > aAutoRegistration;
}
-extern "C" void SAL_CALL createRegistryInfo_OSettingsExport( )
+extern "C" void createRegistryInfo_OSettingsExport( )
{
static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBExportHelper > aAutoRegistration;
}
-extern "C" void SAL_CALL createRegistryInfo_OFullExport( )
+extern "C" void createRegistryInfo_OFullExport( )
{
static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBFullExportHelper > aAutoRegistration;
}
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 64521cf1be35..f3980dcdb810 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -65,7 +65,7 @@
using namespace ::com::sun::star;
-extern "C" void SAL_CALL createRegistryInfo_ODBFilter( )
+extern "C" void createRegistryInfo_ODBFilter( )
{
static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBFilter > aAutoRegistration;
}
diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx
index 329c2fbb3d8b..7e5051234889 100644
--- a/dbaccess/source/filter/xml/xmlservices.cxx
+++ b/dbaccess/source/filter/xml/xmlservices.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
-extern "C" void SAL_CALL createRegistryInfo_dbaxml()
+extern "C" void createRegistryInfo_dbaxml()
{
static bool bInit = false;
if (!bInit)
@@ -41,7 +41,7 @@ extern "C" void SAL_CALL createRegistryInfo_dbaxml()
}
}
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbaxml_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* dbaxml_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/dbaccess/source/filter/xml/xmlservices.hxx b/dbaccess/source/filter/xml/xmlservices.hxx
index 8176d8c0fb9b..66c8aa53cc74 100644
--- a/dbaccess/source/filter/xml/xmlservices.hxx
+++ b/dbaccess/source/filter/xml/xmlservices.hxx
@@ -26,12 +26,12 @@
extern "C" {
-void SAL_CALL createRegistryInfo_DBContentLoader2();
-void SAL_CALL createRegistryInfo_DBTypeDetection();
-void SAL_CALL createRegistryInfo_ODBFilter();
-void SAL_CALL createRegistryInfo_ODBFilterExport();
-void SAL_CALL createRegistryInfo_OFullExport();
-void SAL_CALL createRegistryInfo_OSettingsExport();
+void createRegistryInfo_DBContentLoader2();
+void createRegistryInfo_DBTypeDetection();
+void createRegistryInfo_ODBFilter();
+void createRegistryInfo_ODBFilterExport();
+void createRegistryInfo_OFullExport();
+void createRegistryInfo_OSettingsExport();
}
diff --git a/dbaccess/source/inc/registrationhelper.hxx b/dbaccess/source/inc/registrationhelper.hxx
index fea7e3c21174..3cb4ce5b1521 100644
--- a/dbaccess/source/inc/registrationhelper.hxx
+++ b/dbaccess/source/inc/registrationhelper.hxx
@@ -21,7 +21,7 @@
#error "don't include this file directly! use dbu_reghelper.hxx instead!"
#endif
-typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation)
+typedef css::uno::Reference< css::lang::XSingleServiceFactory > (*FactoryInstantiation)
(
const css::uno::Reference< css::lang::XMultiServiceFactory >& _rServiceManager,
const OUString & _rComponentName,
diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
index 1e594ed958dd..40943501bf4d 100644
--- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx
+++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
@@ -23,7 +23,7 @@
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbt_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* sdbt_component_getFactory(
const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, SAL_UNUSED_PARAMETER void*)
{
Reference< XInterface > xRet;
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 951664a736d6..e181050ece55 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -125,7 +125,7 @@
#include <functional>
-extern "C" void SAL_CALL createRegistryInfo_ODBApplication()
+extern "C" void createRegistryInfo_ODBApplication()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OApplicationController > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index e390af10f487..e4ce425cc3d0 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -101,7 +101,7 @@ DBContentLoader::DBContentLoader(const Reference< XComponentContext >& _rxContex
}
-extern "C" void SAL_CALL createRegistryInfo_DBContentLoader()
+extern "C" void createRegistryInfo_DBContentLoader()
{
static ::dbaui::OMultiInstanceAutoRegistration< DBContentLoader > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx
index 93ce18f1972c..2064f344e5cf 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::frame;
using namespace dbaui;
// SbaExternalSourceBrowser
-extern "C" void SAL_CALL createRegistryInfo_OFormGridView()
+extern "C" void createRegistryInfo_OFormGridView()
{
static OMultiInstanceAutoRegistration< SbaExternalSourceBrowser > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 31939a46c5d1..2b534bc1cafa 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -105,7 +105,7 @@ using namespace ::dbtools;
using namespace ::svx;
using namespace ::svt;
-extern "C" void SAL_CALL createRegistryInfo_SbaXGridControl()
+extern "C" void createRegistryInfo_SbaXGridControl()
{
static OMultiInstanceAutoRegistration< SbaXGridControl > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index bae1e73070c5..a82590aeefe6 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -155,7 +155,7 @@ using namespace ::comphelper;
using namespace ::svx;
// SbaTableQueryBrowser
-extern "C" void SAL_CALL createRegistryInfo_OBrowser()
+extern "C" void createRegistryInfo_OBrowser()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::SbaTableQueryBrowser > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/inc/uiservices.hxx b/dbaccess/source/ui/inc/uiservices.hxx
index 4a2f7d1b062a..3bc1d53bf218 100644
--- a/dbaccess/source/ui/inc/uiservices.hxx
+++ b/dbaccess/source/ui/inc/uiservices.hxx
@@ -26,30 +26,30 @@
extern "C" {
-void SAL_CALL createRegistryInfo_ComposerDialogs();
-void SAL_CALL createRegistryInfo_CopyTableWizard();
-void SAL_CALL createRegistryInfo_DBContentLoader();
-void SAL_CALL createRegistryInfo_LimitBoxController();
-void SAL_CALL createRegistryInfo_OAdvancedSettingsDialog();
-void SAL_CALL createRegistryInfo_OBrowser();
-void SAL_CALL createRegistryInfo_OColumnControl();
-void SAL_CALL createRegistryInfo_OColumnControlModel();
-void SAL_CALL createRegistryInfo_ODBApplication();
-void SAL_CALL createRegistryInfo_ODBTypeWizDialog();
-void SAL_CALL createRegistryInfo_ODBTypeWizDialogSetup();
-void SAL_CALL createRegistryInfo_ODataSourcePropertyDialog();
-void SAL_CALL createRegistryInfo_ODirectSQLDialog();
-void SAL_CALL createRegistryInfo_OFormGridView();
-void SAL_CALL createRegistryInfo_OInteractionHandler();
-void SAL_CALL createRegistryInfo_OQueryControl();
-void SAL_CALL createRegistryInfo_ORelationControl();
-void SAL_CALL createRegistryInfo_OSQLMessageDialog();
-void SAL_CALL createRegistryInfo_OTableControl();
-void SAL_CALL createRegistryInfo_OTableFilterDialog();
-void SAL_CALL createRegistryInfo_OTextConnectionSettingsDialog();
-void SAL_CALL createRegistryInfo_OUserSettingsDialog();
-void SAL_CALL createRegistryInfo_OViewControl();
-void SAL_CALL createRegistryInfo_SbaXGridControl();
+void createRegistryInfo_ComposerDialogs();
+void createRegistryInfo_CopyTableWizard();
+void createRegistryInfo_DBContentLoader();
+void createRegistryInfo_LimitBoxController();
+void createRegistryInfo_OAdvancedSettingsDialog();
+void createRegistryInfo_OBrowser();
+void createRegistryInfo_OColumnControl();
+void createRegistryInfo_OColumnControlModel();
+void createRegistryInfo_ODBApplication();
+void createRegistryInfo_ODBTypeWizDialog();
+void createRegistryInfo_ODBTypeWizDialogSetup();
+void createRegistryInfo_ODataSourcePropertyDialog();
+void createRegistryInfo_ODirectSQLDialog();
+void createRegistryInfo_OFormGridView();
+void createRegistryInfo_OInteractionHandler();
+void createRegistryInfo_OQueryControl();
+void createRegistryInfo_ORelationControl();
+void createRegistryInfo_OSQLMessageDialog();
+void createRegistryInfo_OTableControl();
+void createRegistryInfo_OTableFilterDialog();
+void createRegistryInfo_OTextConnectionSettingsDialog();
+void createRegistryInfo_OUserSettingsDialog();
+void createRegistryInfo_OViewControl();
+void createRegistryInfo_SbaXGridControl();
}
diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx
index aabb6cfd9e6c..26eec900d1fd 100644
--- a/dbaccess/source/ui/misc/uiservices.cxx
+++ b/dbaccess/source/ui/misc/uiservices.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
-extern "C" void SAL_CALL createRegistryInfo_DBU()
+extern "C" void createRegistryInfo_DBU()
{
static bool bInit = false;
if (!bInit)
@@ -59,7 +59,7 @@ extern "C" void SAL_CALL createRegistryInfo_DBU()
}
}
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbu_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* dbu_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 51c2d2912b91..d2bfb7348d50 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -218,7 +218,7 @@ void LimitBoxController::dispatchCommand(
} ///dbaui namespace
-extern "C" void SAL_CALL createRegistryInfo_LimitBoxController()
+extern "C" void createRegistryInfo_LimitBoxController()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::LimitBoxController > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index ea6e5777297f..4a4dc1f41436 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -85,7 +85,7 @@
#include <memory>
#include <vector>
-extern "C" void SAL_CALL createRegistryInfo_OQueryControl()
+extern "C" void createRegistryInfo_OQueryControl()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OQueryController > aAutoRegistration;
}
@@ -131,7 +131,7 @@ namespace dbaui
};
}
-extern "C" void SAL_CALL createRegistryInfo_OViewControl()
+extern "C" void createRegistryInfo_OViewControl()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OViewController > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 5bddac211f29..233ee361c776 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -72,7 +72,7 @@
#define MAX_THREADS 10
-extern "C" void SAL_CALL createRegistryInfo_ORelationControl()
+extern "C" void createRegistryInfo_ORelationControl()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::ORelationController > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index a1a2ff009904..772bcb8bc27a 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -69,7 +69,7 @@
#include <algorithm>
#include <functional>
-extern "C" void SAL_CALL createRegistryInfo_OTableControl()
+extern "C" void createRegistryInfo_OTableControl()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OTableController > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index 935f6f6e0119..f82b414af681 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -127,7 +127,7 @@ namespace dbaui
} // namespace dbaui
-extern "C" void SAL_CALL createRegistryInfo_OAdvancedSettingsDialog()
+extern "C" void createRegistryInfo_OAdvancedSettingsDialog()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OAdvancedSettingsDialog > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx
index e8006243ee64..720f0e40075c 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -26,7 +26,7 @@
#include <dbu_reghelper.hxx>
#include <comphelper/processfactory.hxx>
-extern "C" void SAL_CALL createRegistryInfo_OColumnControl()
+extern "C" void createRegistryInfo_OColumnControl()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OColumnControl> aAutoRegistration;
}
diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx
index cd249c4e1f01..389bf3e1e6da 100644
--- a/dbaccess/source/ui/uno/ColumnModel.cxx
+++ b/dbaccess/source/ui/uno/ColumnModel.cxx
@@ -30,7 +30,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/property.hxx>
-extern "C" void SAL_CALL createRegistryInfo_OColumnControlModel()
+extern "C" void createRegistryInfo_OColumnControlModel()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OColumnControlModel> aAutoRegistration;
}
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
index 6196d45154d9..355708d80624 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
@@ -25,7 +25,7 @@
using namespace dbaui;
-extern "C" void SAL_CALL createRegistryInfo_ODBTypeWizDialog()
+extern "C" void createRegistryInfo_ODBTypeWizDialog()
{
static OMultiInstanceAutoRegistration< ODBTypeWizDialog > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
index 33d58789da88..d13cb0827cf7 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
@@ -30,7 +30,7 @@
using namespace dbaui;
-extern "C" void SAL_CALL createRegistryInfo_ODBTypeWizDialogSetup()
+extern "C" void createRegistryInfo_ODBTypeWizDialogSetup()
{
static OMultiInstanceAutoRegistration< ODBTypeWizDialogSetup > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx
index 876f5106228d..c5420fa10a49 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.cxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx
@@ -25,7 +25,7 @@
using namespace dbaui;
-extern "C" void SAL_CALL createRegistryInfo_OTableFilterDialog()
+extern "C" void createRegistryInfo_OTableFilterDialog()
{
static OMultiInstanceAutoRegistration< OTableFilterDialog > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
index ffd199a77a1a..e340956961bb 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
@@ -25,7 +25,7 @@
using namespace dbaui;
-extern "C" void SAL_CALL createRegistryInfo_OUserSettingsDialog()
+extern "C" void createRegistryInfo_OUserSettingsDialog()
{
static OMultiInstanceAutoRegistration< OUserSettingsDialog > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx
index b126b2942332..530cd12f7b81 100644
--- a/dbaccess/source/ui/uno/admindlg.cxx
+++ b/dbaccess/source/ui/uno/admindlg.cxx
@@ -25,7 +25,7 @@
using namespace dbaui;
-extern "C" void SAL_CALL createRegistryInfo_ODataSourcePropertyDialog()
+extern "C" void createRegistryInfo_ODataSourcePropertyDialog()
{
static OMultiInstanceAutoRegistration< ODataSourcePropertyDialog > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index f6f059220613..5b2aa150563b 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -30,7 +30,7 @@
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
-extern "C" void SAL_CALL createRegistryInfo_ComposerDialogs()
+extern "C" void createRegistryInfo_ComposerDialogs()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::RowsetOrderDialog > aOrderDialogRegistration;
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::RowsetFilterDialog > aFilterDialogRegistration;
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index a1b141a919ba..43abd33ce95b 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1549,7 +1549,7 @@ void CopyTableWizard::executedDialog( sal_Int16 _nExecutionResult )
} // namespace dbaui
-extern "C" void SAL_CALL createRegistryInfo_CopyTableWizard()
+extern "C" void createRegistryInfo_CopyTableWizard()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::CopyTableWizard > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx
index 639966a713a3..b6371ad59eb8 100644
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@@ -40,7 +40,7 @@
#include <UITools.hxx>
#include <comphelper/processfactory.hxx>
-extern "C" void SAL_CALL createRegistryInfo_OInteractionHandler()
+extern "C" void createRegistryInfo_OInteractionHandler()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::SQLExceptionInteractionHandler > aSQLExceptionInteractionHandler_AutoRegistration;
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::LegacyInteractionHandler > aLegacyInteractionHandler_AutoRegistration;
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 849c66ae9a37..4c4034334b0f 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -255,7 +255,7 @@ namespace dbaui
} // namespace dbaui
-extern "C" void SAL_CALL createRegistryInfo_OTextConnectionSettingsDialog()
+extern "C" void createRegistryInfo_OTextConnectionSettingsDialog()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OTextConnectionSettingsDialog > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx
index 003a8eece5bb..5f7163dc7d88 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.cxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.cxx
@@ -32,7 +32,7 @@
#include <tools/diagnose_ex.h>
#include <comphelper/processfactory.hxx>
-extern "C" void SAL_CALL createRegistryInfo_ODirectSQLDialog()
+extern "C" void createRegistryInfo_ODirectSQLDialog()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::ODirectSQLDialog > aAutoRegistration;
}
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx
index 1f20c8baabe3..8b01455fdd11 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -34,7 +34,7 @@ using namespace dbtools;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdb;
-extern "C" void SAL_CALL createRegistryInfo_OSQLMessageDialog()
+extern "C" void createRegistryInfo_OSQLMessageDialog()
{
static OMultiInstanceAutoRegistration< OSQLMessageDialog > aAutoRegistration;
}
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 5b60248f6a7a..afcdba68629f 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -298,7 +298,7 @@ void ImplPostProcessDocumentsEvent( ProcessDocumentsRequest* pEvent )
Application::PostUserEvent( LINK( nullptr, ProcessEventsClass_Impl, ProcessDocumentsEvent ), pEvent );
}
-oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(SAL_UNUSED_PARAMETER void* /*pData*/, oslSignalInfo* pInfo)
+oslSignalAction SalMainPipeExchangeSignal_impl(SAL_UNUSED_PARAMETER void* /*pData*/, oslSignalInfo* pInfo)
{
if( pInfo->Signal == osl_Signal_Terminate )
RequestHandler::SetDowning();
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index 4450e98aebdb..4634aef87590 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -39,7 +39,7 @@
namespace desktop
{
-oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSignalInfo* pInfo);
+oslSignalAction SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSignalInfo* pInfo);
// A request for the current office
// that was given by command line or by IPC pipe communication.
diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx
index 18c2f882c721..ba642fdbff10 100644
--- a/desktop/source/deployment/dp_services.cxx
+++ b/desktop/source/deployment/dp_services.cxx
@@ -27,7 +27,7 @@ namespace sdecl = comphelper::service_decl;
extern "C" {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL deployment_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * deployment_component_getFactory(
sal_Char const * pImplName, void *, void *)
{
return sdecl::component_getFactoryHelper(
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 489a0dd8497f..c3d7638c00fa 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -315,7 +315,7 @@ sdecl::ServiceDecl const updateDecl(
extern "C" {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL deploymentgui_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * deploymentgui_component_getFactory(
sal_Char const * pImplName, void *, void *)
{
return sdecl::component_getFactoryHelper(
diff --git a/desktop/source/deployment/inc/dp_registry.hxx b/desktop/source/deployment/inc/dp_registry.hxx
index 7a3eda34f08a..43746ddfc642 100644
--- a/desktop/source/deployment/inc/dp_registry.hxx
+++ b/desktop/source/deployment/inc/dp_registry.hxx
@@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star {
namespace dp_registry {
-css::uno::Reference<css::deployment::XPackageRegistry> SAL_CALL create(
+css::uno::Reference<css::deployment::XPackageRegistry> create(
OUString const & context, OUString const & cachePath,
css::uno::Reference<css::uno::XComponentContext> const & xComponentContext);
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index a14b0fe6bbf2..09180c066a83 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -528,7 +528,7 @@ PackageRegistryImpl::getSupportedPackageTypes()
} // anon namespace
-Reference<deployment::XPackageRegistry> SAL_CALL create(
+Reference<deployment::XPackageRegistry> create(
OUString const & context,
OUString const & cachePath,
Reference<XComponentContext> const & xComponentContext )
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index dc0c47d0be05..1b407adba228 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -208,7 +208,7 @@ namespace migration
// component operations
- Reference< XInterface > SAL_CALL BasicMigration_create(
+ Reference< XInterface > BasicMigration_create(
Reference< XComponentContext > const & )
{
return static_cast< lang::XTypeProvider * >( new BasicMigration() );
diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx
index d2d18463b297..8a0c45f664e1 100644
--- a/desktop/source/migration/services/basicmigration.hxx
+++ b/desktop/source/migration/services/basicmigration.hxx
@@ -37,9 +37,9 @@ namespace migration
{
- OUString SAL_CALL BasicMigration_getImplementationName();
- css::uno::Sequence< OUString > SAL_CALL BasicMigration_getSupportedServiceNames();
- css::uno::Reference< css::uno::XInterface > SAL_CALL BasicMigration_create(
+ OUString BasicMigration_getImplementationName();
+ css::uno::Sequence< OUString > BasicMigration_getSupportedServiceNames();
+ css::uno::Reference< css::uno::XInterface > BasicMigration_create(
css::uno::Reference< css::uno::XComponentContext > const & xContext );
diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx
index 9877705130c4..a56f0dae9458 100644
--- a/desktop/source/migration/services/cexports.cxx
+++ b/desktop/source/migration/services/cexports.cxx
@@ -50,7 +50,7 @@ extern "C"
};
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL migrationoo2_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * migrationoo2_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return ::cppu::component_getFactoryHelper(
diff --git a/desktop/source/migration/services/cexportsoo3.cxx b/desktop/source/migration/services/cexportsoo3.cxx
index eecb5ee929dc..a53884760d0b 100644
--- a/desktop/source/migration/services/cexportsoo3.cxx
+++ b/desktop/source/migration/services/cexportsoo3.cxx
@@ -35,7 +35,7 @@ extern "C"
};
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL migrationoo3_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * migrationoo3_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return ::cppu::component_getFactoryHelper(
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index b8672ee44c7d..4510c93d2831 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -429,7 +429,7 @@ void TmpRepositoryCommandEnv::pop()
// component operations
-Reference< XInterface > SAL_CALL OO3ExtensionMigration_create(
+Reference< XInterface > OO3ExtensionMigration_create(
Reference< XComponentContext > const & ctx )
{
return static_cast< lang::XTypeProvider * >( new OO3ExtensionMigration(
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index c237f54020d3..62eb936dccdb 100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -46,9 +46,9 @@ class INetURLObject;
namespace migration
{
- OUString SAL_CALL OO3ExtensionMigration_getImplementationName();
- css::uno::Sequence< OUString > SAL_CALL OO3ExtensionMigration_getSupportedServiceNames();
- css::uno::Reference< css::uno::XInterface > SAL_CALL OO3ExtensionMigration_create(
+ OUString OO3ExtensionMigration_getImplementationName();
+ css::uno::Sequence< OUString > OO3ExtensionMigration_getSupportedServiceNames();
+ css::uno::Reference< css::uno::XInterface > OO3ExtensionMigration_create(
css::uno::Reference< css::uno::XComponentContext > const & xContext );
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 1830c65a362c..ab2264e4d683 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -242,7 +242,7 @@ bool IsUserWordbook( const OUString& rFile )
// component operations
- Reference< XInterface > SAL_CALL WordbookMigration_create(
+ Reference< XInterface > WordbookMigration_create(
Reference< XComponentContext > const & )
{
return static_cast< lang::XTypeProvider * >( new WordbookMigration() );
diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx
index 4fd535b1738b..81a60f7ee3c8 100644
--- a/desktop/source/migration/services/wordbookmigration.hxx
+++ b/desktop/source/migration/services/wordbookmigration.hxx
@@ -37,9 +37,9 @@ namespace migration
{
- OUString SAL_CALL WordbookMigration_getImplementationName();
- css::uno::Sequence< OUString > SAL_CALL WordbookMigration_getSupportedServiceNames();
- css::uno::Reference< css::uno::XInterface > SAL_CALL WordbookMigration_create(
+ OUString WordbookMigration_getImplementationName();
+ css::uno::Sequence< OUString > WordbookMigration_getSupportedServiceNames();
+ css::uno::Reference< css::uno::XInterface > WordbookMigration_create(
css::uno::Reference< css::uno::XComponentContext > const & xContext );
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 80c9a7cc722a..6244b79e2c4e 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -259,7 +259,7 @@ extern "C"
{
using namespace desktop;
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL offacc_component_getFactory(char const *pImplementationName, void *pServiceManager, void *)
+SAL_DLLPUBLIC_EXPORT void * offacc_component_getFactory(char const *pImplementationName, void *pServiceManager, void *)
{
void* pReturn = nullptr ;
if ( pImplementationName && pServiceManager )
diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx
index 7993b09f56eb..dfa8728fd0d3 100644
--- a/desktop/source/splash/services_spl.cxx
+++ b/desktop/source/splash/services_spl.cxx
@@ -46,7 +46,7 @@ static cppu::ImplementationEntry const services[] = {
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL spl_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * spl_component_getFactory(
char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper(
diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx
index 813e17248a12..1561308dbb90 100644
--- a/desktop/source/splash/splash.hxx
+++ b/desktop/source/splash/splash.hxx
@@ -35,12 +35,12 @@ namespace com { namespace sun { namespace star {
namespace desktop { namespace splash {
-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/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx
index faf4233a9bef..d4ca29fd1be4 100644
--- a/desktop/source/splash/unxsplash.hxx
+++ b/desktop/source/splash/unxsplash.hxx
@@ -65,9 +65,9 @@ public:
}
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL UnxSplash_createInstance(const css::uno::Reference< css::uno::XComponentContext > & xCtx );
+css::uno::Reference< css::uno::XInterface > UnxSplash_createInstance(const css::uno::Reference< css::uno::XComponentContext > & xCtx );
OUString UnxSplash_getImplementationName();
-css::uno::Sequence< OUString > SAL_CALL UnxSplash_getSupportedServiceNames() throw ();
+css::uno::Sequence< OUString > UnxSplash_getSupportedServiceNames() throw ();
#endif // INCLUDED_DESKTOP_SOURCE_SPLASH_UNXSPLASH_HXX
diff --git a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx b/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx
index d78eac190e1a..d6c1023c10ba 100644
--- a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx
+++ b/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star;
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void* SAL_CALL drawinglayer_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+ SAL_DLLPUBLIC_EXPORT void* drawinglayer_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
{
uno::Reference< lang::XSingleServiceFactory > xFactory;
void* pRet = nullptr;
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index 6549bb070f2e..85788ad978b3 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -91,7 +91,7 @@ namespace drawinglayer
return OUString( "drawinglayer::unorenderer::XPrimitive2DRenderer" );
}
- uno::Reference< uno::XInterface > SAL_CALL XPrimitive2DRenderer_createInstance(const uno::Reference< lang::XMultiServiceFactory >&)
+ uno::Reference< uno::XInterface > XPrimitive2DRenderer_createInstance(const uno::Reference< lang::XMultiServiceFactory >&)
{
return static_cast< ::cppu::OWeakObject* >(new XPrimitive2DRenderer);
}
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx
index 58584f61486e..935d5fcc2581 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx
@@ -34,12 +34,12 @@ namespace com { namespace sun { namespace star {
namespace drawinglayer { namespace unorenderer {
-css::uno::Sequence<OUString> SAL_CALL
+css::uno::Sequence<OUString>
XPrimitive2DRenderer_getSupportedServiceNames();
-OUString SAL_CALL XPrimitive2DRenderer_getImplementationName();
+OUString XPrimitive2DRenderer_getImplementationName();
-css::uno::Reference<css::uno::XInterface> SAL_CALL
+css::uno::Reference<css::uno::XInterface>
XPrimitive2DRenderer_createInstance(
css::uno::Reference<css::lang::XMultiServiceFactory> const &);
diff --git a/dtrans/source/cnttype/mcnttfactory.cxx b/dtrans/source/cnttype/mcnttfactory.cxx
index eddb3fc2cd83..c4069d6798ae 100644
--- a/dtrans/source/cnttype/mcnttfactory.cxx
+++ b/dtrans/source/cnttype/mcnttfactory.cxx
@@ -31,7 +31,7 @@ using namespace com::sun::star::datatransfer;
namespace
{
- Sequence< OUString > SAL_CALL MimeContentTypeFactory_getSupportedServiceNames( )
+ Sequence< OUString > MimeContentTypeFactory_getSupportedServiceNames( )
{
Sequence< OUString > aRet { "com.sun.star.datatransfer.MimeContentTypeFactory" };
return aRet;
diff --git a/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx
index 2f77baab7031..7c9e39b93a67 100644
--- a/dtrans/source/cnttype/mctfentry.cxx
+++ b/dtrans/source/cnttype/mctfentry.cxx
@@ -37,7 +37,7 @@ namespace
// @param rServiceManager - service manager, useful if the component needs other uno services
// so we should give it to every UNO-Implementation component
- Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& )
+ Reference< XInterface > createInstance( const Reference< XMultiServiceFactory >& )
{
return Reference< XInterface >( static_cast< XMimeContentTypeFactory* >( new CMimeContentTypeFactory() ) );
}
@@ -49,7 +49,7 @@ extern "C"
// component_getFactory
// returns a factory to create XFilePicker-Services
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL mcnttype_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* mcnttype_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
{
void* pRet = nullptr;
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 0f439e9a4f9e..1d76f285edf6 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -902,7 +902,7 @@ sal_Bool SAL_CALL SvxUnoTextField::supportsService( const OUString& ServiceName
return cppu::supportsService( this, ServiceName );
}
-uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const OUString& ServiceSpecifier )
+uno::Reference< uno::XInterface > SvxUnoTextCreateTextField( const OUString& ServiceSpecifier )
{
uno::Reference< uno::XInterface > xRet;
diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx
index 25da0944e68c..ec29cad223d7 100644
--- a/embeddedobj/source/commonembedding/register.cxx
+++ b/embeddedobj/source/commonembedding/register.cxx
@@ -29,7 +29,7 @@ using namespace ::com::sun::star;
extern "C" {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL embobj_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * embobj_component_getFactory(
const sal_Char * pImplName, void * pServiceManager,
SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ )
{
diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx
index 5d01379c7870..0c655496a1b9 100644
--- a/embeddedobj/source/msole/oleregister.cxx
+++ b/embeddedobj/source/msole/oleregister.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star;
extern "C" {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL emboleobj_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * emboleobj_component_getFactory(
const sal_Char * pImplName, void * pServiceManager,
SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ )
{
diff --git a/emfio/source/emfuno/emfuno.cxx b/emfio/source/emfuno/emfuno.cxx
index b027c5fe3cc2..1bf9e098d414 100644
--- a/emfio/source/emfuno/emfuno.cxx
+++ b/emfio/source/emfuno/emfuno.cxx
@@ -36,7 +36,7 @@ static cppu::ImplementationEntry const services[] = {
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL emfio_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * emfio_component_getFactory(
char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper(
diff --git a/emfio/source/emfuno/xemfparser.cxx b/emfio/source/emfuno/xemfparser.cxx
index 63b88811e28f..7d0870025fa3 100644
--- a/emfio/source/emfuno/xemfparser.cxx
+++ b/emfio/source/emfuno/xemfparser.cxx
@@ -95,7 +95,7 @@ namespace emfio
return OUString( "emfio::emfreader::XEmfParser" );
}
- uno::Reference< uno::XInterface > SAL_CALL XEmfParser_createInstance(const uno::Reference< uno::XComponentContext >& context)
+ uno::Reference< uno::XInterface > XEmfParser_createInstance(const uno::Reference< uno::XComponentContext >& context)
{
return static_cast< ::cppu::OWeakObject* >(new XEmfParser(context));
}
diff --git a/emfio/source/emfuno/xemfparser.hxx b/emfio/source/emfuno/xemfparser.hxx
index da78322028dc..d68e1e681d51 100644
--- a/emfio/source/emfuno/xemfparser.hxx
+++ b/emfio/source/emfuno/xemfparser.hxx
@@ -35,12 +35,12 @@ namespace com { namespace sun { namespace star {
namespace emfio { namespace emfreader {
-css::uno::Reference< css::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface >
XEmfParser_createInstance( css::uno::Reference< css::uno::XComponentContext > const &);
-OUString SAL_CALL XEmfParser_getImplementationName();
+OUString XEmfParser_getImplementationName();
-css::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString >
XEmfParser_getSupportedServiceNames();
} }
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index 4862049ea14b..aad3cce70981 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -275,7 +275,7 @@ EventAttacherImpl::EventAttacherImpl( const Reference< XComponentContext >& rxCo
}
/// @throws Exception
-Reference< XInterface > SAL_CALL EventAttacherImpl_CreateInstance( const Reference< XMultiServiceFactory >& rSMgr )
+Reference< XInterface > EventAttacherImpl_CreateInstance( const Reference< XMultiServiceFactory >& rSMgr )
{
XEventAttacher *pEventAttacher = static_cast<XEventAttacher*>(new EventAttacherImpl( comphelper::getComponentContext(rSMgr) ));
@@ -855,7 +855,7 @@ Sequence< Reference<XEventListener> > EventAttacherImpl::attachMultipleEventList
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL evtatt_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * evtatt_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * )
{
void * pRet = nullptr;
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index 43bf22986392..1c1eeaaca233 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -145,7 +145,7 @@ namespace abp
} // namespace abp
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
org_openoffice_comp_abp_OAddressBookSourcePilot(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index ee7ef3df942e..bcc2c0be4f6c 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -128,7 +128,7 @@ public:
static Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw( );
/// @throws Exception
- friend Reference< XInterface > SAL_CALL BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr );
+ friend Reference< XInterface > BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr );
// XLoader
virtual void SAL_CALL load(const Reference< XFrame > & aFrame, const OUString& aURL,
@@ -152,7 +152,7 @@ BibliographyLoader::~BibliographyLoader()
}
-Reference< XInterface > SAL_CALL BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ )
+Reference< XInterface > BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ )
{
return *(new BibliographyLoader);
}
@@ -190,7 +190,7 @@ Sequence< OUString > BibliographyLoader::getSupportedServiceNames_Static() throw
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL bib_component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * bib_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = nullptr;
diff --git a/extensions/source/config/ldap/componentdef.cxx b/extensions/source/config/ldap/componentdef.cxx
index 2795146649d0..e8abd45fe248 100644
--- a/extensions/source/config/ldap/componentdef.cxx
+++ b/extensions/source/config/ldap/componentdef.cxx
@@ -24,7 +24,7 @@
using namespace extensions::config::ldap ;
-static uno::Reference<uno::XInterface> SAL_CALL createLdapUserProfileBe(
+static uno::Reference<uno::XInterface> createLdapUserProfileBe(
const uno::Reference<uno::XComponentContext>& aContext) {
return * new LdapUserProfileBe(aContext) ;
}
@@ -44,7 +44,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
} ;
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ldapbe2_component_getFactory(const sal_Char *aImplementationName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * ldapbe2_component_getFactory(const sal_Char *aImplementationName,
void *aServiceManager,
void *aRegistryKey) {
return cppu::component_getFactoryHelper(aImplementationName,
diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx
index 18846e96ae2b..bba456bfa4fd 100644
--- a/extensions/source/dbpilots/dbpservices.cxx
+++ b/extensions/source/dbpilots/dbpservices.cxx
@@ -24,7 +24,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
-extern "C" void SAL_CALL dbp_initializeModule()
+extern "C" void dbp_initializeModule()
{
static bool s_bInit = false;
if (!s_bInit)
@@ -37,7 +37,7 @@ extern "C" void SAL_CALL dbp_initializeModule()
}
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbp_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* dbp_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/extensions/source/dbpilots/dbpservices.hxx b/extensions/source/dbpilots/dbpservices.hxx
index bdc6cbcb6690..655c818501c7 100644
--- a/extensions/source/dbpilots/dbpservices.hxx
+++ b/extensions/source/dbpilots/dbpservices.hxx
@@ -26,9 +26,9 @@
extern "C" {
-void SAL_CALL createRegistryInfo_OGridWizard();
-void SAL_CALL createRegistryInfo_OGroupBoxWizard();
-void SAL_CALL createRegistryInfo_OListComboWizard();
+void createRegistryInfo_OGridWizard();
+void createRegistryInfo_OGroupBoxWizard();
+void createRegistryInfo_OListComboWizard();
}
diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx
index 02caf4a82089..09a2b7e2ee78 100644
--- a/extensions/source/dbpilots/wizardservices.cxx
+++ b/extensions/source/dbpilots/wizardservices.cxx
@@ -27,21 +27,21 @@
#include "gridwizard.hxx"
// the registration methods
-extern "C" void SAL_CALL createRegistryInfo_OGroupBoxWizard()
+extern "C" void createRegistryInfo_OGroupBoxWizard()
{
static compmodule::OMultiInstanceAutoRegistration<
::dbp::OUnoAutoPilot< ::dbp::OGroupBoxWizard, ::dbp::OGroupBoxSI >
> aAutoRegistration;
}
-extern "C" void SAL_CALL createRegistryInfo_OListComboWizard()
+extern "C" void createRegistryInfo_OListComboWizard()
{
static compmodule::OMultiInstanceAutoRegistration<
::dbp::OUnoAutoPilot< ::dbp::OListComboWizard, ::dbp::OListComboSI >
> aAutoRegistration;
}
-extern "C" void SAL_CALL createRegistryInfo_OGridWizard()
+extern "C" void createRegistryInfo_OGridWizard()
{
static compmodule::OMultiInstanceAutoRegistration<
::dbp::OUnoAutoPilot< ::dbp::OGridWizard, ::dbp::OGridSI >
diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx
index 51fc499ffe24..e8cf0206d560 100644
--- a/extensions/source/inc/componentmodule.hxx
+++ b/extensions/source/inc/componentmodule.hxx
@@ -38,7 +38,7 @@
namespace compmodule
{
-typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation)
+typedef css::uno::Reference< css::lang::XSingleServiceFactory > (*FactoryInstantiation)
(
const css::uno::Reference< css::lang::XMultiServiceFactory >& _rServiceManager,
const OUString & _rComponentName,
diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx
index 8db97dd1b350..cf74e46e1332 100644
--- a/extensions/source/logging/consolehandler.cxx
+++ b/extensions/source/logging/consolehandler.cxx
@@ -249,7 +249,7 @@ namespace logging
} // namespace logging
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_extensions_ConsoleHandler(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &arguments)
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index 249dac535365..d5e439850023 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -311,7 +311,7 @@ namespace logging
} // namespace logging
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_extensions_CsvFormatter(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index 87bf330d50b5..697953dd2ec3 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -345,7 +345,7 @@ namespace logging
} // namespace logging
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_extensions_FileHandler(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &arguments)
diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index f528c847701c..937a5bc822dc 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -270,7 +270,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_extensions_LoggerPool(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx
index 40c7c7156c06..3ea3ebca8918 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -139,7 +139,7 @@ namespace logging
} // namespace logging
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_extensions_PlainTextFormatter(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
index 02cb66f53a5c..812d4e345d64 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
@@ -21,7 +21,7 @@
#include "formlinkdialog.hxx"
#include "pcrservices.hxx"
- extern "C" void SAL_CALL createRegistryInfo_MasterDetailLinkDialog()
+ extern "C" void createRegistryInfo_MasterDetailLinkDialog()
{
::pcr::OAutoRegistration< ::pcr::MasterDetailLinkDialog > aAutoRegistration;
}
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx
index 93e9572b77d0..bf37fffc4aaa 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.cxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx
@@ -25,7 +25,7 @@
#include <com/sun/star/form/inspection/FormComponentPropertyHandler.hpp>
-extern "C" void SAL_CALL createRegistryInfo_ButtonNavigationHandler()
+extern "C" void createRegistryInfo_ButtonNavigationHandler()
{
::pcr::ButtonNavigationHandler::registerImplementation();
}
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx
index bb3ce64bd8f1..29f5ed30a791 100644
--- a/extensions/source/propctrlr/cellbindinghandler.cxx
+++ b/extensions/source/propctrlr/cellbindinghandler.cxx
@@ -30,7 +30,7 @@
#include <tools/debug.hxx>
-extern "C" void SAL_CALL createRegistryInfo_CellBindingPropertyHandler()
+extern "C" void createRegistryInfo_CellBindingPropertyHandler()
{
::pcr::CellBindingPropertyHandler::registerImplementation();
}
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index a598665b29e2..a007d2600a0a 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -25,7 +25,7 @@
#include "pcrcommon.hxx"
#include "pcrservices.hxx"
-extern "C" void SAL_CALL createRegistryInfo_OControlFontDialog()
+extern "C" void createRegistryInfo_OControlFontDialog()
{
::pcr::OAutoRegistration< ::pcr::OControlFontDialog > aAutoRegistration;
}
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index 13f7ca368e4e..765c50b274bf 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -31,7 +31,7 @@
#include <sal/macros.h>
-extern "C" void SAL_CALL createRegistryInfo_DefaultFormComponentInspectorModel()
+extern "C" void createRegistryInfo_DefaultFormComponentInspectorModel()
{
::pcr::OAutoRegistration< ::pcr::DefaultFormComponentInspectorModel > aAutoRegistration;
}
diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx
index 9af9b892ff23..f4efb7b92993 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.cxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.cxx
@@ -31,7 +31,7 @@
#include <tools/diagnose_ex.h>
-extern "C" void SAL_CALL createRegistryInfo_DefaultHelpProvider()
+extern "C" void createRegistryInfo_DefaultHelpProvider()
{
::pcr::OAutoRegistration< ::pcr::DefaultHelpProvider > aAutoRegistration;
}
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx
index e8da2ca83a3a..87610f0450cd 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -30,7 +30,7 @@
#define TEXTTYPE_RICHTEXT 2
-extern "C" void SAL_CALL createRegistryInfo_EditPropertyHandler()
+extern "C" void createRegistryInfo_EditPropertyHandler()
{
::pcr::EditPropertyHandler::registerImplementation();
}
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index 4ed56c0ff3fb..f93e49bc0898 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -35,7 +35,7 @@
#include <functional>
-extern "C" void SAL_CALL createRegistryInfo_EFormsPropertyHandler()
+extern "C" void createRegistryInfo_EFormsPropertyHandler()
{
::pcr::EFormsPropertyHandler::registerImplementation();
}
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index e3112138f5a5..7b35e6e79edb 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -72,7 +72,7 @@
#include <iterator>
#include <o3tl/functional.hxx>
-extern "C" void SAL_CALL createRegistryInfo_EventHandler()
+extern "C" void createRegistryInfo_EventHandler()
{
::pcr::OAutoRegistration< ::pcr::EventHandler > aAutoRegistration;
}
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index d1b0bca65e97..37255b5275c2 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -106,7 +106,7 @@
#define GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
-extern "C" void SAL_CALL createRegistryInfo_FormComponentPropertyHandler()
+extern "C" void createRegistryInfo_FormComponentPropertyHandler()
{
::pcr::FormComponentPropertyHandler::registerImplementation();
}
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index b01833515b4c..a6afe300d830 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -30,7 +30,7 @@
#include <toolkit/helper/vclunohelper.hxx>
-extern "C" void SAL_CALL createRegistryInfo_FormController()
+extern "C" void createRegistryInfo_FormController()
{
::pcr::OAutoRegistration< ::pcr::FormController > aFormControllerRegistration;
::pcr::OAutoRegistration< ::pcr::DialogController > aDialogControllerRegistration;
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index dedd555dea19..05b63a8e9faf 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -804,7 +804,7 @@ namespace pcr
} // namespace pcr
-extern "C" void SAL_CALL createRegistryInfo_FormGeometryHandler()
+extern "C" void createRegistryInfo_FormGeometryHandler()
{
::pcr::FormGeometryHandler::registerImplementation();
}
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 88d109d24f41..2cfa948a9787 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -42,7 +42,7 @@
#include <algorithm>
#include <o3tl/functional.hxx>
-extern "C" void SAL_CALL createRegistryInfo_GenericPropertyHandler()
+extern "C" void createRegistryInfo_GenericPropertyHandler()
{
::pcr::OAutoRegistration< ::pcr::GenericPropertyHandler > aAutoRegistration;
}
diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx
index 06b30c914f22..9a295b5e3d73 100644
--- a/extensions/source/propctrlr/objectinspectormodel.cxx
+++ b/extensions/source/propctrlr/objectinspectormodel.cxx
@@ -220,7 +220,7 @@ namespace pcr
} // namespace pcr
-extern "C" void SAL_CALL createRegistryInfo_ObjectInspectorModel()
+extern "C" void createRegistryInfo_ObjectInspectorModel()
{
::pcr::OAutoRegistration< ::pcr::ObjectInspectorModel > aObjectInspectorModelRegistration;
}
diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx
index 0985d4c91ac1..1ef0353ae1c6 100644
--- a/extensions/source/propctrlr/pcrservices.cxx
+++ b/extensions/source/propctrlr/pcrservices.cxx
@@ -25,7 +25,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
-extern "C" void SAL_CALL pcr_initializeModule()
+extern "C" void pcr_initializeModule()
{
static bool s_bInit = false;
if (!s_bInit)
@@ -54,7 +54,7 @@ extern "C" void SAL_CALL pcr_initializeModule()
}
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pcr_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* pcr_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
SAL_UNUSED_PARAMETER void* /*pRegistryKey*/)
diff --git a/extensions/source/propctrlr/pcrservices.hxx b/extensions/source/propctrlr/pcrservices.hxx
index 68dbd88c7e86..73cd86b9487b 100644
--- a/extensions/source/propctrlr/pcrservices.hxx
+++ b/extensions/source/propctrlr/pcrservices.hxx
@@ -26,25 +26,25 @@
extern "C" {
-void SAL_CALL createRegistryInfo_ButtonNavigationHandler();
-void SAL_CALL createRegistryInfo_CellBindingPropertyHandler();
-void SAL_CALL createRegistryInfo_DefaultFormComponentInspectorModel();
-void SAL_CALL createRegistryInfo_DefaultHelpProvider();
-void SAL_CALL createRegistryInfo_EFormsPropertyHandler();
-void SAL_CALL createRegistryInfo_EditPropertyHandler();
-void SAL_CALL createRegistryInfo_EventHandler();
-void SAL_CALL createRegistryInfo_FormComponentPropertyHandler();
-void SAL_CALL createRegistryInfo_FormController();
-void SAL_CALL createRegistryInfo_FormGeometryHandler();
-void SAL_CALL createRegistryInfo_GenericPropertyHandler();
-void SAL_CALL createRegistryInfo_MasterDetailLinkDialog();
-void SAL_CALL createRegistryInfo_OControlFontDialog();
-void SAL_CALL createRegistryInfo_OPropertyBrowserController();
-void SAL_CALL createRegistryInfo_OTabOrderDialog();
-void SAL_CALL createRegistryInfo_ObjectInspectorModel();
-void SAL_CALL createRegistryInfo_StringRepresentation();
-void SAL_CALL createRegistryInfo_SubmissionPropertyHandler();
-void SAL_CALL createRegistryInfo_XSDValidationPropertyHandler();
+void createRegistryInfo_ButtonNavigationHandler();
+void createRegistryInfo_CellBindingPropertyHandler();
+void createRegistryInfo_DefaultFormComponentInspectorModel();
+void createRegistryInfo_DefaultHelpProvider();
+void createRegistryInfo_EFormsPropertyHandler();
+void createRegistryInfo_EditPropertyHandler();
+void createRegistryInfo_EventHandler();
+void createRegistryInfo_FormComponentPropertyHandler();
+void createRegistryInfo_FormController();
+void createRegistryInfo_FormGeometryHandler();
+void createRegistryInfo_GenericPropertyHandler();
+void createRegistryInfo_MasterDetailLinkDialog();
+void createRegistryInfo_OControlFontDialog();
+void createRegistryInfo_OPropertyBrowserController();
+void createRegistryInfo_OTabOrderDialog();
+void createRegistryInfo_ObjectInspectorModel();
+void createRegistryInfo_StringRepresentation();
+void createRegistryInfo_SubmissionPropertyHandler();
+void createRegistryInfo_XSDValidationPropertyHandler();
}
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx
index c90b99edcd86..011777176463 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -28,7 +28,7 @@
#include "taborder.hxx"
#include "pcrcommon.hxx"
-extern "C" void SAL_CALL createRegistryInfo_OTabOrderDialog()
+extern "C" void createRegistryInfo_OTabOrderDialog()
{
::pcr::OAutoRegistration< ::pcr::OTabOrderDialog > aAutoRegistration;
}
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index a3e7cc1f3a8c..4fb6c295faef 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -57,7 +57,7 @@
// !!! outside the namespace !!!
-extern "C" void SAL_CALL createRegistryInfo_OPropertyBrowserController()
+extern "C" void createRegistryInfo_OPropertyBrowserController()
{
::pcr::OAutoRegistration< ::pcr::OPropertyBrowserController > aAutoRegistration;
}
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index bfc1936f0ff4..492721abedbb 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -51,9 +51,9 @@ namespace comp_StringRepresentation {
using namespace ::com::sun::star;
// component and service helper functions:
-OUString SAL_CALL _getImplementationName();
-uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames();
-uno::Reference< uno::XInterface > SAL_CALL _create( uno::Reference< uno::XComponentContext > const & context );
+OUString _getImplementationName();
+uno::Sequence< OUString > _getSupportedServiceNames();
+uno::Reference< uno::XInterface > _create( uno::Reference< uno::XComponentContext > const & context );
} // closing component helper namespace
@@ -611,18 +611,18 @@ bool StringRepresentation::convertStringToGenericValue( const OUString& _rString
// component helper namespace
namespace comp_StringRepresentation {
-OUString SAL_CALL _getImplementationName() {
+OUString _getImplementationName() {
return OUString(
"StringRepresentation");
}
-uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames()
+uno::Sequence< OUString > _getSupportedServiceNames()
{
uno::Sequence< OUString > s { "com.sun.star.inspection.StringRepresentation" };
return s;
}
-uno::Reference< uno::XInterface > SAL_CALL _create(
+uno::Reference< uno::XInterface > _create(
const uno::Reference< uno::XComponentContext > & context)
{
return static_cast< ::cppu::OWeakObject * >(new pcr::StringRepresentation(context));
@@ -631,7 +631,7 @@ uno::Reference< uno::XInterface > SAL_CALL _create(
} // closing component helper namespace
-extern "C" void SAL_CALL createRegistryInfo_StringRepresentation()
+extern "C" void createRegistryInfo_StringRepresentation()
{
::pcr::PcrModule::getInstance().registerImplementation(
comp_StringRepresentation::_getImplementationName(),
diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx
index 8c53f83a7c01..853659bd5b3f 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -35,7 +35,7 @@
#include <rtl/ustrbuf.hxx>
-extern "C" void SAL_CALL createRegistryInfo_SubmissionPropertyHandler()
+extern "C" void createRegistryInfo_SubmissionPropertyHandler()
{
::pcr::SubmissionPropertyHandler::registerImplementation();
}
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index de22c3c9ac8d..84a7e0d99a90 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -49,7 +49,7 @@
#include <limits>
-extern "C" void SAL_CALL createRegistryInfo_XSDValidationPropertyHandler()
+extern "C" void createRegistryInfo_XSDValidationPropertyHandler()
{
::pcr::XSDValidationPropertyHandler::registerImplementation();
}
diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx
index 3fdf09c18e8f..e03cf30e9737 100644
--- a/extensions/source/scanner/scanner.cxx
+++ b/extensions/source/scanner/scanner.cxx
@@ -22,7 +22,7 @@
#include <cppuhelper/supportsservice.hxx>
-Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory >& /*rxFactory*/ )
+Reference< XInterface > ScannerManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory >& /*rxFactory*/ )
{
return *( new ScannerManager() );
}
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index d0bea52c2d8e..9ae7821af3c0 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -82,7 +82,7 @@ public:
};
/// @throws Exception
-Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory >& rxFactory );
+Reference< XInterface > ScannerManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory >& rxFactory );
#endif
diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx
index f728ff809d32..d790bb9522fe 100644
--- a/extensions/source/scanner/scnserv.cxx
+++ b/extensions/source/scanner/scnserv.cxx
@@ -26,7 +26,7 @@
using namespace com::sun::star::registry;
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL scn_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* scn_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
{
Reference< css::lang::XSingleServiceFactory > xFactory;
void* pRet = nullptr;
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index 09161454e880..b8eda1da01c6 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -297,7 +297,7 @@ void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & )
} // anonymous namespace
-static uno::Reference<uno::XInterface> SAL_CALL
+static uno::Reference<uno::XInterface>
createJobInstance(const uno::Reference<uno::XComponentContext>& xContext)
{
css::uno::Reference<css::frame::XDesktop2> desktop(
@@ -308,7 +308,7 @@ createJobInstance(const uno::Reference<uno::XComponentContext>& xContext)
}
-static uno::Reference<uno::XInterface> SAL_CALL
+static uno::Reference<uno::XInterface>
createConfigInstance(const uno::Reference<uno::XComponentContext>& xContext)
{
return *UpdateCheckConfig::get(xContext, *UpdateCheck::get());
@@ -337,7 +337,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
} ;
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchk_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
+extern "C" SAL_DLLPUBLIC_EXPORT void * updchk_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
{
return cppu::component_getFactoryHelper(
pszImplementationName,
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index b660eff706b1..e1d846ba8546 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -771,7 +771,7 @@ UpdateInformationProvider::supportsService( OUString const & serviceName )
} // anonymous namespace
-static uno::Reference<uno::XInterface> SAL_CALL
+static uno::Reference<uno::XInterface>
createInstance(uno::Reference<uno::XComponentContext> const & xContext)
{
return UpdateInformationProvider::createInstance(xContext);
@@ -792,7 +792,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
} ;
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updatefeed_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
+extern "C" SAL_DLLPUBLIC_EXPORT void * updatefeed_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
{
return cppu::component_getFactoryHelper(
pszImplementationName,
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index cdd17d77433d..ebfa1bf42a4d 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -895,7 +895,7 @@ void BubbleWindow::RecalcTextRects()
} // anonymous namespace
-static uno::Reference<uno::XInterface> SAL_CALL
+static uno::Reference<uno::XInterface>
createInstance(const uno::Reference<uno::XComponentContext>& xContext)
{
SolarMutexGuard aGuard;
@@ -917,7 +917,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
} ;
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchkui_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
+extern "C" SAL_DLLPUBLIC_EXPORT void * updchkui_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
{
return cppu::component_getFactoryHelper(
pszImplementationName,
diff --git a/filter/source/config/cache/registration.cxx b/filter/source/config/cache/registration.cxx
index e847faa1a228..38cd72c3efd1 100644
--- a/filter/source/config/cache/registration.cxx
+++ b/filter/source/config/cache/registration.cxx
@@ -32,7 +32,7 @@ namespace filter{
namespace config{
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT void*
filterconfig1_component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager,
void* /* pRegistryKey */ )
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx
index 104fc60022c2..aabf1bf9c91b 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -47,14 +47,14 @@ OUString SWFDialog_getImplementationName ()
}
-Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames()
+Sequence< OUString > SWFDialog_getSupportedServiceNames()
{
Sequence<OUString> aRet { SERVICE_NAME };
return aRet;
}
-Reference< XInterface > SAL_CALL SWFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
+Reference< XInterface > SWFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
{
return static_cast<cppu::OWeakObject*>(new SWFDialog( comphelper::getComponentContext(rSMgr) ));
}
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index 4c8f8a5654d1..029c84930937 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -486,13 +486,13 @@ OUString FlashExportFilter_getImplementationName ()
return OUString ( "com.sun.star.comp.Impress.FlashExportFilter" );
}
-Sequence< OUString > SAL_CALL FlashExportFilter_getSupportedServiceNames( )
+Sequence< OUString > FlashExportFilter_getSupportedServiceNames( )
{
Sequence<OUString> aRet { "com.sun.star.document.ExportFilter" };
return aRet;
}
-Reference< XInterface > SAL_CALL FlashExportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
+Reference< XInterface > FlashExportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
{
return static_cast<cppu::OWeakObject*>(new FlashExportFilter( comphelper::getComponentContext(rSMgr) ));
}
diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx
index 87c45602c8a0..d9b18294e575 100644
--- a/filter/source/flash/swfuno.cxx
+++ b/filter/source/flash/swfuno.cxx
@@ -32,7 +32,7 @@ using namespace ::swf;
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL flash_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * flash_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
void * pRet = nullptr;
diff --git a/filter/source/flash/swfuno.hxx b/filter/source/flash/swfuno.hxx
index e1a0fd7243e7..caa304868509 100644
--- a/filter/source/flash/swfuno.hxx
+++ b/filter/source/flash/swfuno.hxx
@@ -41,11 +41,11 @@ namespace swf {
OUString FlashExportFilter_getImplementationName();
/// @throws css::uno::RuntimeException
-css::uno::Sequence<OUString> SAL_CALL
+css::uno::Sequence<OUString>
FlashExportFilter_getSupportedServiceNames();
/// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL
+css::uno::Reference<css::uno::XInterface>
FlashExportFilter_createInstance(
css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
@@ -55,10 +55,10 @@ FlashExportFilter_createInstance(
OUString SWFDialog_getImplementationName ();
/// @throws css::uno::RuntimeException
-css::uno::Sequence<OUString> SAL_CALL SWFDialog_getSupportedServiceNames();
+css::uno::Sequence<OUString> SWFDialog_getSupportedServiceNames();
/// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL SWFDialog_createInstance(
+css::uno::Reference<css::uno::XInterface> SWFDialog_createInstance(
css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
#endif
diff --git a/filter/source/graphic/Services.cxx b/filter/source/graphic/Services.cxx
index e32ef6e98948..a7abd8828844 100644
--- a/filter/source/graphic/Services.cxx
+++ b/filter/source/graphic/Services.cxx
@@ -29,7 +29,7 @@ const comphelper::service_decl::ServiceDecl graphicExportFilter(
"com.sun.star.document.ExportFilter" );
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL graphicfilter_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* graphicfilter_component_getFactory(
sal_Char const* pImplementationName, void*, void*)
{
if ( rtl_str_compare (pImplementationName, GRAPHIC_EXPORT_FILTER_SERVICE) == 0 )
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index db6838f6a288..aed662ba4cbd 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -541,7 +541,7 @@ void GIFWriter::WriteTerminator()
}
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT bool
egiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem )
{
GIFWriter aWriter(rStream);
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 694998345361..55965ae6f3ba 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -2657,7 +2657,7 @@ bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uLong
//================== GraphicExport - the exported function ===================
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT bool
epsGraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem )
{
PSWriter aPSWriter;
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index f02985fc1658..1a10eb540b38 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -572,7 +572,7 @@ void TIFFWriter::EndCompression()
}
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT bool
etiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
{
TIFFWriter aWriter(rStream);
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx
index 31c583900e1f..a421b93500cf 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -710,7 +710,7 @@ bool CGM::Write( SvStream& rIStm )
};
// GraphicImport - the exported function
-extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32
ImportCGM(SvStream& rIn, uno::Reference< frame::XModel > const & rXModel, css::uno::Reference<css::task::XStatusIndicator> const & aXStatInd)
{
diff --git a/filter/source/graphicfilter/idxf/idxf.cxx b/filter/source/graphicfilter/idxf/idxf.cxx
index be458003df8d..80abdd8a8470 100644
--- a/filter/source/graphicfilter/idxf/idxf.cxx
+++ b/filter/source/graphicfilter/idxf/idxf.cxx
@@ -29,7 +29,7 @@ class FilterConfigItem;
//================== GraphicImport - the exported function ================
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT bool
idxGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
DXFRepresentation aDXF;
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 9c8e73b5d520..f9ad7d49cd76 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -562,7 +562,7 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead,
//================== GraphicImport - the exported function ================
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT bool
ipsGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
if ( rStream.GetError() )
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 0fde944a6fd7..b737ac664d14 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -2764,7 +2764,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF
//================== GraphicImport - the exported function ================
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT bool
imeGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
OS2METReader aOS2METReader;
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx
index 4b230af5c0d5..c0476adbbd5e 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -535,7 +535,7 @@ bool PBMReader::ImplReadBody()
//================== GraphicImport - the exported function ================
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT bool
ipbGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
PBMReader aPBMReader(rStream);
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index d4a49be998e4..5adaf3e7d911 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -359,7 +359,7 @@ void PCDReader::ReadImage()
//================== GraphicImport - the exported Function ================
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT bool
icdGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem )
{
PCDReader aPCDReader(rStream);
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index fed075ed131b..38c6d54664c2 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -390,7 +390,7 @@ void PCXReader::ImplReadPalette( sal_uLong nCol )
//================== GraphicImport - the exported function ================
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT bool
ipxGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
PCXReader aPCXReader(rStream);
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 67292c76a46b..a661c9a2e9a5 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -2012,7 +2012,7 @@ void ReadPictFile(SvStream &rStreamPict, GDIMetaFile& rGDIMetaFile)
//================== GraphicImport - the exported function ================
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT bool
iptGraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem* )
{
GDIMetaFile aMTF;
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index 21214a799657..29718b67119c 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -752,7 +752,7 @@ bool PSDReader::ImplReadBody()
//================== GraphicImport - the exported function ================
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT bool
ipdGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
PSDReader aPSDReader(rStream);
diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index 4c878be321f7..ac75b2a77bd3 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -380,7 +380,7 @@ sal_uInt8 RASReader::ImplGetByte()
//================== GraphicImport - the exported function ================
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT bool
iraGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
RASReader aRASReader(rStream);
diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx
index 6eaafe722932..10681f221085 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -786,7 +786,7 @@ bool TGAReader::ImplReadPalette()
//================== GraphicImport - the exported function ================
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT bool
itgGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
TGAReader aTGAReader(rStream);
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 8752e9dd98b4..a9c875e2287d 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1557,7 +1557,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
//================== GraphicImport - the exported function ================
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT bool
itiGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
TIFFReader aTIFFReader;
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 2cdb6f9ab674..578c368dcfe7 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -271,7 +271,7 @@ EscherProperties EscherPropertyContainer::GetOpts() const
return aVector;
}
-extern "C" int SAL_CALL EscherPropSortFunc( const void* p1, const void* p2 )
+extern "C" int EscherPropSortFunc( const void* p1, const void* p2 )
{
sal_Int16 nID1 = static_cast<EscherPropSortStruct const *>(p1)->nPropId &~0xc000;
sal_Int16 nID2 = static_cast<EscherPropSortStruct const *>(p2)->nPropId &~0xc000;
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index 0951cc87c8a1..286a352705bc 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -509,7 +509,7 @@ OUString VBAMacroResolver_getImplementationName()
return OUString( "com.sun.star.comp.vba.VBAMacroResolver" );
}
-uno::Reference< uno::XInterface > SAL_CALL VBAMacroResolver_createInstance( const uno::Reference< uno::XComponentContext >& )
+uno::Reference< uno::XInterface > VBAMacroResolver_createInstance( const uno::Reference< uno::XComponentContext >& )
{
return static_cast< ::cppu::OWeakObject* >( new VBAMacroResolver );
}
diff --git a/filter/source/msfilter/services.cxx b/filter/source/msfilter/services.cxx
index 9ef19e882e23..ba3a7b066b65 100644
--- a/filter/source/msfilter/services.cxx
+++ b/filter/source/msfilter/services.cxx
@@ -37,7 +37,7 @@ static ::cppu::ImplementationEntry const spServices[] =
} // namespace
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL msfilter_component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey )
+extern "C" SAL_DLLPUBLIC_EXPORT void* msfilter_component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey )
{
return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, spServices );
}
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index aab5ec7adec4..9a7881e24c88 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -215,7 +215,7 @@ Reference< XInterface > SAL_CALL OdfFlatXml::impl_createInstance(const Reference
}
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT void*
odfflatxml_component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager,
void* /* pRegistryKey */ )
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index 47573daaaf60..fcd66f01a56b 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -39,14 +39,14 @@ OUString PDFDialog_getImplementationName ()
}
-Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames()
+Sequence< OUString > PDFDialog_getSupportedServiceNames()
{
Sequence<OUString> aRet { SERVICE_NAME };
return aRet;
}
-Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
+Reference< XInterface > PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
{
return static_cast<cppu::OWeakObject*>(new PDFDialog( comphelper::getComponentContext(rSMgr) ));
}
diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx
index 31316434882c..671db03ed6fa 100644
--- a/filter/source/pdf/pdfdialog.hxx
+++ b/filter/source/pdf/pdfdialog.hxx
@@ -67,9 +67,9 @@ public:
/// @throws RuntimeException
OUString PDFDialog_getImplementationName ();
/// @throws RuntimeException
-Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames();
+Sequence< OUString > PDFDialog_getSupportedServiceNames();
/// @throws Exception
-Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr);
+Reference< XInterface > PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr);
#endif // INCLUDED_FILTER_SOURCE_PDF_PDFDIALOG_HXX
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 2a32408bb0c3..d20a2d3acd98 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -202,14 +202,14 @@ OUString PDFFilter_getImplementationName ()
}
-Sequence< OUString > SAL_CALL PDFFilter_getSupportedServiceNames( )
+Sequence< OUString > PDFFilter_getSupportedServiceNames( )
{
Sequence<OUString> aRet { "com.sun.star.document.PDFFilter" };
return aRet;
}
-Reference< XInterface > SAL_CALL PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
+Reference< XInterface > PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
{
return static_cast<cppu::OWeakObject*>(new PDFFilter( comphelper::getComponentContext(rSMgr) ));
}
diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx
index 7fedeaffa4fe..5e1db495249e 100644
--- a/filter/source/pdf/pdffilter.hxx
+++ b/filter/source/pdf/pdffilter.hxx
@@ -85,11 +85,11 @@ public:
OUString PDFFilter_getImplementationName ();
/// @throws RuntimeException
-Sequence< OUString > SAL_CALL PDFFilter_getSupportedServiceNames( );
+Sequence< OUString > PDFFilter_getSupportedServiceNames( );
/// @throws Exception
Reference< XInterface >
-SAL_CALL PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr);
+PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr);
#endif // INCLUDED_FILTER_SOURCE_PDF_PDFFILTER_HXX
diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx
index c416e2c1f5c9..a704fbf3f7ba 100644
--- a/filter/source/pdf/pdfinteract.cxx
+++ b/filter/source/pdf/pdfinteract.cxx
@@ -68,14 +68,14 @@ OUString PDFInteractionHandler_getImplementationName ()
}
-Sequence< OUString > SAL_CALL PDFInteractionHandler_getSupportedServiceNames( )
+Sequence< OUString > PDFInteractionHandler_getSupportedServiceNames( )
{
Sequence<OUString> aRet { "com.sun.star.filter.pdfexport.PDFExportInteractionHandler" };
return aRet;
}
-Reference< XInterface > SAL_CALL PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & )
+Reference< XInterface > PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & )
{
return static_cast<cppu::OWeakObject*>(new PDFInteractionHandler);
}
diff --git a/filter/source/pdf/pdfinteract.hxx b/filter/source/pdf/pdfinteract.hxx
index 06bd82fb7262..0795558c084e 100644
--- a/filter/source/pdf/pdfinteract.hxx
+++ b/filter/source/pdf/pdfinteract.hxx
@@ -56,11 +56,11 @@ public:
OUString PDFInteractionHandler_getImplementationName ();
/// @throws RuntimeException
-Sequence< OUString > SAL_CALL PDFInteractionHandler_getSupportedServiceNames( );
+Sequence< OUString > PDFInteractionHandler_getSupportedServiceNames( );
/// @throws Exception
Reference< XInterface >
-SAL_CALL PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & rSMgr);
+PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & rSMgr);
#endif // INCLUDED_FILTER_SOURCE_PDF_PDFINTERACT_HXX
diff --git a/filter/source/pdf/pdfuno.cxx b/filter/source/pdf/pdfuno.cxx
index 4a72f57bb0cc..8dad87097afa 100644
--- a/filter/source/pdf/pdfuno.cxx
+++ b/filter/source/pdf/pdfuno.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star::registry;
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void* SAL_CALL pdffilter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+ SAL_DLLPUBLIC_EXPORT void* pdffilter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
OUString aImplName( OUString::createFromAscii( pImplName ) );
void* pRet = nullptr;
diff --git a/filter/source/storagefilterdetect/fdcomp.cxx b/filter/source/storagefilterdetect/fdcomp.cxx
index 36c64b12e292..9a281e540efb 100644
--- a/filter/source/storagefilterdetect/fdcomp.cxx
+++ b/filter/source/storagefilterdetect/fdcomp.cxx
@@ -26,7 +26,7 @@ static cppu::ImplementationEntry const services[] = {
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL storagefd_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * storagefd_component_getFactory(
char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper(
diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx
index 9c282498ebb2..fcaaa05f24eb 100644
--- a/filter/source/svg/svgdialog.cxx
+++ b/filter/source/svg/svgdialog.cxx
@@ -46,14 +46,14 @@ OUString SVGDialog_getImplementationName ()
}
-Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames()
+Sequence< OUString > SVGDialog_getSupportedServiceNames()
{
Sequence< OUString > aRet { SVG_DIALOG_SERVICE_NAME };
return aRet;
}
-Reference< XInterface > SAL_CALL SVGDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr )
+Reference< XInterface > SVGDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr )
{
return static_cast< cppu::OWeakObject* >( new SVGDialog( comphelper::getComponentContext(rSMgr) ) );
}
diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx
index 92d3d0432938..ed4bcbee343f 100644
--- a/filter/source/svg/svgdialog.hxx
+++ b/filter/source/svg/svgdialog.hxx
@@ -74,11 +74,11 @@ public:
OUString SVGDialog_getImplementationName ();
/// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames( );
+css::uno::Sequence< OUString > SVGDialog_getSupportedServiceNames( );
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface >
- SAL_CALL SVGDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
+ SVGDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
#endif // INCLUDED_FILTER_SOURCE_SVG_SVGDIALOG_HXX
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index cba3d3210ad9..c689eebee5e0 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -398,7 +398,7 @@ namespace sdecl = comphelper::service_decl;
"com.sun.star.svg.SVGWriter" );
// The C shared lib entry points
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL svgfilter_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* svgfilter_component_getFactory(
sal_Char const* pImplName, void*, void*)
{
if ( rtl_str_compare (pImplName, SVG_FILTER_IMPL_NAME) == 0 )
diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx
index 73dda29993d8..11af8a6690a5 100644
--- a/filter/source/t602/filterenv.cxx
+++ b/filter/source/t602/filterenv.cxx
@@ -33,7 +33,7 @@ using namespace T602ImportFilter;
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL t602filter_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * t602filter_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
void * pRet = nullptr;
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index 36f6bc6da996..38ca6230bb70 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -871,7 +871,7 @@ OUString T602ImportFilter_getImplementationName ()
return OUString ( "com.sun.star.comp.Writer.T602ImportFilter" );
}
-Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( )
+Sequence< OUString > T602ImportFilter_getSupportedServiceNames( )
{
Sequence < OUString > aRet(2);
OUString* pArray = aRet.getArray();
@@ -880,7 +880,7 @@ Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( )
return aRet;
}
-Reference< XInterface > SAL_CALL T602ImportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
+Reference< XInterface > T602ImportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
{
return static_cast<cppu::OWeakObject*>(new T602ImportFilter( rSMgr ));
}
@@ -1141,20 +1141,20 @@ OUString T602ImportFilterDialog_getImplementationName ()
return OUString ( "com.sun.star.comp.Writer.T602ImportFilterDialog" );
}
-Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( )
+Sequence< OUString > T602ImportFilterDialog_getSupportedServiceNames( )
{
Sequence<OUString> aRet { "com.sun.star.ui.dialogs.FilterOptionsDialog" };
return aRet;
}
-Reference< XInterface > SAL_CALL T602ImportFilterDialog_createInstance( const Reference< XMultiServiceFactory > & )
+Reference< XInterface > T602ImportFilterDialog_createInstance( const Reference< XMultiServiceFactory > & )
{
return static_cast<cppu::OWeakObject*>(new T602ImportFilterDialog);
}
}
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImport602(SvStream &rStream)
+extern "C" SAL_DLLPUBLIC_EXPORT bool TestImport602(SvStream &rStream)
{
css::uno::Reference<io::XInputStream> xStream(new utl::OSeekableInputStreamWrapper(rStream));
rtl::Reference<T602ImportFilter::T602ImportFilter> aImport(
diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx
index 63bd0335614f..22abefa78838 100644
--- a/filter/source/t602/t602filter.hxx
+++ b/filter/source/t602/t602filter.hxx
@@ -254,21 +254,21 @@ private:
OUString T602ImportFilter_getImplementationName();
/// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( );
+css::uno::Sequence< OUString > T602ImportFilter_getSupportedServiceNames( );
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface >
-SAL_CALL T602ImportFilter_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
+T602ImportFilter_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
/// @throws css::uno::RuntimeException
OUString T602ImportFilterDialog_getImplementationName();
/// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( );
+css::uno::Sequence< OUString > T602ImportFilterDialog_getSupportedServiceNames( );
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface >
-SAL_CALL T602ImportFilterDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
+T602ImportFilterDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
}
diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx
index ee93d28ddbed..d2f8fb0bd54c 100644
--- a/filter/source/textfilterdetect/filterdetect.cxx
+++ b/filter/source/textfilterdetect/filterdetect.cxx
@@ -225,7 +225,7 @@ uno::Sequence<OUString> SAL_CALL PlainTextFilterDetect::getSupportedServiceNames
return PlainTextFilterDetect_getSupportedServiceNames();
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_filters_PlainTextFilterDetect_get_implementation(css::uno::XComponentContext* ,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index ffe7684c7431..5db591bcf53e 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -325,7 +325,7 @@ OUString XmlFilterAdaptor_getImplementationName ()
return OUString( "com.sun.star.comp.Writer.XmlFilterAdaptor" );
}
-Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( )
+Sequence< OUString > XmlFilterAdaptor_getSupportedServiceNames( )
{
Sequence < OUString > aRet(2);
OUString* pArray = aRet.getArray();
@@ -334,7 +334,7 @@ Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( )
return aRet;
}
-Reference< XInterface > SAL_CALL XmlFilterAdaptor_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
+Reference< XInterface > XmlFilterAdaptor_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
{
return static_cast<cppu::OWeakObject*>(new XmlFilterAdaptor( comphelper::getComponentContext(rSMgr) ));
}
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
index a0512a34d864..78a4fbad6369 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
@@ -108,12 +108,12 @@ public:
OUString XmlFilterAdaptor_getImplementationName();
/// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( );
+css::uno::Sequence< OUString > XmlFilterAdaptor_getSupportedServiceNames( );
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface >
-SAL_CALL XmlFilterAdaptor_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
+XmlFilterAdaptor_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
#endif
diff --git a/filter/source/xmlfilteradaptor/genericfilter.cxx b/filter/source/xmlfilteradaptor/genericfilter.cxx
index c2bebaaec1b8..91bda6f47728 100644
--- a/filter/source/xmlfilteradaptor/genericfilter.cxx
+++ b/filter/source/xmlfilteradaptor/genericfilter.cxx
@@ -29,7 +29,7 @@ using namespace ::com::sun::star::registry;
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlfa_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * xmlfa_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
void * pRet = nullptr;
diff --git a/filter/source/xmlfilterdetect/fdcomp.cxx b/filter/source/xmlfilterdetect/fdcomp.cxx
index 3b975cc05d31..1cbec9680402 100644
--- a/filter/source/xmlfilterdetect/fdcomp.cxx
+++ b/filter/source/xmlfilterdetect/fdcomp.cxx
@@ -36,7 +36,7 @@ static cppu::ImplementationEntry const services[] = {
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlfd_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * xmlfd_component_getFactory(
char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper(
diff --git a/filter/source/xmlfilterdetect/filterdetect.hxx b/filter/source/xmlfilterdetect/filterdetect.hxx
index 5db916d76e5e..77d716387f90 100644
--- a/filter/source/xmlfilterdetect/filterdetect.hxx
+++ b/filter/source/xmlfilterdetect/filterdetect.hxx
@@ -56,11 +56,11 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
};
-OUString SAL_CALL FilterDetect_getImplementationName();
+OUString FilterDetect_getImplementationName();
-css::uno::Sequence< OUString > SAL_CALL FilterDetect_getSupportedServiceNames();
+css::uno::Sequence< OUString > FilterDetect_getSupportedServiceNames();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface >
FilterDetect_createInstance(
css::uno::Reference<
css::uno::XComponentContext > const & context);
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 60b08704e95d..807d01138b04 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -170,14 +170,14 @@ OUString XMLFilterDialogComponent_getImplementationName()
}
/// @throws RuntimeException
-Sequence< OUString > SAL_CALL XMLFilterDialogComponent_getSupportedServiceNames()
+Sequence< OUString > XMLFilterDialogComponent_getSupportedServiceNames()
{
Sequence< OUString > aSupported { "com.sun.star.ui.dialogs.XSLTFilterDialog" };
return aSupported;
}
/// @throws Exception
-Reference< XInterface > SAL_CALL XMLFilterDialogComponent_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
+Reference< XInterface > XMLFilterDialogComponent_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
{
return static_cast<OWeakObject*>(new XMLFilterDialogComponent( comphelper::getComponentContext(rSMgr) ));
}
@@ -324,7 +324,7 @@ void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& aArgu
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsltdlg_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * xsltdlg_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
void * pRet = nullptr;
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index 75d5febb8799..811ad6458d8b 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -539,13 +539,13 @@ namespace XSLT
#define TRANSFORMER_SERVICE_NAME "com.sun.star.xml.xslt.XSLTTransformer"
#define TRANSFORMER_IMPL_NAME "com.sun.star.comp.documentconversion.LibXSLTTransformer"
- static css::uno::Reference<XInterface> SAL_CALL
+ static css::uno::Reference<XInterface>
CreateTransformerInstance(const css::uno::Reference<XMultiServiceFactory> &r)
{
return css::uno::Reference<XInterface> (static_cast<OWeakObject *>(new LibXSLTTransformer( comphelper::getComponentContext(r) )));
}
- static css::uno::Reference<XInterface> SAL_CALL
+ static css::uno::Reference<XInterface>
CreateFilterInstance(const css::uno::Reference<XMultiServiceFactory> &r)
{
return css::uno::Reference<XInterface> (static_cast<OWeakObject *>(new XSLTFilter( comphelper::getComponentContext(r) )));
@@ -557,7 +557,7 @@ using namespace XSLT;
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsltfilter_component_getFactory(const sal_Char * pImplName,
+ SAL_DLLPUBLIC_EXPORT void * xsltfilter_component_getFactory(const sal_Char * pImplName,
void * pServiceManager, void * /* pRegistryKey */)
{
void * pRet = nullptr;
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 99d076c3096a..3b2ed0b99972 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -749,14 +749,14 @@ void SAL_CALL OButtonControl::releaseDispatchProviderInterceptor( const Referenc
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OButtonModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new frm::OButtonModel(component));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OButtonControl_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx
index 94c206033028..a0b0e24c82ab 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -266,14 +266,14 @@ bool OCheckBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OCheckBoxModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new frm::OCheckBoxModel(component));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OCheckBoxControl_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 4db71e5b604d..5df2b3572de8 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -893,14 +893,14 @@ css::uno::Sequence<OUString> SAL_CALL OComboBoxControl::getSupportedServiceNames
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OComboBoxModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new frm::OComboBoxModel(component));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OComboBoxControl_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index 793940f17229..441b7b526d7c 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -224,14 +224,14 @@ void OCurrencyModel::resetNoBroadcast()
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OCurrencyModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new frm::OCurrencyModel(component));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OCurrencyControl_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 5f8fe4d15c88..2c154ac795b8 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -4040,7 +4040,7 @@ void SAL_CALL ODatabaseForm::setName(const OUString& aName)
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_forms_ODatabaseForm_get_implementation(css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 117533ed7b5a..e8596a0136ab 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -311,14 +311,14 @@ Sequence< Type > ODateModel::getSupportedBindingTypes()
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_ODateModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new frm::ODateModel(component));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_ODateControl_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 0b5dc04019a9..ae7c1fac25e5 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -694,14 +694,14 @@ Any OEditModel::getDefaultForReset() const
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OEditModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new frm::OEditModel(component));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OEditControl_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 7b796897cde5..ed304deb4b2d 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -266,7 +266,7 @@ void OFileControlModel::removeResetListener(const Reference<XResetListener>& _rx
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OFileControlModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 537ee2b5a60a..4bca83480512 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -887,7 +887,7 @@ namespace frm
}
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_forms_OFilterControl_get_implementation(css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx
index a734433d559b..a144518e488f 100644
--- a/forms/source/component/FixedText.cxx
+++ b/forms/source/component/FixedText.cxx
@@ -108,7 +108,7 @@ void SAL_CALL OFixedTextModel::read(const Reference<XObjectInputStream>& _rxInSt
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OFixedTextModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index c84c219cc309..acd0ad6ea05d 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -1006,7 +1006,7 @@ void OFormattedModel::resetNoBroadcast()
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OFormattedControl_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index 88b33c0d0e37..ac206428700f 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -342,7 +342,7 @@ void OFormattedFieldWrapper::ensureAggregate()
osl_atomic_decrement(&m_refCount);
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OFormattedFieldWrapper_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
@@ -352,7 +352,7 @@ com_sun_star_form_OFormattedFieldWrapper_get_implementation(css::uno::XComponent
return inst.get();
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_forms_OFormattedFieldWrapper_ForcedFormatted_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index a9e49f9f8ca0..567725d926e6 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -138,7 +138,7 @@ css::uno::Reference<css::uno::XInterface> OFormsCollection::getParent()
return m_xParent;
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OFormsCollection_get_implementation(css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 522c0de7c94a..2bcce028a6c6 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -990,7 +990,7 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream)
}
-extern "C" SAL_DLLPUBLIC_EXPORT XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT XInterface*
com_sun_star_form_OGridControlModel_get_implementation(XComponentContext* component,
Sequence<Any> const &)
{
diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx
index 46d79c00a793..7e727c21436e 100644
--- a/forms/source/component/GroupBox.cxx
+++ b/forms/source/component/GroupBox.cxx
@@ -139,7 +139,7 @@ css::uno::Sequence<OUString> SAL_CALL OGroupBoxControl::getSupportedServiceNames
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OGroupBoxModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
@@ -147,7 +147,7 @@ com_sun_star_form_OGroupBoxModel_get_implementation(css::uno::XComponentContext*
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OGroupBoxControl_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index d8507313a9e2..d5a1b8fe7853 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -160,7 +160,7 @@ void SAL_CALL OHiddenModel::read(const Reference<XObjectInputStream>& _rxInStrea
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OHiddenModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index cb3979ecca88..e4212c5ed46f 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -222,14 +222,14 @@ void SAL_CALL OImageButtonControl::mouseExited(const awt::MouseEvent& /*e*/)
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OImageButtonModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new frm::OImageButtonModel(component));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OImageButtonControl_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 277631c96a2c..fb9cfb41f062 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -976,14 +976,14 @@ void SAL_CALL OImageControlControl::mouseExited(const awt::MouseEvent& /*e*/)
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OImageControlModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new frm::OImageControlModel(component));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OImageControlControl_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index fd889c9d667d..83b30b5a130b 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -2204,14 +2204,14 @@ namespace frm
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OListBoxModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new frm::OListBoxModel(component));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OListBoxControl_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx
index f537cff50bc5..73170bea426a 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.cxx
@@ -173,14 +173,14 @@ void ONumericModel::resetNoBroadcast()
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_ONumericModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new frm::ONumericModel(component));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_ONumericControl_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx
index 1f92f6218c68..049bba3d6858 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -207,14 +207,14 @@ void OPatternModel::resetNoBroadcast()
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OPatternModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new frm::OPatternModel(component));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OPatternControl_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index 8946a49d4554..45cabba88362 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -379,14 +379,14 @@ bool ORadioButtonModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_ORadioButtonModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new frm::ORadioButtonModel(component));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_ORadioButtonControl_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx
index f54e160c038c..3e580c8451c2 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -303,14 +303,14 @@ Sequence< Type > OTimeModel::getSupportedBindingTypes()
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OTimeModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new frm::OTimeModel(component));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_OTimeControl_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index cfa5e528afcc..f322c94403d0 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -518,7 +518,7 @@ void ImageProducer::initialize( const css::uno::Sequence< css::uno::Any >& aArgu
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_ImageProducer_get_implementation(css::uno::XComponentContext*,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx
index 4762f805274c..66b31fc05835 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -449,7 +449,7 @@ namespace frm
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_form_ONavigationBarModel_get_implementation(css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index 52cce8bc3522..3cacdbdb8ace 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -295,7 +295,7 @@ namespace frm
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_forms_OScrollBarModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index 7c257dd21544..a666ccf88d81 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -249,7 +249,7 @@ namespace frm
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_forms_OSpinButtonModel_get_implementation(css::uno::XComponentContext* component,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 2bef6b43fb43..08238d452db8 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -653,7 +653,7 @@ namespace frm
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_form_ORichTextControl_get_implementation(css::uno::XComponentContext*,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index b0a6318e45ea..493338eacbff 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -602,7 +602,7 @@ namespace frm
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_forms_ORichTextModel_get_implementation(css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 4ae5e1c691d1..08c225893873 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -1752,7 +1752,7 @@ namespace frm
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_forms_FormOperations_get_implementation(css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 545cb444d821..54a88b9bcd1c 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -488,7 +488,7 @@ namespace frm
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_form_ONavigationBarControl_get_implementation (css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index 1ac41a3f47c2..c714d5b053dc 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -632,7 +632,7 @@ css::uno::Sequence<OUString> Model::getSupportedServiceNames()
return css::uno::Sequence<OUString>{"com.sun.star.xforms.Model"};
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_form_Model_get_implementation(css::uno::XComponentContext*,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/forms/source/xforms/xforms_services.cxx b/forms/source/xforms/xforms_services.cxx
index 9c6081abe2af..b6f39fe5ae69 100644
--- a/forms/source/xforms/xforms_services.cxx
+++ b/forms/source/xforms/xforms_services.cxx
@@ -49,7 +49,7 @@ class Implementation:
}
-extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
com_sun_star_form_XForms_get_implementation(uno::XComponentContext*,
uno::Sequence<uno::Any> const &)
{
diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx
index fd97a359d3c6..576d8d957e9e 100644
--- a/forms/source/xforms/xpathlib/extension.cxx
+++ b/forms/source/xforms/xpathlib/extension.cxx
@@ -62,7 +62,7 @@ void SAL_CALL CLibxml2XFormsExtension::initialize(const Sequence< Any >& aSequen
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_xml_xpath_XFormsExtension_get_implementation(css::uno::XComponentContext*,
css::uno::Sequence<css::uno::Any> const &)
{
diff --git a/formula/source/core/api/services.cxx b/formula/source/core/api/services.cxx
index 2b346244898c..9010ee8be870 100644
--- a/formula/source/core/api/services.cxx
+++ b/formula/source/core/api/services.cxx
@@ -42,7 +42,7 @@ cppu::ImplementationEntry entries[] = {
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL for_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * for_component_getFactory(
char const * implName, void * serviceManager, void * registryKey)
{
return cppu::component_getFactoryHelper(
diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx
index de0f3123bec7..ed8313c67dbd 100644
--- a/fpicker/source/office/fps_office.cxx
+++ b/fpicker/source/office/fps_office.cxx
@@ -50,7 +50,7 @@ static const cppu::ImplementationEntry g_entries[] =
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL fps_office_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * fps_office_component_getFactory(
const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper (
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index 651b6d0ed4a9..d6160e19d4d2 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -188,7 +188,7 @@ void DocumentAcceleratorConfiguration::fillCache()
} // 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_DocumentAcceleratorConfiguration_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &arguments)
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index 08e861f0778b..36691cb3f2d7 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -129,7 +129,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_framework_GlobalAcceleratorConfiguration_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index fe02406cd39f..699de38760b4 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -149,7 +149,7 @@ void ModuleAcceleratorConfiguration::fillCache()
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_ModuleAcceleratorConfiguration_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &arguments)
diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx
index fd2684b4991a..1fb1abead10c 100644
--- a/framework/source/fwe/classes/sfxhelperfunctions.cxx
+++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::frame;
namespace framework
{
-pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator )
+pfunc_setToolBoxControllerCreator SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator )
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
pfunc_setToolBoxControllerCreator pOldSetToolBoxControllerCreator = pToolBoxControllerCreator;
@@ -43,7 +43,7 @@ pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_se
return pOldSetToolBoxControllerCreator;
}
-svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL )
+svt::ToolboxController* CreateToolBoxController( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL )
{
pfunc_setToolBoxControllerCreator pFactory = nullptr;
{
@@ -57,7 +57,7 @@ svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFram
return nullptr;
}
-pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator )
+pfunc_setStatusBarControllerCreator SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator )
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
pfunc_setStatusBarControllerCreator pOldSetStatusBarControllerCreator = pSetStatusBarControllerCreator;
@@ -65,7 +65,7 @@ pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfun
return pOldSetStatusBarControllerCreator;
}
-svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const OUString& aCommandURL )
+svt::StatusbarController* CreateStatusBarController( const Reference< XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const OUString& aCommandURL )
{
pfunc_setStatusBarControllerCreator pFactory = nullptr;
{
@@ -79,7 +79,7 @@ svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< X
return nullptr;
}
-pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pNewRefreshToolbarsFunc )
+pfunc_getRefreshToolbars SetRefreshToolbars( pfunc_getRefreshToolbars pNewRefreshToolbarsFunc )
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
pfunc_getRefreshToolbars pOldFunc = pRefreshToolbars;
@@ -88,7 +88,7 @@ pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars p
return pOldFunc;
}
-void SAL_CALL RefreshToolbars( css::uno::Reference< css::frame::XFrame > const & rFrame )
+void RefreshToolbars( css::uno::Reference< css::frame::XFrame > const & rFrame )
{
pfunc_getRefreshToolbars pCallback = nullptr;
{
@@ -100,7 +100,7 @@ void SAL_CALL RefreshToolbars( css::uno::Reference< css::frame::XFrame > const &
(*pCallback)( rFrame );
}
-pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingWindow pNewCreateDockingWindow )
+pfunc_createDockingWindow SetDockingWindowCreator( pfunc_createDockingWindow pNewCreateDockingWindow )
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
pfunc_createDockingWindow pOldFunc = pCreateDockingWindow;
@@ -109,7 +109,7 @@ pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingW
return pOldFunc;
}
-void SAL_CALL CreateDockingWindow( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceURL )
+void CreateDockingWindow( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceURL )
{
pfunc_createDockingWindow pFactory = nullptr;
{
@@ -121,7 +121,7 @@ void SAL_CALL CreateDockingWindow( const css::uno::Reference< css::frame::XFrame
(*pFactory)( rFrame, rResourceURL );
}
-pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pNewIsDockingWindowVisible)
+pfunc_isDockingWindowVisible SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pNewIsDockingWindowVisible)
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
pfunc_isDockingWindowVisible pOldFunc = pIsDockingWindowVisible;
@@ -130,7 +130,7 @@ pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDocking
return pOldFunc;
}
-bool SAL_CALL IsDockingWindowVisible( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceURL )
+bool IsDockingWindowVisible( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceURL )
{
pfunc_isDockingWindowVisible pCall = nullptr;
{
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 627a3b2735fe..fc4e04283fdf 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -557,7 +557,7 @@ void StatusIndicatorFactory::impl_stopWakeUpThread()
} // 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_StatusIndicatorFactory_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index 85bf876140a3..3840630ccea6 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -488,7 +488,7 @@ void SAL_CALL JobDispatch::removeStatusListener( /*IN*/ const css::uno::Referenc
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_jobs_JobDispatch_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index 23977920ee36..7c9d70479120 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -411,7 +411,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_framework_JobExecutor_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 2012ee2576bb..3c43acb8e9d4 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -3076,7 +3076,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL LayoutManager::getPropertySet
} // 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_LayoutManager_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx
index 59eca7c933a6..596242d654f7 100644
--- a/framework/source/services/ContextChangeEventMultiplexer.cxx
+++ b/framework/source/services/ContextChangeEventMultiplexer.cxx
@@ -384,7 +384,7 @@ static Hook g_hook;
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
org_apache_openoffice_comp_framework_ContextChangeEventMultiplexer_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 0309f91bc9da..dd93c89d10d3 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -4263,7 +4263,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_framework_AutoRecovery_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 5fc7a7fc4ce7..b7fc1a152ed3 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -1823,7 +1823,7 @@ Instance & getInstance(css::uno::Reference<css::uno::XComponentContext> const& x
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_Desktop_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 04441dc5c84c..a1dacfb93ff9 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -3303,7 +3303,7 @@ void Frame::impl_checkMenuCloser()
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_Frame_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 2df0088a1c89..bf4a153ec3ee 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -363,7 +363,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_framework_ModuleManager_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 26bd6bfae718..c16a5b1e95cd 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -1495,7 +1495,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_framework_PathSettings_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index e47dae89135d..cee04dd3b3b3 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -404,7 +404,7 @@ void SessionListener::doQuit()
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_frame_SessionListener_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index ce7e0b4491ae..72bcfb940b69 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -705,7 +705,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_framework_PathSubstitution_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index b6f6a7ff1920..26708477a502 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -361,7 +361,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_framework_TaskCreator_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index 623754f87c2c..493acda1fa4c 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -309,7 +309,7 @@ OUString SAL_CALL URLTransformer::getPresentation( const css::util::URL& aURL,
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_URLTransformer_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index 225b51231d05..1884dec9d5eb 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -178,7 +178,7 @@ sal_Bool SAL_CALL ImageManager::isReadOnly()
} // 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_ImageManager_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index d10f944a876c..e451113d9aa1 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -197,7 +197,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_framework_ModuleUIConfigurationManagerSupplier_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 12867b100403..49f3db5ca722 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -1668,7 +1668,7 @@ void ModuleUIConfigurationManager::implts_notifyContainerListener( const ui::Con
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_ModuleUIConfigurationManager_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &arguments)
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 5250811477d9..89287f145567 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -405,7 +405,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_framework_UICategoryDescription_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 01c4becd60ff..45dd1bf4e00a 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -1394,7 +1394,7 @@ void UIConfigurationManager::implts_notifyContainerListener( const Configuration
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_UIConfigurationManager_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 9b0523e48b16..257d2f978125 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -1405,7 +1405,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_framework_WindowStateConfiguration_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 38c99e7caf2a..a2e6ff54edaa 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -359,7 +359,7 @@ void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArgumen
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_ControlMenuController_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 625436d4cd2b..e2084c782172 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -358,7 +358,7 @@ void SAL_CALL LangSelectionStatusbarController::statusChanged( const FeatureStat
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_LangSelectionStatusbarController_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 627ae94114c4..d868d33aa138 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -145,7 +145,7 @@ void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Even
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_ObjectMenuController_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 675fe07f9ec2..3a2065fa6578 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -811,7 +811,7 @@ void NewToolbarController::setItemImage( const OUString &rCommand )
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_GenericPopupToolbarController_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &args)
@@ -819,7 +819,7 @@ com_sun_star_comp_framework_GenericPopupToolbarController_get_implementation(
return cppu::acquire(new GenericPopupToolbarController(context, args));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_SaveToolbarController_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
@@ -827,7 +827,7 @@ com_sun_star_comp_framework_SaveToolbarController_get_implementation(
return cppu::acquire(new SaveToolbarController(context));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
org_apache_openoffice_comp_framework_NewToolbarController_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 763862240844..aa2beac0cd25 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -378,7 +378,7 @@ void SAL_CALL RecentFilesMenuController::dispatch(
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_RecentFilesMenuController_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &args)
diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx
index 735b5ae64d65..ec8d173ecf08 100644
--- a/framework/source/uielement/resourcemenucontroller.cxx
+++ b/framework/source/uielement/resourcemenucontroller.cxx
@@ -442,7 +442,7 @@ OUString SaveAsMenuController::getImplementationName()
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_ResourceMenuController_get_implementation(
css::uno::XComponentContext* context,
css::uno::Sequence< css::uno::Any > const & args )
@@ -450,7 +450,7 @@ com_sun_star_comp_framework_ResourceMenuController_get_implementation(
return cppu::acquire( new ResourceMenuController( context, args, false ) );
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_ToolbarAsMenuController_get_implementation(
css::uno::XComponentContext* context,
css::uno::Sequence< css::uno::Any > const & args )
@@ -458,7 +458,7 @@ com_sun_star_comp_framework_ToolbarAsMenuController_get_implementation(
return cppu::acquire( new ResourceMenuController( context, args, true ) );
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_SaveAsMenuController_get_implementation(
css::uno::XComponentContext* context,
css::uno::Sequence< css::uno::Any > const & args )
diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx
index e712dd3801a5..52dfdd4b7975 100644
--- a/framework/source/uielement/subtoolbarcontroller.cxx
+++ b/framework/source/uielement/subtoolbarcontroller.cxx
@@ -431,7 +431,7 @@ css::uno::Sequence< OUString > SubToolBarController::getSupportedServiceNames()
return {"com.sun.star.frame.ToolbarController"};
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_SubToolBarController_get_implementation(
css::uno::XComponentContext*,
css::uno::Sequence<css::uno::Any> const & rxArgs )
diff --git a/framework/source/uielement/thesaurusmenucontroller.cxx b/framework/source/uielement/thesaurusmenucontroller.cxx
index d5eeca206f1f..6ce5bca1d141 100644
--- a/framework/source/uielement/thesaurusmenucontroller.cxx
+++ b/framework/source/uielement/thesaurusmenucontroller.cxx
@@ -154,7 +154,7 @@ css::uno::Sequence< OUString > ThesaurusMenuController::getSupportedServiceNames
return { "com.sun.star.frame.PopupMenuController" };
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_ThesaurusMenuController_get_implementation(
css::uno::XComponentContext* xContext,
css::uno::Sequence< css::uno::Any > const & )
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index ab76bdca2e76..4b5734d52566 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -737,7 +737,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_framework_UICommandDescription_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx
index 520525366a5c..fd0106bfc2e4 100644
--- a/framework/source/uifactory/addonstoolbarfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -208,7 +208,7 @@ Reference< XUIElement > SAL_CALL AddonsToolBarFactory::createUIElement(
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_AddonsToolBarFactory_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx
index 4612f53bc81d..b8218a5379b1 100644
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -162,7 +162,7 @@ void MenuBarFactory::CreateUIElement(const OUString& ResourceURL
} // 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_MenuBarFactory_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx
index 1644e8447d73..085062afd0f2 100644
--- a/framework/source/uifactory/statusbarfactory.cxx
+++ b/framework/source/uifactory/statusbarfactory.cxx
@@ -76,7 +76,7 @@ Reference< XUIElement > SAL_CALL StatusBarFactory::createUIElement(
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_StatusBarFactory_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/uifactory/toolbarfactory.cxx b/framework/source/uifactory/toolbarfactory.cxx
index 6e6391ec994e..cc44bfb58360 100644
--- a/framework/source/uifactory/toolbarfactory.cxx
+++ b/framework/source/uifactory/toolbarfactory.cxx
@@ -75,7 +75,7 @@ Reference< XUIElement > SAL_CALL ToolBarFactory::createUIElement(
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_ToolBarFactory_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx
index a13c654f19a5..8603ad0e3643 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -369,7 +369,7 @@ struct StatusbarControllerFactorySingleton:
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_PopupMenuControllerFactory_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
@@ -378,7 +378,7 @@ com_sun_star_comp_framework_PopupMenuControllerFactory_get_implementation(
PopupMenuControllerFactorySingleton::get(context).instance.get()));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_ToolBarControllerFactory_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
@@ -387,7 +387,7 @@ com_sun_star_comp_framework_ToolBarControllerFactory_get_implementation(
ToolbarControllerFactorySingleton::get(context).instance.get()));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_StatusBarControllerFactory_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index a3b33637ca8a..f8d56dff3eab 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -560,7 +560,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_framework_UIElementFactoryManager_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx
index ad96f9a63bf7..f8911939dc6b 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -211,7 +211,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_framework_WindowContentFactoryManager_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index d1005e4cf1ee..1762efdb141a 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -116,7 +116,7 @@ HwpReader::~HwpReader()
{
}
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportHWP(SvStream &rStream)
+extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportHWP(SvStream &rStream)
{
try
{
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index fa9a1fcf8f8c..bf823d5e12e3 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -291,7 +291,7 @@ Sequence< OUString> HwpImportFilter::getSupportedServiceNames()
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL hwp_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * )
+ SAL_DLLPUBLIC_EXPORT void * hwp_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * )
{
void * pRet = nullptr;
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index 1ac3fd64af53..0f5cb29dfa84 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -122,7 +122,7 @@ Boundary SAL_CALL BreakIteratorImpl::nextWord( const OUString& Text, sal_Int32 n
return result;
}
-static inline bool SAL_CALL isCJK( const Locale& rLocale ) {
+static inline bool isCJK( const Locale& rLocale ) {
return rLocale.Language == "zh" || rLocale.Language == "ja" || rLocale.Language == "ko";
}
@@ -252,7 +252,7 @@ sal_Int16 SAL_CALL BreakIteratorImpl::getScriptType( const OUString& Text, sal_I
/** Increments/decrements position first, then obtains character.
@return current position, may be -1 or text length if string was consumed.
*/
-static sal_Int32 SAL_CALL iterateCodePoints(const OUString& Text, sal_Int32 &nStartPos, sal_Int32 inc, sal_uInt32& ch) {
+static sal_Int32 iterateCodePoints(const OUString& Text, sal_Int32 &nStartPos, sal_Int32 inc, sal_uInt32& ch) {
sal_Int32 nLen = Text.getLength();
if (nStartPos + inc < 0 || nStartPos + inc >= nLen) {
ch = 0;
@@ -634,7 +634,7 @@ BreakIteratorImpl::getSupportedServiceNames()
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_i18n_BreakIterator_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx
index 6e304cabd728..36ced38daba8 100644
--- a/i18npool/source/breakiterator/breakiterator_th.cxx
+++ b/i18npool/source/breakiterator/breakiterator_th.cxx
@@ -79,7 +79,7 @@ static const sal_Int16 thaiCompRel[MAX_CT][MAX_CT] = {
const sal_uInt32 is_ST_COM = (1<<CT_CTRL)|(1<<CT_NON)|(1<<CT_CONS)|(1<<CT_TONE);
-static sal_uInt16 SAL_CALL getCombState(const sal_Unicode *text, sal_Int32 pos)
+static sal_uInt16 getCombState(const sal_Unicode *text, sal_Int32 pos)
{
sal_uInt16 ch1 = getCharType(text[pos]);
sal_uInt16 ch2 = getCharType(text[pos+1]);
@@ -95,7 +95,7 @@ static sal_uInt16 SAL_CALL getCombState(const sal_Unicode *text, sal_Int32 pos)
}
-static sal_Int32 SAL_CALL getACell(const sal_Unicode *text, sal_Int32 pos, sal_Int32 len)
+static sal_Int32 getACell(const sal_Unicode *text, sal_Int32 pos, sal_Int32 len)
{
sal_uInt32 curr = 1;
for (; pos + 1 < len && getCombState(text, pos) == ST_COM; curr++, pos++) {}
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 3ed048b02253..a81a80e153ba 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -609,7 +609,7 @@ BreakIterator_Unicode::getSupportedServiceNames()
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_i18n_BreakIterator_Unicode_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index 5653021fc13a..6ee5256328df 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -37,7 +37,7 @@ namespace i18npool {
#elif !defined DISABLE_DYNLOADING
-extern "C" { static void SAL_CALL thisModule() {} }
+extern "C" { static void thisModule() {} }
#else
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index 4d6d0ff279b3..712eeb1ff6d7 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -612,7 +612,7 @@ Calendar_gregorian::isValid()
// NatNum3 NatNum3/3/3/3 NatNum3/3/3/3 NatNum3/3/3/3 NatNum3/3/3/3
// NatNum4 NatNum9/9/11/11
-static sal_Int16 SAL_CALL NatNumForCalendar(const css::lang::Locale& aLocale,
+static sal_Int16 NatNumForCalendar(const css::lang::Locale& aLocale,
sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, sal_Int16 value )
{
bool isShort = ((nCalendarDisplayCode == CalendarDisplayCode::SHORT_YEAR ||
@@ -645,7 +645,7 @@ static sal_Int16 SAL_CALL NatNumForCalendar(const css::lang::Locale& aLocale,
return nNativeNumberMode;
}
-static sal_Int32 SAL_CALL DisplayCode2FieldIndex(sal_Int32 nCalendarDisplayCode)
+static sal_Int32 DisplayCode2FieldIndex(sal_Int32 nCalendarDisplayCode)
{
switch( nCalendarDisplayCode ) {
case CalendarDisplayCode::SHORT_DAY:
diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx
index 12e7d6b1e398..00f84d5b5472 100644
--- a/i18npool/source/characterclassification/cclass_unicode.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode.cxx
@@ -296,7 +296,7 @@ Sequence< OUString > SAL_CALL cclass_Unicode::getSupportedServiceNames()
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_i18n_CharacterClassification_Unicode_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx
index 8e925653e9ab..ccccbe432bf9 100644
--- a/i18npool/source/characterclassification/characterclassificationImpl.cxx
+++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx
@@ -208,7 +208,7 @@ CharacterClassificationImpl::getSupportedServiceNames()
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_i18n_CharacterClassification_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/i18npool/source/characterclassification/unoscripttypedetector.cxx b/i18npool/source/characterclassification/unoscripttypedetector.cxx
index fbc2ab8ea3f5..aab05b8c2c93 100644
--- a/i18npool/source/characterclassification/unoscripttypedetector.cxx
+++ b/i18npool/source/characterclassification/unoscripttypedetector.cxx
@@ -81,7 +81,7 @@ UnoScriptTypeDetector::getSupportedServiceNames()
return aRet;
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_i18n_ScriptTypeDetector_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx
index 1f6de90d125e..b9eed0230c40 100644
--- a/i18npool/source/collator/collatorImpl.cxx
+++ b/i18npool/source/collator/collatorImpl.cxx
@@ -228,7 +228,7 @@ CollatorImpl::getSupportedServiceNames()
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_i18n_Collator_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 22b7ed9ae492..71bc4ed84d1e 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -127,7 +127,7 @@ Collator_Unicode::compareString( const OUString& str1, const OUString& str2)
#ifndef DISABLE_DYNLOADING
-extern "C" { static void SAL_CALL thisModule() {} }
+extern "C" { static void thisModule() {} }
#endif
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 861d58f8e7cc..7eef17dddd1a 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -1064,7 +1064,7 @@ Sequence< OUString > DefaultNumberingProvider::getSupportedServiceNames()
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_text_DefaultNumberingProvider_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
index 8020648ecc5b..b535fd934884 100644
--- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
@@ -29,7 +29,7 @@ namespace i18npool {
#ifndef DISABLE_DYNLOADING
-extern "C" { static void SAL_CALL thisModule() {} }
+extern "C" { static void thisModule() {} }
#endif
diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx
index fc92cea926c0..5cd1edcd6178 100644
--- a/i18npool/source/inputchecker/inputsequencechecker.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker.cxx
@@ -156,7 +156,7 @@ InputSequenceCheckerImpl::getSupportedServiceNames()
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_i18n_InputSequenceChecker_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/i18npool/source/inputchecker/inputsequencechecker_th.cxx b/i18npool/source/inputchecker/inputsequencechecker_th.cxx
index bc2fbe239808..c01d4ff35089 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_th.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_th.cxx
@@ -62,7 +62,7 @@ bool const TAC_Composible[3][5] = {
/* Mode 2 */ {true, true, false, false, true} // STRICT = 2
};
-static bool SAL_CALL check(sal_Unicode ch1, sal_Unicode ch2, sal_Int16 inputCheckMode)
+static bool check(sal_Unicode ch1, sal_Unicode ch2, sal_Int16 inputCheckMode)
{
sal_Int16 composible_class;
switch (TAC_celltype_inputcheck[getCharType(ch1)][getCharType(ch2)]) {
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 64c619466dfa..9d67a151fed2 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -38,10 +38,10 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star;
-typedef sal_Unicode** (SAL_CALL * MyFunc_Type)( sal_Int16&);
-typedef sal_Unicode const *** (SAL_CALL * MyFunc_Type2)( sal_Int16&, sal_Int16& );
-typedef sal_Unicode const **** (SAL_CALL * MyFunc_Type3)( sal_Int16&, sal_Int16&, sal_Int16& );
-typedef sal_Unicode const * const * (SAL_CALL * MyFunc_FormatCode)( sal_Int16&, sal_Unicode const *&, sal_Unicode const *& );
+typedef sal_Unicode** (* MyFunc_Type)( sal_Int16&);
+typedef sal_Unicode const *** (* MyFunc_Type2)( sal_Int16&, sal_Int16& );
+typedef sal_Unicode const **** (* MyFunc_Type3)( sal_Int16&, sal_Int16&, sal_Int16& );
+typedef sal_Unicode const * const * (* MyFunc_FormatCode)( sal_Int16&, sal_Unicode const *&, sal_Unicode const *& );
#ifndef DISABLE_DYNLOADING
@@ -466,7 +466,7 @@ LocaleDataImpl::getLocaleItem2( const Locale& rLocale )
#ifndef DISABLE_DYNLOADING
-extern "C" { static void SAL_CALL thisModule() {} }
+extern "C" { static void thisModule() {} }
#endif
@@ -1641,7 +1641,7 @@ OUString LocaleDataImpl::getFirstLocaleServiceName( const css::lang::Locale & rL
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_i18n_LocaleDataImpl_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index f3b2b6786324..3c528e2f895e 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -58,12 +58,12 @@ typedef struct {
namespace i18npool {
-OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, bool useGeresh);
+OUString getHebrewNativeNumberString(const OUString& aNumberString, bool useGeresh);
-OUString SAL_CALL getCyrillicNativeNumberString(const OUString& aNumberString);
+OUString getCyrillicNativeNumberString(const OUString& aNumberString);
/// @throws RuntimeException
-OUString SAL_CALL AsciiToNativeChar( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
+OUString AsciiToNativeChar( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
Sequence< sal_Int32 >& offset, bool useOffset, sal_Int16 number )
{
const sal_Unicode *src = inStr.getStr() + startPos;
@@ -91,7 +91,7 @@ OUString SAL_CALL AsciiToNativeChar( const OUString& inStr, sal_Int32 startPos,
return OUString(newStr, SAL_NO_ACQUIRE); // take ownership
}
-bool SAL_CALL AsciiToNative_numberMaker(const sal_Unicode *str, sal_Int32 begin, sal_Int32 len,
+bool AsciiToNative_numberMaker(const sal_Unicode *str, sal_Int32 begin, sal_Int32 len,
sal_Unicode *dst, sal_Int32& count, sal_Int16 multiChar_index, Sequence< sal_Int32 >& offset, bool useOffset, sal_Int32 startPos,
const Number *number, const sal_Unicode* numberChar)
{
@@ -163,7 +163,7 @@ bool SAL_CALL AsciiToNative_numberMaker(const sal_Unicode *str, sal_Int32 begin,
}
/// @throws RuntimeException
-OUString SAL_CALL AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
+OUString AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
Sequence< sal_Int32 >& offset, bool useOffset, const Number* number )
{
OUString aRet;
@@ -250,7 +250,7 @@ OUString SAL_CALL AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_
}
return aRet;
}
-static void SAL_CALL NativeToAscii_numberMaker(sal_Int16 max, sal_Int16 prev, const sal_Unicode *str,
+static void NativeToAscii_numberMaker(sal_Int16 max, sal_Int16 prev, const sal_Unicode *str,
sal_Int32& i, sal_Int32 nCount, sal_Unicode *dst, sal_Int32& count, Sequence< sal_Int32 >& offset, bool useOffset,
OUString& numberChar, OUString& multiplierChar)
{
@@ -300,7 +300,7 @@ static void SAL_CALL NativeToAscii_numberMaker(sal_Int16 max, sal_Int16 prev, co
}
/// @throws RuntimeException
-static OUString SAL_CALL NativeToAscii(const OUString& inStr,
+static OUString NativeToAscii(const OUString& inStr,
sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, bool useOffset )
{
OUString aRet;
@@ -511,7 +511,7 @@ static const sal_Int16 natnum2[] = {
};
static const sal_Int16 sizeof_natnum2 = SAL_N_ELEMENTS(natnum2);
-static sal_Int16 SAL_CALL getLanguageNumber( const Locale& rLocale)
+static sal_Int16 getLanguageNumber( const Locale& rLocale)
{
// return zh_TW for TW, HK and MO, return zh_CN for other zh locales.
if (rLocale.Language == "zh") return MsLangId::isTraditionalChinese(rLocale) ? 1 : 0;
@@ -881,7 +881,7 @@ void makeHebrewNumber(sal_Int64 value, OUStringBuffer& output, bool isLast, bool
}
}
-OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, bool useGeresh)
+OUString getHebrewNativeNumberString(const OUString& aNumberString, bool useGeresh)
{
sal_Int64 value = 0;
sal_Int32 i, count = 0, len = aNumberString.getLength();
@@ -1000,7 +1000,7 @@ void makeCyrillicNumber(sal_Int64 value, OUStringBuffer& output, bool addTitlo)
}
}
-OUString SAL_CALL getCyrillicNativeNumberString(const OUString& aNumberString)
+OUString getCyrillicNativeNumberString(const OUString& aNumberString)
{
sal_Int64 value = 0;
sal_Int32 i, count = 0, len = aNumberString.getLength();
@@ -1054,7 +1054,7 @@ NativeNumberSupplierService::getSupportedServiceNames()
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_i18n_NativeNumberSupplier_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx
index 1ffafe63fa8c..ac8454caf9d8 100644
--- a/i18npool/source/numberformatcode/numberformatcode.cxx
+++ b/i18npool/source/numberformatcode/numberformatcode.cxx
@@ -262,7 +262,7 @@ NumberFormatCodeMapper::getSupportedServiceNames()
return aRet;