tdf#91052 - more macros for 'make' constructors.

Change-Id: Iece86485c52041b66cde91d7fbc772db16d90a93

21 files changed, 59 insertions, 122 deletions

diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 2972abdf60ce..748c92a189ef 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -28,7 +28,7 @@
 #include <svx/sphere3d.hxx>
 #include <svx/cube3d.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <svx/helperhittest3d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <svx/polygn3d.hxx>
@@ -62,10 +62,7 @@ Size Svx3DPreviewControl::GetOptimalSize() const
     return LogicToPixel(Size(80, 100), MAP_APPFONT);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvx3DPreviewControl(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new Svx3DPreviewControl(pParent);
-}
+VCL_BUILDER_FACTORY(Svx3DPreviewControl)
 
 Svx3DPreviewControl::~Svx3DPreviewControl()
 {
@@ -962,10 +959,7 @@ Size SvxLightCtl3D::GetOptimalSize() const
     return LogicToPixel(Size(80, 100), MAP_APPFONT);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxLightCtl3D(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SvxLightCtl3D(pParent);
-}
+VCL_BUILDER_FACTORY(SvxLightCtl3D)
 
 void SvxLightCtl3D::Init()
 {
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 7f9706176a4d..ad7c410a690d 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <sfx2/dialoghelper.hxx>
@@ -97,12 +97,7 @@ Size SvxRectCtl::GetOptimalSize() const
     return LogicToPixel(Size(78, 39), MAP_APPFONT);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxRectCtl(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SvxRectCtl(pParent);
-}
-
-
+VCL_BUILDER_FACTORY(SvxRectCtl)
 
 SvxRectCtl::~SvxRectCtl()
 {
@@ -839,11 +834,7 @@ Size SvxPixelCtl::GetOptimalSize() const
     return LogicToPixel(Size(72, 72), MAP_APPFONT);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxPixelCtl(vcl::Window *pParent, VclBuilder::stringmap&)
-{
-    return new SvxPixelCtl(pParent, 8);
-}
-// Destructor dealocating the dynamic array
+VCL_BUILDER_FACTORY_ARGS(SvxPixelCtl, 8)
 
 SvxPixelCtl::~SvxPixelCtl( )
 {
@@ -1141,7 +1132,7 @@ BitmapEx SvxBitmapCtl::GetBitmapEx()
     return BitmapEx(aRetval);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorLB(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(ColorLB)
 {
     bool bDropdown = VclBuilder::extractDropdown(rMap);
     WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_TABSTOP;
@@ -1196,7 +1187,7 @@ HatchingLB::HatchingLB( vcl::Window* pParent, WinBits nWinStyle)
     SetEdgeBlending(true);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeHatchingLB(vcl::Window *pParent, VclBuilder::stringmap& rMap)
+VCL_BUILDER_DECL_FACTORY(HatchingLB)
 {
     WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
@@ -1289,7 +1280,7 @@ GradientLB::GradientLB( vcl::Window* pParent, WinBits aWB)
     SetEdgeBlending(true);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeGradientLB(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(GradientLB)
 {
     WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
@@ -1405,7 +1396,7 @@ BitmapLB::BitmapLB( vcl::Window* pParent, WinBits aWB)
     SetEdgeBlending(true);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBitmapLB(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(BitmapLB)
 {
     WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
@@ -1575,7 +1566,7 @@ LineLB::LineLB(vcl::Window* pParent, WinBits aWB)
     // No EdgeBlending for LineStyle/Dash SetEdgeBlending(true);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLineLB(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(LineLB)
 {
     bool bDropdown = VclBuilder::extractDropdown(rMap);
     WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_TABSTOP;
@@ -1673,7 +1664,7 @@ LineEndLB::LineEndLB( vcl::Window* pParent, WinBits aWB )
     // No EdgeBlending for LineEnds SetEdgeBlending(true);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLineEndLB(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(LineEndLB)
 {
     bool bDropdown = VclBuilder::extractDropdown(rMap);
     WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_TABSTOP;
@@ -1969,10 +1960,7 @@ SvxXLinePreview::SvxXLinePreview(vcl::Window* pParent)
     mpLineObjC->SetModel(&getModel());
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXLinePreview(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SvxXLinePreview(pParent);
-}
+VCL_BUILDER_FACTORY(SvxXLinePreview)
 
 Size SvxXLinePreview::GetOptimalSize() const
 {
@@ -2086,10 +2074,7 @@ void SvxXRectPreview::Resize()
     SvxPreviewBase::Resize();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXRectPreview(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SvxXRectPreview(pParent);
-}
+VCL_BUILDER_FACTORY(SvxXRectPreview)
 
 SvxXRectPreview::~SvxXRectPreview()
 {
@@ -2147,10 +2132,7 @@ SvxXShadowPreview::SvxXShadowPreview( vcl::Window* pParent )
     mpRectangleShadow->SetModel(&getModel());
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXShadowPreview (vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SvxXShadowPreview(pParent);
-}
+VCL_BUILDER_FACTORY(SvxXShadowPreview)
 
 SvxXShadowPreview::~SvxXShadowPreview()
 {
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 72eed9fe4440..a1bb1d4c8289 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -20,7 +20,7 @@
 #include <sfx2/dialoghelper.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/printer.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
@@ -490,7 +490,7 @@ SvxFontPrevWindow::SvxFontPrevWindow(vcl::Window* pParent, WinBits nStyle)
     Init();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFontPrevWindow(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SvxFontPrevWindow)
 {
     WinBits nWinStyle = 0;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 6b7d1ada0859..625bbd37f7ac 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "svx/fontlb.hxx"
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include "svtools/treelistentry.hxx"
@@ -89,7 +89,7 @@ SvxFontListBox::SvxFontListBox(vcl::Window* pParent, WinBits nStyle)
     maEntryFont = maStdFont;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFontListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SvxFontListBox)
 {
     WinBits nWinStyle = WB_TABSTOP;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx
index 5c2465df0811..ef87c9f98c10 100644
--- a/svx/source/dialog/frmdirlbox.cxx
+++ b/svx/source/dialog/frmdirlbox.cxx
@@ -18,12 +18,10 @@
  */
 
 #include <svx/frmdirlbox.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 
 namespace svx {
 
-
-
 namespace {
 
 inline void* lclEnumToVoid( SvxFrameDirection eDirection )
@@ -44,14 +42,14 @@ FrameDirectionListBox::FrameDirectionListBox( vcl::Window* pParent, WinBits nBit
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFrameDirectionListBox(vcl::Window *pParent, VclBuilder::stringmap &)
+VCL_BUILDER_DECL_FACTORY(FrameDirectionListBox)
 {
+    (void)rMap;
     FrameDirectionListBox* pListBox = new FrameDirectionListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP);
     pListBox->EnableAutoSize(true);
     return pListBox;
 }
 
-
 void FrameDirectionListBox::InsertEntryValue( const OUString& rString, SvxFrameDirection eDirection, sal_Int32 nPos )
 {
     sal_Int32 nRealPos = InsertEntry( rString, nPos );
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index cc38f1ed0849..567bc36b9e13 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <svx/frmsel.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include <algorithm>
 #include <math.h>
@@ -796,8 +796,9 @@ FrameSelector::~FrameSelector()
     disposeOnce();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFrameSelector(vcl::Window *pParent, VclBuilder::stringmap &)
+VCL_BUILDER_DECL_FACTORY(SvxFrameSelector)
 {
+    (void)rMap;
     return new FrameSelector(pParent);
 }
 
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 85b96ece35a9..f1b3a9e51717 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -21,6 +21,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 #include <unotools/syslocale.hxx>
 #include <rtl/math.hxx>
 #include <unotools/localedatawrapper.hxx>
@@ -73,7 +74,7 @@ GraphCtrl::GraphCtrl( vcl::Window* pParent, WinBits nStyle ) :
     EnableRTL( false );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeGraphCtrl(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(GraphCtrl)
 {
     WinBits nWinStyle = 0;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 4c8fcdf4e743..295c32f08beb 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -52,6 +52,7 @@
 #include <svx/svdopath.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 #include "dlgunit.hxx"
 #include <boost/scoped_ptr.hpp>
 
@@ -114,10 +115,7 @@ void SvxIMapDlgChildWindow::UpdateIMapDlg( const Graphic& rGraphic, const ImageM
         pDlg->UpdateLink(rGraphic, pImageMap, pTargetList, pEditingObj);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeStatusBar(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new StatusBar(pParent);
-}
+VCL_BUILDER_FACTORY(StatusBar)
 
 SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window* _pParent)
     : SfxModelessDialog(_pBindings, pCW, _pParent, "ImapDialog", "svx/ui/imapdialog.ui")
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 59d86711ee3b..9311c53b9207 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -31,7 +31,7 @@
 #include <svx/langbox.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/i18nhelp.hxx>
 
 using namespace ::com::sun::star::util;
@@ -103,8 +103,7 @@ static bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16 nL
     return i >= 0  &&  i < nLen;
 }
 
-
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxLanguageBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SvxLanguageBox)
 {
     WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
     bool bDropdown = VclBuilder::extractDropdown(rMap);
@@ -117,7 +116,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxLanguageBox(vcl::Wi
     return pLanguageBox;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxLanguageComboBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SvxLanguageComboBox)
 {
     WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
     bool bDropdown = VclBuilder::extractDropdown(rMap);
@@ -130,7 +129,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxLanguageComboBox(vc
     return pLanguageBox;
 }
 
-
 SvxLanguageBoxBase::SvxLanguageBoxBase( bool bCheck )
     : m_pSpellUsedLang(NULL)
     , m_nLangList(SvxLanguageListFlags::EMPTY)
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index c07f41a580a3..a9c3a9e3f70c 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -23,7 +23,7 @@
 #include "svx/measctrl.hxx"
 #include <svx/dialmgr.hxx>
 #include "svx/dlgutil.hxx"
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/settings.hxx>
 #include <boost/scoped_ptr.hpp>
 
@@ -62,7 +62,7 @@ void SvxXMeasurePreview::Resize()
     pMeasureObj->SetPoint(aPt2, 1);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXMeasurePreview(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SvxXMeasurePreview)
 {
     WinBits nWinStyle = 0;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index aa9154a90ded..574e32ff0473 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <vcl/bitmap.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/settings.hxx>
 #include <tools/fract.hxx>
 #include <editeng/frmdiritem.hxx>
@@ -100,12 +100,7 @@ void SvxPageWindow::dispose()
     vcl::Window::dispose();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxPageWindow(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SvxPageWindow(pParent);
-}
-
-
+VCL_BUILDER_FACTORY(SvxPageWindow)
 
 void SvxPageWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&)
 {
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index 523cfe4247cb..ea0b7f02f3f4 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -19,7 +19,7 @@
 
 #include <sfx2/dialoghelper.hxx>
 #include <svx/paraprev.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/settings.hxx>
 
 SvxParaPrevWindow::SvxParaPrevWindow( vcl::Window* pParent,  WinBits nBits) :
@@ -45,10 +45,7 @@ SvxParaPrevWindow::SvxParaPrevWindow( vcl::Window* pParent,  WinBits nBits) :
     SetBorderStyle( WindowBorderStyle::MONO );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxParaPrevWindow(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SvxParaPrevWindow(pParent, WB_BORDER);
-}
+VCL_BUILDER_FACTORY_ARGS(SvxParaPrevWindow, WB_BORDER)
 
 Size SvxParaPrevWindow::GetOptimalSize() const
 {
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index b840b4ec3910..9fcc007330ff 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -39,6 +39,7 @@
 #include <svtools/colorcfg.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::frame;
@@ -799,10 +800,7 @@ void RubyPreview::dispose()
     vcl::Window::dispose();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRubyPreview(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new RubyPreview(pParent);
-}
+VCL_BUILDER_FACTORY(RubyPreview)
 
 void RubyPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /* rRect */ )
 {
@@ -952,9 +950,6 @@ bool RubyEdit::PreNotify( NotifyEvent& rNEvt )
     return nHandled;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRubyEdit(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new RubyEdit(pParent);
-}
+VCL_BUILDER_FACTORY(RubyEdit)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 1e9953f0dc59..4ad4d87582b4 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -34,6 +34,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 #include <editeng/flstitem.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/xtable.hxx>
@@ -396,10 +397,7 @@ SvxNumValueSet::SvxNumValueSet(vcl::Window* pParent, WinBits nWinBits)
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNumValueSet(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SvxNumValueSet(pParent, WB_TABSTOP);
-}
+VCL_BUILDER_FACTORY_ARGS(SvxNumValueSet, WB_TABSTOP)
 
 void SvxNumValueSet::init(sal_uInt16 nType)
 {
@@ -474,10 +472,7 @@ SvxBmpNumValueSet::SvxBmpNumValueSet(vcl::Window* pParent, WinBits nWinBits)
     init();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxBmpNumValueSet(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SvxBmpNumValueSet(pParent, WB_TABSTOP);
-}
+VCL_BUILDER_FACTORY_ARGS(SvxBmpNumValueSet, WB_TABSTOP)
 
 void SvxBmpNumValueSet::init()
 {
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index 1facb436df9c..c21adb0ae809 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <tools/poly.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
@@ -52,10 +52,7 @@ SvxSwFrameExample::SvxSwFrameExample( vcl::Window *pParent, WinBits nStyle ) :
     SetMapMode(MAP_PIXEL);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxSwFrameExample(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SvxSwFrameExample(pParent, 0);
-}
+VCL_BUILDER_FACTORY_ARGS(SvxSwFrameExample, 0)
 
 Size SvxSwFrameExample::GetOptimalSize() const
 {
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index bc16ac104620..c038a5d365d2 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -25,7 +25,7 @@
 #if HAVE_FEATURE_DBCONNECTIVITY
 #include "svx/dbcharsethelper.hxx"
 #endif
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <rtl/tencinfo.h>
@@ -39,7 +39,7 @@ SvxTextEncodingBox::SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits )
     m_pEncTable = new SvxTextEncodingTable;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxTextEncodingBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SvxTextEncodingBox)
 {
     WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
     bool bDropdown = VclBuilder::extractDropdown(rMap);
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 2eb65f4eea2c..c5712e17d6e1 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -42,6 +42,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/builderfactory.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/container/XSet.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
@@ -296,10 +297,7 @@ namespace svxform
 
     // class XFormsPage
 
-    extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDataTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &)
-    {
-        return new DataTreeListBox(static_cast<XFormsPage*>(pParent), WB_BORDER);
-    }
+    VCL_BUILDER_FACTORY_ARGS(DataTreeListBox, WB_BORDER)
 
     XFormsPage::XFormsPage( vcl::Window* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup ) :
 
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 90e0f1a069c7..ba1d4b9a899a 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -34,6 +34,7 @@
 #include "gallery.hrc"
 #include <vcl/graphicfilter.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 
 #define GALLERY_BRWBOX_TITLE    1
 
@@ -47,8 +48,7 @@ GalleryPreview::GalleryPreview(vcl::Window* pParent, WinBits nStyle, GalleryThem
     InitSettings();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeGalleryPreview(vcl::Window *pParent,
-    VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(GalleryPreview)
 {
     WinBits nWinBits = WB_TABSTOP;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/svx/source/sidebar/possize/SidebarDialControl.cxx b/svx/source/sidebar/possize/SidebarDialControl.cxx
index df10da6ed4ec..8f9db397e023 100644
--- a/svx/source/sidebar/possize/SidebarDialControl.cxx
+++ b/svx/source/sidebar/possize/SidebarDialControl.cxx
@@ -18,7 +18,7 @@
  */
 #include <svx/sidebar/SidebarDialControl.hxx>
 
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
@@ -30,10 +30,7 @@ SidebarDialControl::SidebarDialControl (vcl::Window* pParent, WinBits nBits)
     Init(GetOutputSizePixel());
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSidebarDialControl(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SidebarDialControl(pParent, WB_TABSTOP);
-}
+VCL_BUILDER_FACTORY_ARGS(SidebarDialControl, WB_TABSTOP)
 
 Size SidebarDialControl::GetOptimalSize() const
 {
diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx
index baecf497ec28..ef448a40720a 100644
--- a/svx/source/tbxctrls/SvxColorValueSet.cxx
+++ b/svx/source/tbxctrls/SvxColorValueSet.cxx
@@ -19,7 +19,7 @@
 
 #include <svx/SvxColorValueSet.hxx>
 #include <svx/xtable.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
@@ -29,7 +29,7 @@ SvxColorValueSet::SvxColorValueSet(vcl::Window* _pParent, WinBits nWinStyle)
     SetEdgeBlending(true);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxColorValueSet(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SvxColorValueSet)
 {
     WinBits nWinBits = WB_TABSTOP;
 
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 02f38d5b10b0..0b575c292cf7 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -27,6 +27,7 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include <svx/dialogs.hrc>
 
@@ -412,12 +413,7 @@ SvxFillTypeBox::SvxFillTypeBox( vcl::Window* pParent, WinBits nBits ) :
     Show();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFillTypeBox(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SvxFillTypeBox(pParent);
-}
-
-
+VCL_BUILDER_FACTORY(SvxFillTypeBox)
 
 bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt )
 {
@@ -493,12 +489,7 @@ SvxFillAttrBox::SvxFillAttrBox( vcl::Window* pParent, WinBits nBits ) :
     Show();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFillAttrBox(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SvxFillAttrBox(pParent);
-}
-
-
+VCL_BUILDER_FACTORY(SvxFillAttrBox)
 
 bool SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt )
 {