diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-07-04 08:12:27 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-04 08:15:07 +0200 |
commit | 0cc53919440f150f4bfedb7a5b88cdb0cf3317dc (patch) | |
tree | 892d01cb1dc412a103a11c420e6a6ff961e88529 /sw/source | |
parent | 56dcc7b65f0d9d0dd02486d0e9e6be366248c3f5 (diff) |
loplugin:casttovoid in VCL_BUILDER_DECL_FACTORY
Change-Id: I4b0dd08963cf50daa41901975c6f92fe21db2048
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/ui/config/optload.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/createaddresslistdialog.cxx | 3 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldvar.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/cctrl/actctrl.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/misc/numberingtypelistbox.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/utlui/condedit.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/utlui/numfmtlb.cxx | 2 |
7 files changed, 7 insertions, 9 deletions
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index ff98cdd0cf58..2a542d3b7da0 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -980,7 +980,7 @@ void CaptionComboBox::KeyInput(const KeyEvent& rEvt) ComboBox::KeyInput(rEvt); } -VCL_BUILDER_DECL_FACTORY(CaptionComboBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeCaptionComboBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; bool bDropdown = VclBuilder::extractDropdown(rMap); diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 403594c84add..4ed69955cde8 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -110,9 +110,8 @@ SwAddressControl_Impl::SwAddressControl_Impl(vcl::Window* pParent, WinBits nBits m_pScrollBar->EnableDrag(); } -VCL_BUILDER_DECL_FACTORY(SwAddressControlImpl) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSwAddressControlImpl(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; rRet = VclPtr<SwAddressControl_Impl>::Create(pParent, WB_BORDER | WB_DIALOGCONTROL); } diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index b9dbc7541054..a421c24d6e93 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -1256,7 +1256,7 @@ SelectionListBox::SelectionListBox(vcl::Window* pParent, WinBits nStyle) { } -VCL_BUILDER_DECL_FACTORY(SelectionListBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSelectionListBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK; diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx index e71f49a94ccc..1a8c5ece9efb 100644 --- a/sw/source/uibase/cctrl/actctrl.cxx +++ b/sw/source/uibase/cctrl/actctrl.cxx @@ -56,7 +56,7 @@ void ReturnActionEdit::KeyInput( const KeyEvent& rEvt) Edit::KeyInput(rEvt); } -VCL_BUILDER_DECL_FACTORY(ReturnActionEdit) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeReturnActionEdit(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { VclBuilder::ensureDefaultWidthChars(rMap); rRet = VclPtr<ReturnActionEdit>::Create(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index 7d5c066cbf73..38f836e9ea88 100644 --- a/sw/source/uibase/misc/numberingtypelistbox.cxx +++ b/sw/source/uibase/misc/numberingtypelistbox.cxx @@ -58,9 +58,8 @@ bool SwNumberingTypeListBox::set_property(const OString &rKey, const OUString &r return true; } -VCL_BUILDER_DECL_FACTORY(SwNumberingTypeListBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSwNumberingTypeListBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; VclPtrInstance<SwNumberingTypeListBox> pListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP); pListBox->EnableAutoSize(true); rRet = pListBox; diff --git a/sw/source/uibase/utlui/condedit.cxx b/sw/source/uibase/utlui/condedit.cxx index 5b910de5373b..a44d2af15ecb 100644 --- a/sw/source/uibase/utlui/condedit.cxx +++ b/sw/source/uibase/utlui/condedit.cxx @@ -34,7 +34,7 @@ ConditionEdit::ConditionEdit(vcl::Window* pParent, WinBits nStyle) { } -VCL_BUILDER_DECL_FACTORY(ConditionEdit) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeConditionEdit(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { VclBuilder::ensureDefaultWidthChars(rMap); rRet = VclPtr<ConditionEdit>::Create(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index eb3ba32b892b..47aaa7b5fa7e 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -66,7 +66,7 @@ NumFormatListBox::NumFormatListBox(vcl::Window* pWin, WinBits nStyle) : Init(); } -VCL_BUILDER_DECL_FACTORY(NumFormatListBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeNumFormatListBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK; |