loplugin:casttovoid in VCL_BUILDER_DECL_FACTORY

Change-Id: I4b0dd08963cf50daa41901975c6f92fe21db2048

6 files changed, 11 insertions, 13 deletions

diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 6926e8e268dc..09dffac31784 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1032,7 +1032,7 @@ HatchingLB::HatchingLB( vcl::Window* pParent, WinBits nWinStyle)
     SetEdgeBlending(true);
 }
 
-VCL_BUILDER_DECL_FACTORY(HatchingLB)
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeHatchingLB(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
 {
     WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
     OUString sBorder = VclBuilder::extractCustomProperty(rMap);
@@ -1072,7 +1072,7 @@ GradientLB::GradientLB( vcl::Window* pParent, WinBits aWB)
     SetEdgeBlending(true);
 }
 
-VCL_BUILDER_DECL_FACTORY(GradientLB)
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeGradientLB(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
 {
     WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
     OUString sBorder = VclBuilder::extractCustomProperty(rMap);
@@ -1112,7 +1112,7 @@ BitmapLB::BitmapLB( vcl::Window* pParent, WinBits aWB)
     SetEdgeBlending(true);
 }
 
-VCL_BUILDER_DECL_FACTORY(BitmapLB)
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeBitmapLB(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
 {
     WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
     OUString sBorder = VclBuilder::extractCustomProperty(rMap);
@@ -1246,7 +1246,7 @@ LineLB::LineLB(vcl::Window* pParent, WinBits aWB)
     // No EdgeBlending for LineStyle/Dash SetEdgeBlending(true);
 }
 
-VCL_BUILDER_DECL_FACTORY(LineLB)
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeLineLB(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
 {
     bool bDropdown = VclBuilder::extractDropdown(rMap);
     WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_TABSTOP;
@@ -1344,7 +1344,7 @@ LineEndLB::LineEndLB( vcl::Window* pParent, WinBits aWB )
     // No EdgeBlending for LineEnds SetEdgeBlending(true);
 }
 
-VCL_BUILDER_DECL_FACTORY(LineEndLB)
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeLineEndLB(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
 {
     bool bDropdown = VclBuilder::extractDropdown(rMap);
     WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_TABSTOP;
diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx
index d4fccb836360..a2d3eaa7075a 100644
--- a/svx/source/dialog/frmdirlbox.cxx
+++ b/svx/source/dialog/frmdirlbox.cxx
@@ -41,9 +41,8 @@ FrameDirectionListBox::FrameDirectionListBox( vcl::Window* pParent, WinBits nBit
 {
 }
 
-VCL_BUILDER_DECL_FACTORY(FrameDirectionListBox)
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeFrameDirectionListBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &)
 {
-    (void)rMap;
     VclPtrInstance<FrameDirectionListBox> pListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP);
     pListBox->EnableAutoSize(true);
     rRet = pListBox;
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index c2bdd0c6d655..7886c117ddf8 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -810,9 +810,8 @@ FrameSelector::~FrameSelector()
     disposeOnce();
 }
 
-VCL_BUILDER_DECL_FACTORY(SvxFrameSelector)
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSvxFrameSelector(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &)
 {
-    (void)rMap;
     rRet = VclPtr<FrameSelector>::Create(pParent);
 }
 
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 2cb2ec5e7d7a..b6ef358e6a9d 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -110,7 +110,7 @@ static bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16 nL
     return i >= 0  &&  i < nLen;
 }
 
-VCL_BUILDER_DECL_FACTORY(SvxLanguageBox)
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSvxLanguageBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
 {
     WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
     bool bDropdown = VclBuilder::extractDropdown(rMap);
@@ -123,7 +123,7 @@ VCL_BUILDER_DECL_FACTORY(SvxLanguageBox)
     rRet = pLanguageBox;
 }
 
-VCL_BUILDER_DECL_FACTORY(SvxLanguageComboBox)
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSvxLanguageComboBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
 {
     WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
     bool bDropdown = VclBuilder::extractDropdown(rMap);
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 867086467d8d..b99bc88aad80 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -36,7 +36,7 @@ SvxRelativeField::SvxRelativeField(
     SetMax( 9999 );
 }
 
-VCL_BUILDER_DECL_FACTORY(SvxRelativeField)
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSvxRelativeField(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
 {
     OUString const custom(VclBuilder::extractCustomProperty(rMap));
     FieldUnit const eUnit(VclBuilder::detectUnit(custom));
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 72250ca8eb8a..7434c5e1e3e3 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -39,7 +39,7 @@ SvxTextEncodingBox::SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits )
     m_pEncTable = new SvxTextEncodingTable;
 }
 
-VCL_BUILDER_DECL_FACTORY(SvxTextEncodingBox)
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSvxTextEncodingBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
 {
     WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
     bool bDropdown = VclBuilder::extractDropdown(rMap);