From 3af500580b1c82eabd60335c9ebc458a3f68850c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 8 Dec 2017 15:58:41 +0200 Subject: loplugin:salcall fix functions since cdecl is the default calling convention on Windows for such functions, the annotation is redundant. Change-Id: I1a85fa27e5ac65ce0e04a19bde74c90800ffaa2d Reviewed-on: https://gerrit.libreoffice.org/46164 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svx/source/core/coreservices.cxx | 2 +- .../customshapes/EnhancedCustomShapeEngine.cxx | 2 +- svx/source/dialog/SafeModeUI.cxx | 2 +- svx/source/fmcomp/fmgridif.cxx | 2 +- svx/source/fmcomp/gridcols.cxx | 2 +- svx/source/form/formcontroller.cxx | 2 +- svx/source/form/legacyformcontroller.cxx | 2 +- svx/source/form/xfm_addcondition.cxx | 6 ++-- svx/source/inc/coreservices.hxx | 36 +++++++++++----------- svx/source/inc/fmservs.hxx | 12 ++++---- svx/source/mnuctrls/smarttagmenu.cxx | 2 +- svx/source/sdr/primitive2d/primitivefactory2d.cxx | 2 +- svx/source/sidebar/PanelFactory.cxx | 2 +- svx/source/svdraw/svdhdl.cxx | 2 +- svx/source/tbxctrls/bulletsnumbering.cxx | 2 +- svx/source/tbxctrls/extrusioncontrols.cxx | 24 +++++++-------- svx/source/tbxctrls/fontworkgallery.cxx | 12 ++++---- svx/source/tbxctrls/linectrl.cxx | 2 +- svx/source/tbxctrls/tbcontrl.cxx | 8 ++--- svx/source/tbxctrls/tbunocontroller.cxx | 2 +- svx/source/tbxctrls/tbunosearchcontrollers.cxx | 18 +++++------ .../unodialogs/textconversiondlgs/services.cxx | 2 +- svx/source/unodraw/UnoGraphicExporter.cxx | 2 +- svx/source/unodraw/UnoNamespaceMap.cxx | 6 ++-- svx/source/unodraw/XPropertyTable.cxx | 12 ++++---- svx/source/unodraw/gluepts.cxx | 2 +- svx/source/unodraw/gluepts.hxx | 2 +- svx/source/unodraw/recoveryui.cxx | 2 +- svx/source/unodraw/unobtabl.cxx | 2 +- svx/source/unodraw/unoctabl.cxx | 2 +- svx/source/unodraw/unodtabl.cxx | 2 +- svx/source/unodraw/unogtabl.cxx | 2 +- svx/source/unodraw/unohtabl.cxx | 2 +- svx/source/unodraw/unomtabl.cxx | 2 +- svx/source/unodraw/unoshap2.cxx | 4 +-- svx/source/unodraw/unoshcol.cxx | 2 +- svx/source/unodraw/unottabl.cxx | 2 +- svx/source/unogallery/unogalthemeprovider.cxx | 2 +- svx/source/xml/xmlgrhlp.cxx | 4 +-- 39 files changed, 99 insertions(+), 99 deletions(-) (limited to 'svx/source') diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx index f91442c6282c..032278e6e291 100644 --- a/svx/source/core/coreservices.cxx +++ b/svx/source/core/coreservices.cxx @@ -32,7 +32,7 @@ using namespace com::sun::star::registry; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL svxcore_component_getFactory ( +SAL_DLLPUBLIC_EXPORT void * svxcore_component_getFactory ( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = nullptr; diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 4fd5857b315d..30e7be880d3e 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -458,7 +458,7 @@ Sequence< Reference< drawing::XCustomShapeHandle > > SAL_CALL EnhancedCustomShap } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/svx/source/dialog/SafeModeUI.cxx b/svx/source/dialog/SafeModeUI.cxx index 60a64fdbc2a1..c27fc80fe3c8 100644 --- a/svx/source/dialog/SafeModeUI.cxx +++ b/svx/source/dialog/SafeModeUI.cxx @@ -69,7 +69,7 @@ css::uno::Any SAL_CALL SafeModeUI::dispatchWithReturnValue(const css::util::URL& } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_svx_SafeModeUI_get_implementation( css::uno::XComponentContext * /*context*/, css::uno::Sequence const &) diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index b88e4cd9afe2..ddd58019718d 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -327,7 +327,7 @@ void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _even //= FmXGridControl -Reference< XInterface > SAL_CALL FmXGridControl_NewInstance_Impl(const Reference< XMultiServiceFactory>& _rxFactory) +Reference< XInterface > FmXGridControl_NewInstance_Impl(const Reference< XMultiServiceFactory>& _rxFactory) { return *(new FmXGridControl( comphelper::getComponentContext(_rxFactory) )); } diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx index be80d793e4f4..1dc6aa92eb1b 100644 --- a/svx/source/fmcomp/gridcols.cxx +++ b/svx/source/fmcomp/gridcols.cxx @@ -47,7 +47,7 @@ const css::uno::Sequence& getColumnTypes() // comparison of PropertyInfo -extern "C" int SAL_CALL NameCompare(const void* pFirst, const void* pSecond) +extern "C" int NameCompare(const void* pFirst, const void* pSecond) { return static_cast(pFirst)->compareTo(*static_cast(pSecond)); } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 15be71774403..3a7524ec8f33 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -98,7 +98,7 @@ using namespace ::connectivity; using namespace ::dbtools; -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > FormController_NewInstance_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxORB ) { return *( new ::svxform::FormController( comphelper::getComponentContext(_rxORB) ) ); diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index 0f35b70d4f35..e234ef955de6 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -193,7 +193,7 @@ namespace svxform } -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > LegacyFormController_NewInstance_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxORB ) { return ::svxform::LegacyFormController::Create( _rxORB ); diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index 78382e66f87d..1ab50fa3007f 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -45,19 +45,19 @@ namespace svxform //= OAddConditionDialog - Reference< XInterface > SAL_CALL OAddConditionDialog_Create( const Reference< XMultiServiceFactory > & _rxORB ) + Reference< XInterface > OAddConditionDialog_Create( const Reference< XMultiServiceFactory > & _rxORB ) { return OAddConditionDialog::Create( _rxORB ); } - Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames() + Sequence< OUString > OAddConditionDialog_GetSupportedServiceNames() { return { "com.sun.star.xforms.ui.dialogs.AddCondition" }; } - OUString SAL_CALL OAddConditionDialog_GetImplementationName() + OUString OAddConditionDialog_GetImplementationName() { return OUString("org.openoffice.comp.svx.OAddConditionDialog"); } diff --git a/svx/source/inc/coreservices.hxx b/svx/source/inc/coreservices.hxx index 4f74500738a2..f53ea85c2e81 100644 --- a/svx/source/inc/coreservices.hxx +++ b/svx/source/inc/coreservices.hxx @@ -35,41 +35,41 @@ namespace com { namespace sun { namespace star { namespace svx { -OUString SAL_CALL ExtrusionDepthController_getImplementationName(); +OUString ExtrusionDepthController_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionDepthController_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); +css::uno::Reference< css::uno::XInterface > ExtrusionDepthController_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames(); +css::uno::Sequence< OUString > ExtrusionDepthController_getSupportedServiceNames(); -OUString SAL_CALL ExtrusionDirectionControl_getImplementationName(); +OUString ExtrusionDirectionControl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionDirectionControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); +css::uno::Reference< css::uno::XInterface > ExtrusionDirectionControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames(); +css::uno::Sequence< OUString > ExtrusionDirectionControl_getSupportedServiceNames(); -OUString SAL_CALL ExtrusionLightingControl_getImplementationName(); +OUString ExtrusionLightingControl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionLightingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); +css::uno::Reference< css::uno::XInterface > ExtrusionLightingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames(); +css::uno::Sequence< OUString > ExtrusionLightingControl_getSupportedServiceNames(); -OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName(); +OUString ExtrusionSurfaceControl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionSurfaceControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); +css::uno::Reference< css::uno::XInterface > ExtrusionSurfaceControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames(); +css::uno::Sequence< OUString > ExtrusionSurfaceControl_getSupportedServiceNames(); -OUString SAL_CALL FontworkAlignmentControl_getImplementationName(); +OUString FontworkAlignmentControl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL FontworkAlignmentControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); +css::uno::Reference< css::uno::XInterface > FontworkAlignmentControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames(); +css::uno::Sequence< OUString > FontworkAlignmentControl_getSupportedServiceNames(); -OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName(); +OUString FontworkCharacterSpacingControl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL FontworkCharacterSpacingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); +css::uno::Reference< css::uno::XInterface > FontworkCharacterSpacingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames(); +css::uno::Sequence< OUString > FontworkCharacterSpacingControl_getSupportedServiceNames(); } #endif diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx index 4e1239c65a32..28443a6a8519 100644 --- a/svx/source/inc/fmservs.hxx +++ b/svx/source/inc/fmservs.hxx @@ -82,28 +82,28 @@ namespace svxform { SVX_DLLPUBLIC void ImplSmartRegisterUnoServices(); - css::uno::Reference SAL_CALL + css::uno::Reference OAddConditionDialog_Create( css::uno::Reference const &); - OUString SAL_CALL OAddConditionDialog_GetImplementationName(); + OUString OAddConditionDialog_GetImplementationName(); - css::uno::Sequence SAL_CALL + css::uno::Sequence OAddConditionDialog_GetSupportedServiceNames(); } /// @throws css::uno::Exception -css::uno::Reference SAL_CALL +css::uno::Reference FmXGridControl_NewInstance_Impl( css::uno::Reference const &); /// @throws css::uno::Exception -css::uno::Reference SAL_CALL +css::uno::Reference FormController_NewInstance_Impl( css::uno::Reference const &); /// @throws css::uno::Exception -css::uno::Reference SAL_CALL +css::uno::Reference LegacyFormController_NewInstance_Impl( css::uno::Reference const &); diff --git a/svx/source/mnuctrls/smarttagmenu.cxx b/svx/source/mnuctrls/smarttagmenu.cxx index 401cd0545664..e4a9d171ce59 100644 --- a/svx/source/mnuctrls/smarttagmenu.cxx +++ b/svx/source/mnuctrls/smarttagmenu.cxx @@ -225,7 +225,7 @@ css::uno::Sequence< OUString > SmartTagMenuController::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_svx_SmartTagMenuController_get_implementation( css::uno::XComponentContext* xContext, css::uno::Sequence< css::uno::Any > const & ) diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index caa7c7754410..8520b0ae0f16 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -104,7 +104,7 @@ css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_graphic_PrimitiveFactory2D_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index d834a7bd4b7b..f180d4b3d927 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -189,7 +189,7 @@ Reference SAL_CALL PanelFactory::createUIElement ( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_apache_openoffice_comp_svx_sidebar_PanelFactory_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 930f98419589..ef9634ad0800 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -1877,7 +1877,7 @@ struct ImplHdlAndIndex // Helper method for sorting handles taking care of OrdNums, keeping order in // single objects and re-sorting polygon handles intuitively -extern "C" int SAL_CALL ImplSortHdlFunc( const void* pVoid1, const void* pVoid2 ) +extern "C" int ImplSortHdlFunc( const void* pVoid1, const void* pVoid2 ) { const ImplHdlAndIndex* p1 = static_cast(pVoid1); const ImplHdlAndIndex* p2 = static_cast(pVoid2); diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx index 8180d18977e3..19452663a579 100644 --- a/svx/source/tbxctrls/bulletsnumbering.cxx +++ b/svx/source/tbxctrls/bulletsnumbering.cxx @@ -226,7 +226,7 @@ css::uno::Sequence< OUString > SAL_CALL NumberingToolBoxControl::getSupportedSer 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_svx_NumberingToolBoxControl_get_implementation( css::uno::XComponentContext *rxContext, css::uno::Sequence const & ) diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 1bd7380c39a7..b1e9eaec9b39 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -320,20 +320,20 @@ void SAL_CALL ExtrusionDirectionControl::initialize( const css::uno::Sequence< c // XServiceInfo -OUString SAL_CALL ExtrusionDirectionControl_getImplementationName() +OUString ExtrusionDirectionControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.ExtrusionDirectionController" ); } -Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() +Sequence< OUString > ExtrusionDirectionControl_getSupportedServiceNames() { Sequence aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } -Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance( +Reference< XInterface > ExtrusionDirectionControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) { @@ -573,20 +573,20 @@ void SAL_CALL ExtrusionDepthController::initialize( const css::uno::Sequence< cs // XServiceInfo -OUString SAL_CALL ExtrusionDepthController_getImplementationName() +OUString ExtrusionDepthController_getImplementationName() { return OUString( "com.sun.star.comp.svx.ExtrusionDepthController" ); } -Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() +Sequence< OUString > ExtrusionDepthController_getSupportedServiceNames() { Sequence aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } -Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDepthController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) +Reference< XInterface > ExtrusionDepthController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) { return *new ExtrusionDepthController( comphelper::getComponentContext(rSMgr) ); } @@ -833,20 +833,20 @@ void SAL_CALL ExtrusionLightingControl::initialize( const css::uno::Sequence< cs // XServiceInfo -OUString SAL_CALL ExtrusionLightingControl_getImplementationName() +OUString ExtrusionLightingControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.ExtrusionLightingController" ); } -Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() +Sequence< OUString > ExtrusionLightingControl_getSupportedServiceNames() { Sequence aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } -Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance( +Reference< XInterface > ExtrusionLightingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) { @@ -968,20 +968,20 @@ void SAL_CALL ExtrusionSurfaceControl::initialize( const css::uno::Sequence< css // XServiceInfo -OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName() +OUString ExtrusionSurfaceControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.ExtrusionSurfaceController" ); } -Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() +Sequence< OUString > ExtrusionSurfaceControl_getSupportedServiceNames() { Sequence aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } -Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance( +Reference< XInterface > ExtrusionSurfaceControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) { diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 45bca9404639..ba77ccd5beed 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -377,20 +377,20 @@ void SAL_CALL FontworkAlignmentControl::initialize( const css::uno::Sequence< cs // XServiceInfo -OUString SAL_CALL FontworkAlignmentControl_getImplementationName() +OUString FontworkAlignmentControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.FontworkAlignmentController" ); } -Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() +Sequence< OUString > FontworkAlignmentControl_getSupportedServiceNames() { Sequence aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } -Reference< XInterface > SAL_CALL SAL_CALL FontworkAlignmentControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) +Reference< XInterface > FontworkAlignmentControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) { return *new FontworkAlignmentControl( comphelper::getComponentContext(rSMgr) ); } @@ -601,20 +601,20 @@ void SAL_CALL FontworkCharacterSpacingControl::initialize( const css::uno::Seque // XServiceInfo -OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName() +OUString FontworkCharacterSpacingControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.FontworkCharacterSpacingController" ); } -Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames() +Sequence< OUString > FontworkCharacterSpacingControl_getSupportedServiceNames() { Sequence aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } -Reference< XInterface > SAL_CALL SAL_CALL FontworkCharacterSpacingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) +Reference< XInterface > FontworkCharacterSpacingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) { return *new FontworkCharacterSpacingControl( comphelper::getComponentContext(rSMgr) ); } diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index b9e7b5e222dc..54d30c89687c 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -506,7 +506,7 @@ css::uno::Sequence SvxLineEndToolBoxControl::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_svx_LineEndToolBoxControl_get_implementation( css::uno::XComponentContext* rContext, css::uno::Sequence const & ) diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index cb4432f61d86..7d674171a114 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2749,7 +2749,7 @@ css::uno::Sequence< OUString > SvxFontNameToolBoxControl::getSupportedServiceNam 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_svx_FontNameToolBoxControl_get_implementation( css::uno::XComponentContext*, css::uno::Sequence const & ) @@ -2998,7 +2998,7 @@ css::uno::Sequence SvxColorToolBoxControl::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_svx_ColorToolBoxControl_get_implementation( css::uno::XComponentContext* rContext, css::uno::Sequence const & ) @@ -3057,7 +3057,7 @@ css::uno::Sequence< OUString > SvxFrameToolBoxControl::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_svx_FrameToolBoxControl_get_implementation( css::uno::XComponentContext* rContext, css::uno::Sequence const & ) @@ -3162,7 +3162,7 @@ css::uno::Sequence SvxCurrencyToolBoxControl::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_svx_CurrencyToolBoxControl_get_implementation( css::uno::XComponentContext* rContext, css::uno::Sequence const & ) diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index cca2876053f9..1ba5165cb8e9 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -403,7 +403,7 @@ void FontHeightToolBoxControl::dispatchCommand( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_FontHeightToolBoxController_get_implementation( css::uno::XComponentContext *rxContext, css::uno::Sequence const &) diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index e2c38217e393..5f68bbd228ff 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -1463,7 +1463,7 @@ void SAL_CALL FindbarDispatcher::removeStatusListener( const css::uno::Reference } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_FindTextToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1471,7 +1471,7 @@ com_sun_star_svx_FindTextToolboxController_get_implementation( return cppu::acquire(new FindTextToolbarController(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_ExitFindbarToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1479,7 +1479,7 @@ com_sun_star_svx_ExitFindbarToolboxController_get_implementation( return cppu::acquire(new ExitSearchToolboxController(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_UpSearchToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1487,7 +1487,7 @@ com_sun_star_svx_UpSearchToolboxController_get_implementation( return cppu::acquire(new UpDownSearchToolboxController(context, UpDownSearchToolboxController::UP)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_DownSearchToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1495,7 +1495,7 @@ com_sun_star_svx_DownSearchToolboxController_get_implementation( return cppu::acquire(new UpDownSearchToolboxController(context, UpDownSearchToolboxController::DOWN)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_MatchCaseToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1503,7 +1503,7 @@ com_sun_star_svx_MatchCaseToolboxController_get_implementation( return cppu::acquire(new MatchCaseToolboxController(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_SearchFormattedToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1511,7 +1511,7 @@ com_sun_star_svx_SearchFormattedToolboxController_get_implementation( return cppu::acquire(new SearchFormattedToolboxController(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_FindAllToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1519,7 +1519,7 @@ com_sun_star_svx_FindAllToolboxController_get_implementation( return cppu::acquire(new FindAllToolboxController(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_SearchLabelToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1527,7 +1527,7 @@ com_sun_star_svx_SearchLabelToolboxController_get_implementation( return cppu::acquire(new SearchLabelToolboxController(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_svx_Impl_FindbarDispatcher_get_implementation( SAL_UNUSED_PARAMETER css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx index de6d3f6df754..edaf9076b6d4 100644 --- a/svx/source/unodialogs/textconversiondlgs/services.cxx +++ b/svx/source/unodialogs/textconversiondlgs/services.cxx @@ -37,7 +37,7 @@ static const struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetran extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL textconversiondlgs_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * textconversiondlgs_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index df98ffaf8dab..981e378a381b 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -1256,7 +1256,7 @@ Graphic SvxGetGraphicForShape( SdrObject& rShape ) return aGraphic; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Draw_GraphicExporter_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 9e3f264bc32b..aa905c7ea754 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -68,19 +68,19 @@ namespace svx virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; - Reference< XInterface > SAL_CALL NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool ) + Reference< XInterface > NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool ) { return static_cast(new NamespaceMap( pWhichIds, pPool )); } - Sequence< OUString > SAL_CALL NamespaceMap_getSupportedServiceNames() + Sequence< OUString > NamespaceMap_getSupportedServiceNames() throw() { Sequence aSupportedServiceNames { "com.sun.star.xml.NamespaceMap" }; return aSupportedServiceNames; } - OUString SAL_CALL NamespaceMap_getImplementationName() + OUString NamespaceMap_getImplementationName() throw() { return OUString( "com.sun.star.comp.Svx.NamespaceMap" ); diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 98231be1007e..c3361936613c 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -247,7 +247,7 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -uno::Reference< uno::XInterface > SAL_CALL SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw() +uno::Reference< uno::XInterface > SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw() { return static_cast(new SvxUnoXColorTable( pList )); } @@ -305,7 +305,7 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -uno::Reference< uno::XInterface > SAL_CALL SvxUnoXLineEndTable_createInstance( XPropertyList* pTable ) throw() +uno::Reference< uno::XInterface > SvxUnoXLineEndTable_createInstance( XPropertyList* pTable ) throw() { return static_cast(new SvxUnoXLineEndTable( pTable )); } @@ -372,7 +372,7 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -uno::Reference< uno::XInterface > SAL_CALL SvxUnoXDashTable_createInstance( XPropertyList* pTable ) throw() +uno::Reference< uno::XInterface > SvxUnoXDashTable_createInstance( XPropertyList* pTable ) throw() { return static_cast(new SvxUnoXDashTable( pTable )); } @@ -449,7 +449,7 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -uno::Reference< uno::XInterface > SAL_CALL SvxUnoXHatchTable_createInstance( XPropertyList* pTable ) throw() +uno::Reference< uno::XInterface > SvxUnoXHatchTable_createInstance( XPropertyList* pTable ) throw() { return static_cast(new SvxUnoXHatchTable( pTable )); } @@ -521,7 +521,7 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -uno::Reference< uno::XInterface > SAL_CALL SvxUnoXGradientTable_createInstance( XPropertyList* pTable ) throw() +uno::Reference< uno::XInterface > SvxUnoXGradientTable_createInstance( XPropertyList* pTable ) throw() { return static_cast(new SvxUnoXGradientTable( pTable )); } @@ -605,7 +605,7 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -uno::Reference< uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XPropertyList* pTable ) throw() +uno::Reference< uno::XInterface > SvxUnoXBitmapTable_createInstance( XPropertyList* pTable ) throw() { return static_cast(new SvxUnoXBitmapTable( pTable )); } diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx index a0769b73ccfe..9a2a7ab66d39 100644 --- a/svx/source/unodraw/gluepts.cxx +++ b/svx/source/unodraw/gluepts.cxx @@ -503,7 +503,7 @@ sal_Bool SAL_CALL SvxUnoGluePointAccess::hasElements() /** * Create a SvxUnoGluePointAccess */ -uno::Reference< uno::XInterface > SAL_CALL SvxUnoGluePointAccess_createInstance( SdrObject* pObject ) +uno::Reference< uno::XInterface > SvxUnoGluePointAccess_createInstance( SdrObject* pObject ) { return *new SvxUnoGluePointAccess(pObject); } diff --git a/svx/source/unodraw/gluepts.hxx b/svx/source/unodraw/gluepts.hxx index 2fb26c82163a..45397037aa39 100644 --- a/svx/source/unodraw/gluepts.hxx +++ b/svx/source/unodraw/gluepts.hxx @@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { namespace uno { } } } } class SdrObject; -css::uno::Reference SAL_CALL +css::uno::Reference SvxUnoGluePointAccess_createInstance(SdrObject * pObject); #endif diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 2a352ddb473a..afbf6456c3d8 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -282,7 +282,7 @@ void RecoveryUI::impl_showAllRecoveredDocs() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_svx_RecoveryUI_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index 047f0b842841..c2f0949b5c41 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -97,7 +97,7 @@ uno::Type SAL_CALL SvxUnoBitmapTable::getElementType( ) /** * Create a bitmaptable */ -uno::Reference< uno::XInterface > SAL_CALL SvxUnoBitmapTable_createInstance( SdrModel* pModel ) +uno::Reference< uno::XInterface > SvxUnoBitmapTable_createInstance( SdrModel* pModel ) { return *new SvxUnoBitmapTable(pModel); } diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index d97d081430ea..17e0817c2621 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -171,7 +171,7 @@ sal_Bool SAL_CALL SvxUnoColorTable::hasElements() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_drawing_SvxUnoColorTable_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index 77f0a6e8e67f..0fa393fc2ee6 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -80,7 +80,7 @@ uno::Type SAL_CALL SvxUnoDashTable::getElementType( ) /** * Create a gradienttable */ -uno::Reference< uno::XInterface > SAL_CALL SvxUnoDashTable_createInstance( SdrModel* pModel ) +uno::Reference< uno::XInterface > SvxUnoDashTable_createInstance( SdrModel* pModel ) { return *new SvxUnoDashTable(pModel); } diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index bfea79bcbd5d..8021b2d16f88 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -79,7 +79,7 @@ uno::Type SAL_CALL SvxUnoGradientTable::getElementType( ) /** * Create a gradienttable */ -uno::Reference< uno::XInterface > SAL_CALL SvxUnoGradientTable_createInstance( SdrModel* pModel ) +uno::Reference< uno::XInterface > SvxUnoGradientTable_createInstance( SdrModel* pModel ) { return *new SvxUnoGradientTable(pModel); } diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index e596d2233bd7..ec056461db0f 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -77,7 +77,7 @@ uno::Type SAL_CALL SvxUnoHatchTable::getElementType( ) /** * Create a hatchtable */ -uno::Reference< uno::XInterface > SAL_CALL SvxUnoHatchTable_createInstance( SdrModel* pModel ) +uno::Reference< uno::XInterface > SvxUnoHatchTable_createInstance( SdrModel* pModel ) { return *new SvxUnoHatchTable(pModel); } diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index 57725e32318d..de686a031822 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -412,7 +412,7 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasElements( ) /** * Create a hatchtable */ -uno::Reference< uno::XInterface > SAL_CALL SvxUnoMarkerTable_createInstance( SdrModel* pModel ) +uno::Reference< uno::XInterface > SvxUnoMarkerTable_createInstance( SdrModel* pModel ) { return *new SvxUnoMarkerTable(pModel); } diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index fd48bef8aef8..da67f601a553 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -937,7 +937,7 @@ SvxShapePolyPolygon::~SvxShapePolyPolygon() throw() { } -basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( const drawing::PointSequenceSequence* pOuterSequence) throw() +basegfx::B2DPolyPolygon ImplSvxPointSequenceSequenceToB2DPolyPolygon( const drawing::PointSequenceSequence* pOuterSequence) throw() { basegfx::B2DPolyPolygon aRetval; @@ -1033,7 +1033,7 @@ bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const Sfx throw lang::IllegalArgumentException(); } -void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPolygon& rPolyPoly, drawing::PointSequenceSequence& rRetval ) +void B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPolygon& rPolyPoly, drawing::PointSequenceSequence& rRetval ) { if( (sal_uInt32)rRetval.getLength() != rPolyPoly.count() ) rRetval.realloc( rPolyPoly.count() ); diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 607f155ed8ee..a24533062e34 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -253,7 +253,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_drawing_SvxShapeCollection_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index 149487f44f79..3cc9843e2599 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -79,7 +79,7 @@ uno::Type SAL_CALL SvxUnoTransGradientTable::getElementType( ) /** * Create a hatchtable */ -uno::Reference< uno::XInterface > SAL_CALL SvxUnoTransGradientTable_createInstance( SdrModel* pModel ) +uno::Reference< uno::XInterface > SvxUnoTransGradientTable_createInstance( SdrModel* pModel ) { return *new SvxUnoTransGradientTable(pModel); } diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index 229229b56f0c..2ad4a47445b8 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -243,7 +243,7 @@ void SAL_CALL GalleryThemeProvider::removeByName( const OUString& rName ) } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_gallery_GalleryThemeProvider_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index ff7e4043d519..4c0272084a40 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -1037,7 +1037,7 @@ Sequence< OUString > SAL_CALL SvXMLGraphicImportExportHelper::getSupportedServic uses eCreateMode == SvXMLGraphicHelperMode::Read, bDirect == sal_True in SvXMLGraphicHelper */ -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Svx_GraphicImportHelper_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -1057,7 +1057,7 @@ com_sun_star_comp_Svx_GraphicImportHelper_get_implementation( uses eCreateMode == SvXMLGraphicHelperMode::Write, bDirect == sal_True in SvXMLGraphicHelper */ -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Svx_GraphicExportHelper_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) -- cgit