diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-08 07:53:46 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-08 09:46:56 +0100 |
commit | 9036bf183236459bbb02e41b89fc18cb215f6842 (patch) | |
tree | 788cd9c26fc8f206744d8b56c7d157a9c39441a1 /sfx2 | |
parent | 07263e9dd22893a03d8bc8267ac0d79b5918d101 (diff) |
loplugin:salcall vcl builder methods
these don't need to be SAL_CALL, and the function pointer definition was
not annotated SAL_CALL either
Change-Id: I3082d3d34c53dc723ad8d2083010fd0de0e89a1e
Reviewed-on: https://gerrit.libreoffice.org/46067
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/newhelp.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/doc/new.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/sidebar/SidebarToolBox.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 4b83bca30b7a..0d7584e98337 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -283,7 +283,7 @@ ContentListBox_Impl::ContentListBox_Impl(vcl::Window* pParent, WinBits nStyle) InitRoot(); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeContentListBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) +extern "C" SAL_DLLPUBLIC_EXPORT void makeContentListBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nWinStyle = WB_TABSTOP; OUString sBorder = BuilderUtils::extractCustomProperty(rMap); @@ -470,7 +470,7 @@ IndexBox_Impl::IndexBox_Impl(vcl::Window* pParent, WinBits nStyle) EnableUserDraw(true); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeIndexBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) +extern "C" SAL_DLLPUBLIC_EXPORT void makeIndexBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; OUString sBorder = BuilderUtils::extractCustomProperty(rMap); @@ -845,7 +845,7 @@ void IndexTabPage_Impl::OpenKeyword() // class SearchBox_Impl -------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSearchBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT void makeSearchBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_DROPDOWN; VclPtrInstance<SearchBox_Impl> pComboBox(pParent, nWinBits); @@ -876,7 +876,7 @@ void SearchBox_Impl::Select() // class SearchResultsBox_Impl ------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSearchResultsBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) +extern "C" SAL_DLLPUBLIC_EXPORT void makeSearchResultsBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; OUString sBorder = BuilderUtils::extractCustomProperty(rMap); @@ -1137,7 +1137,7 @@ BookmarksBox_Impl::BookmarksBox_Impl(vcl::Window* pParent, WinBits nStyle) { } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeBookmarksBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) +extern "C" SAL_DLLPUBLIC_EXPORT void makeBookmarksBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; OUString sBorder = BuilderUtils::extractCustomProperty(rMap); diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index f750dada8395..122b06eac288 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -116,7 +116,7 @@ void SfxPreviewWin_Impl::Paint(vcl::RenderContext& rRenderContext, const tools:: ImpPaint(rRenderContext, xMetaFile.get()); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSfxPreviewWin(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT void makeSfxPreviewWin(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { rRet = VclPtr<SfxPreviewWin_Impl>::Create(pParent, 0); } diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 1145f6b9e9ba..2f7d7e1abc9f 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -323,14 +323,14 @@ public: } }; -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSidebarToolBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) +extern "C" SAL_DLLPUBLIC_EXPORT void makeSidebarToolBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { VclPtrInstance<SidebarToolBox> pBox(pParent); pBox->InitToolBox(rMap); rRet = pBox; } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeNotebookbarToolBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) +extern "C" SAL_DLLPUBLIC_EXPORT void makeNotebookbarToolBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { VclPtrInstance<NotebookbarToolBox> pBox(pParent); pBox->InitToolBox(rMap); |