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 --- .../documentacceleratorconfiguration.cxx | 2 +- .../accelerators/globalacceleratorconfiguration.cxx | 2 +- .../accelerators/moduleacceleratorconfiguration.cxx | 2 +- framework/source/fwe/classes/sfxhelperfunctions.cxx | 20 ++++++++++---------- framework/source/helper/statusindicatorfactory.cxx | 2 +- framework/source/jobs/jobdispatch.cxx | 2 +- framework/source/jobs/jobexecutor.cxx | 2 +- framework/source/layoutmanager/layoutmanager.cxx | 2 +- .../services/ContextChangeEventMultiplexer.cxx | 2 +- framework/source/services/autorecovery.cxx | 2 +- framework/source/services/desktop.cxx | 2 +- framework/source/services/frame.cxx | 2 +- framework/source/services/modulemanager.cxx | 2 +- framework/source/services/pathsettings.cxx | 2 +- framework/source/services/sessionlistener.cxx | 2 +- framework/source/services/substitutepathvars.cxx | 2 +- framework/source/services/taskcreatorsrv.cxx | 2 +- framework/source/services/urltransformer.cxx | 2 +- framework/source/uiconfiguration/imagemanager.cxx | 2 +- .../source/uiconfiguration/moduleuicfgsupplier.cxx | 2 +- .../uiconfiguration/moduleuiconfigurationmanager.cxx | 2 +- .../source/uiconfiguration/uicategorydescription.cxx | 2 +- .../uiconfiguration/uiconfigurationmanager.cxx | 2 +- .../uiconfiguration/windowstateconfiguration.cxx | 2 +- framework/source/uielement/controlmenucontroller.cxx | 2 +- .../uielement/langselectionstatusbarcontroller.cxx | 2 +- framework/source/uielement/objectmenucontroller.cxx | 2 +- .../source/uielement/popuptoolbarcontroller.cxx | 6 +++--- .../source/uielement/recentfilesmenucontroller.cxx | 2 +- .../source/uielement/resourcemenucontroller.cxx | 6 +++--- framework/source/uielement/subtoolbarcontroller.cxx | 2 +- .../source/uielement/thesaurusmenucontroller.cxx | 2 +- framework/source/uielement/uicommanddescription.cxx | 2 +- framework/source/uifactory/addonstoolbarfactory.cxx | 2 +- framework/source/uifactory/menubarfactory.cxx | 2 +- framework/source/uifactory/statusbarfactory.cxx | 2 +- framework/source/uifactory/toolbarfactory.cxx | 2 +- framework/source/uifactory/uicontrollerfactory.cxx | 6 +++--- .../source/uifactory/uielementfactorymanager.cxx | 2 +- .../source/uifactory/windowcontentfactorymanager.cxx | 2 +- 40 files changed, 55 insertions(+), 55 deletions(-) (limited to 'framework/source') 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 const &) -- cgit