diff options
Diffstat (limited to 'extensions')
39 files changed, 76 insertions, 76 deletions
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, |