4 files changed, 10 insertions, 7 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index d929cf009976..e4d803dce9f8 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -33,6 +33,7 @@
 #include "svtools/treelistentry.hxx"
 
 #include <sal/macros.h>
+#include <vcl/builderfactory.hxx>
 
 #include "cuires.hrc"
 #include "acccfg.hrc"
@@ -652,7 +653,7 @@ void SfxAccCfgLBoxString_Impl::Paint(
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxAccCfgTabListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SfxAccCfgTabListBox)
 {
     WinBits nWinBits = WB_TABSTOP;
 
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 0d990cab1024..c74e0e78e44b 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -59,7 +59,7 @@
 #include <unotools/configmgr.hxx>
 #include "dialmgr.hxx"
 #include <svl/stritem.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -258,7 +258,7 @@ SfxConfigFunctionListBox::SfxConfigFunctionListBox(vcl::Window* pParent, WinBits
     GetModel()->SetSortMode( SortAscending );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxConfigFunctionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SfxConfigFunctionListBox)
 {
     WinBits nWinBits = WB_TABSTOP;
 
@@ -400,7 +400,7 @@ SfxConfigGroupListBox::SfxConfigGroupListBox(vcl::Window* pParent, WinBits nStyl
     SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxConfigGroupListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SfxConfigGroupListBox)
 {
     WinBits nWinBits = WB_TABSTOP;
 
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index cd7e84d75ecf..ae4daa6c9bc4 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -39,6 +39,7 @@
 #include "headertablistbox.hxx"
 #include "macropg_impl.hxx"
 #include <svx/dialogs.hrc>
+#include <vcl/builderfactory.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 
 #include <algorithm>
@@ -151,7 +152,7 @@ void MacroEventListBox::dispose()
     Control::dispose();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeMacroEventListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(MacroEventListBox)
 {
     WinBits nWinBits = WB_TABSTOP;
 
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index a3d6acf0e350..ce1cbcabcde4 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -21,6 +21,7 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/vclmedit.hxx>
+#include <vcl/builderfactory.hxx>
 #include "selector.hxx"
 #include <dialmgr.hxx>
 #include <svx/fmresids.hrc>
@@ -86,7 +87,7 @@ SvxConfigFunctionListBox::SvxConfigFunctionListBox(vcl::Window* pParent, WinBits
         LINK( this, SvxConfigFunctionListBox, TimerHdl ) );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxConfigFunctionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SvxConfigFunctionListBox)
 {
     WinBits nWinBits = WB_TABSTOP;
 
@@ -219,7 +220,7 @@ SvxConfigGroupListBox::SvxConfigGroupListBox(vcl::Window* pParent, WinBits nStyl
     );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxConfigGroupListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SvxConfigGroupListBox)
 {
     WinBits nWinBits = WB_TABSTOP;