diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-08 15:58:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-11 12:13:46 +0100 |
| commit | 3af500580b1c82eabd60335c9ebc458a3f68850c (patch) | |
| tree | e0ad105be694cfb46221d16e9ce987879794fa04 /include/sfx2 | |
| parent | 0f9a596aa853b4f2beeff25c131246a7b31492a4 (diff) | |
loplugin:salcall fix functions
since cdecl is the default calling convention on Windows for
such functions, the annotation is redundant.
Change-Id: I1a85fa27e5ac65ce0e04a19bde74c90800ffaa2d
Reviewed-on: https://gerrit.libreoffice.org/46164
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/dockwin.hxx | 4 | ||||
| -rw-r--r-- | include/sfx2/sfxmodelfactory.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/stbitem.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/tbxctrl.hxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index 7b078a96af35..6d6d681a26c2 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -35,8 +35,8 @@ class SfxSplitWindow; class SfxDockingWindow_Impl; enum class SplitWindowItemFlags; -void SFX2_DLLPUBLIC SAL_CALL SfxDockingWindowFactory( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName ); -bool SFX2_DLLPUBLIC SAL_CALL IsDockingWindowVisible( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName ); +void SFX2_DLLPUBLIC SfxDockingWindowFactory( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName ); +bool SFX2_DLLPUBLIC IsDockingWindowVisible( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName ); class SFX2_DLLPUBLIC SfxDockingWindow : public DockingWindow { diff --git a/include/sfx2/sfxmodelfactory.hxx b/include/sfx2/sfxmodelfactory.hxx index b4013a965d37..f7b000b548e4 100644 --- a/include/sfx2/sfxmodelfactory.hxx +++ b/include/sfx2/sfxmodelfactory.hxx @@ -41,7 +41,7 @@ namespace o3tl namespace sfx2 { - typedef css::uno::Reference< css::uno::XInterface > ( SAL_CALL * SfxModelFactoryFunc ) ( + typedef css::uno::Reference< css::uno::XInterface > ( * SfxModelFactoryFunc ) ( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory, SfxModelFlags _nCreationFlags ); diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index e8c0f2a354b3..b72688486e94 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -30,7 +30,7 @@ class SfxModule; class SfxStatusBarControl; class SfxBindings; -svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( +svt::StatusbarController* SfxStatusBarControllerFactory( const css::uno::Reference< css::frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 9bbd0a09b58e..c78673c0cfaa 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -41,7 +41,7 @@ class SfxToolBoxControl; class SfxModule; -svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL ); +svt::ToolboxController* SfxToolBoxControllerFactory( const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL ); typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); |