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

Change-Id: Id05266810760f73db2daba10d1efa14aa9f88dd9

40 files changed, 101 insertions, 144 deletions

diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 79ebd6d8dacd..27f35d57c12f 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/dispatch.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include <initializer_list>
 
@@ -195,7 +196,7 @@ void TreeListBox::Init()
     nMode = 0xFF;   // everything
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(TreeListBox)
 {
     WinBits nWinBits = WB_TABSTOP;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 2f0fcb496a44..eeca6aafb2c3 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -33,6 +33,7 @@
 #include <tools/diagnose_ex.h>
 #include <svtools/svlbitm.hxx>
 #include <svtools/treelistentry.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include <com/sun/star/io/Pipe.hpp>
 #include <com/sun/star/ui/dialogs/FilePicker.hpp>
@@ -150,7 +151,7 @@ CheckBox::CheckBox(vcl::Window* pParent, WinBits nStyle)
     Init();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCheckBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(CheckBox)
 {
     WinBits nWinBits = WB_TABSTOP;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 8abed4ee8893..712c66c6eef4 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -32,6 +32,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 #include <svl/stritem.hxx>
+#include <vcl/builderfactory.hxx>
 #include <tools/diagnose_ex.h>
 #include <xmlscript/xmldlg_imexp.hxx>
 #include <svtools/treelistentry.hxx>
@@ -53,7 +54,7 @@ ExtTreeListBox::ExtTreeListBox(vcl::Window* pParent, WinBits nStyle)
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(ExtTreeListBox)
 {
     WinBits nWinBits = WB_TABSTOP;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index b7bdad487f80..4988943f8af0 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -22,7 +22,7 @@
 #include <svtools/editbrowsebox.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <tools/diagnose_ex.h>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include "TableConnectionData.hxx"
 #include "TableConnection.hxx"
 #include "TableWindow.hxx"
@@ -140,10 +140,7 @@ namespace dbaui
     {
     }
 
-    extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeORelationControl(vcl::Window *pParent, VclBuilder::stringmap &)
-    {
-        return new ORelationControl(pParent);
-    }
+    VCL_BUILDER_FACTORY(ORelationControl)
 
     void ORelationControl::Init(const TTableConnectionData::value_type& _pConnData)
     {
diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx
index bd3fd01c8f09..2816c9866241 100644
--- a/dbaccess/source/ui/control/SqlNameEdit.cxx
+++ b/dbaccess/source/ui/control/SqlNameEdit.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "SqlNameEdit.hxx"
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 
 namespace dbaui
 {
@@ -81,14 +81,9 @@ namespace dbaui
     }
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOSQLNameEdit(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new dbaui::OSQLNameEdit(pParent);
-}
+using namespace dbaui;
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOSQLNameComboBox(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new dbaui::OSQLNameComboBox(pParent);
-}
+VCL_BUILDER_FACTORY(OSQLNameEdit)
+VCL_BUILDER_FACTORY(OSQLNameComboBox)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx
index d7a510b4e255..e7f427bcc89a 100644
--- a/dbaccess/source/ui/control/charsetlistbox.cxx
+++ b/dbaccess/source/ui/control/charsetlistbox.cxx
@@ -19,6 +19,7 @@
 
 #include "charsetlistbox.hxx"
 
+#include <vcl/builderfactory.hxx>
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
 #include <osl/diagnose.h>
@@ -38,10 +39,7 @@ namespace dbaui
         }
     }
 
-    extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCharSetListBox(vcl::Window *pParent)
-    {
-        return new CharSetListBox(pParent);
-    }
+    VCL_BUILDER_FACTORY(CharSetListBox)
 
     void CharSetListBox::SelectEntryByIanaName( const OUString& _rIanaName )
     {
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index 917e8870c43a..35b58d9154ec 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -20,6 +20,7 @@
 #include "curledit.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 #include <osl/diagnose.h>
 
 namespace dbaui
@@ -33,8 +34,9 @@ OConnectionURLEdit::OConnectionURLEdit(vcl::Window* _pParent, WinBits _nBits,boo
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeConnectionURLEdit(vcl::Window *pParent)
+VCL_BUILDER_DECL_FACTORY(ConnectionURLEdit)
 {
+    (void)rMap;
     return new OConnectionURLEdit(pParent, WB_BORDER, false);
 }
 
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index 72f664e7c4cc..65f1421b279f 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -37,7 +37,7 @@
 #include <tools/urlobj.hxx>
 #include <svl/filenotation.hxx>
 #include <osl/diagnose.h>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 
 namespace dbaui
 {
@@ -162,10 +162,7 @@ namespace dbaui
         impl_init( _pAsciiModuleName );
     }
 
-    extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOpenDocumentButton( vcl::Window *pParent, VclBuilder::stringmap & )
-    {
-        return new OpenDocumentButton( pParent, "com.sun.star.sdb.OfficeDatabaseDocument" );
-    }
+    VCL_BUILDER_FACTORY_ARGS( OpenDocumentButton, "com.sun.star.sdb.OfficeDatabaseDocument" );
 
     void OpenDocumentButton::impl_init( const sal_Char* _pAsciiModuleName )
     {
@@ -192,10 +189,7 @@ namespace dbaui
         impl_init( _pAsciiModuleName );
     }
 
-    extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOpenDocumentListBox( vcl::Window *pParent, VclBuilder::stringmap & )
-    {
-        return new OpenDocumentListBox( pParent, "com.sun.star.sdb.OfficeDatabaseDocument" );
-    }
+    VCL_BUILDER_FACTORY_ARGS( OpenDocumentListBox, "com.sun.star.sdb.OfficeDatabaseDocument" );
 
     void OpenDocumentListBox::impl_init( const sal_Char* _pAsciiModuleName )
     {
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 1d0eddbbfc2a..8b54d8d4b673 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -23,6 +23,7 @@
 #include "dbu_control.hrc"
 #include <vcl/layout.hxx>
 #include <vcl/menu.hxx>
+#include <vcl/builderfactory.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/types.hxx>
 #include "dbustrings.hrc"
@@ -74,7 +75,7 @@ OTableTreeListBox::OTableTreeListBox(vcl::Window* pParent, WinBits nWinStyle)
     implSetDefaultImages();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOTableTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(OTableTreeListBox)
 {
     WinBits nWinStyle = 0;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index dea680bfd952..9cdfc13d15bf 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -28,6 +28,7 @@
 #include "indexcollection.hxx"
 #include <vcl/layout.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include "UITools.hxx"
 #include <svtools/imgdef.hxx>
@@ -158,10 +159,7 @@ namespace dbaui
         return bReturn;
     }
 
-    extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDbaIndexList(vcl::Window *pParent, VclBuilder::stringmap &)
-    {
-        return new DbaIndexList (pParent, WB_BORDER);
-    }
+    VCL_BUILDER_FACTORY_ARGS(DbaIndexList, WB_BORDER)
 
     // DbaIndexDialog
     DbaIndexDialog::DbaIndexDialog( vcl::Window* _pParent, const Sequence< OUString >& _rFieldNames,
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 67e2811d6848..50d91c8f5244 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -22,7 +22,7 @@
 #include <osl/diagnose.h>
 #include "dbaccess_helpid.hrc"
 #include <vcl/settings.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 
 namespace dbaui
 {
@@ -103,8 +103,9 @@ namespace dbaui
         GetDataWindow().SetUniqueId( UID_DLGINDEX_INDEXDETAILS_MAIN );
     }
 
-    extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDbaIndexFieldsControl(vcl::Window *pParent, VclBuilder::stringmap &)
+    VCL_BUILDER_DECL_FACTORY(DbaIndexFieldsControl)
     {
+        (void)rMap;
         return new IndexFieldsControl (pParent, WB_BORDER | WB_NOTABSTOP);
     }
 
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index c533db6fce9f..a2634ebce764 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -25,6 +25,7 @@
 #include "dbu_misc.hrc"
 #include <vcl/scrbar.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 #include "svtools/treelistentry.hxx"
 #include <com/sun/star/sdbc/DataType.hpp>
 
@@ -372,10 +373,7 @@ OColumnTreeBox::OColumnTreeBox( vcl::Window* pParent, WinBits nBits )
     SetSelectionMode( SINGLE_SELECTION );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOColumnTreeBox(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new OColumnTreeBox(pParent);
-}
+VCL_BUILDER_FACTORY(OColumnTreeBox)
 
 void OColumnTreeBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind)
 {
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index e294f324b62a..fad658bb2d87 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -31,6 +31,7 @@
 #include "sqlmessage.hxx"
 #include "FieldControls.hxx"
 #include <vcl/layout.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include "dbaccess_slotid.hrc"
 
@@ -401,10 +402,7 @@ void OWizTypeSelectList::setPrimaryKey(OFieldDescription* _pFieldDescr, sal_uInt
     SetEntryData(_nPos,_pFieldDescr);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOWizTypeSelectList(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new OWizTypeSelectList(pParent);
-}
+VCL_BUILDER_FACTORY(OWizTypeSelectList)
 
 bool OWizTypeSelectList::PreNotify( NotifyEvent& rEvt )
 {
diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx b/dbaccess/source/ui/querydesign/LimitBox.cxx
index 4cd42066f4a6..445d0380a91f 100644
--- a/dbaccess/source/ui/querydesign/LimitBox.cxx
+++ b/dbaccess/source/ui/querydesign/LimitBox.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include "LimitBox.hxx"
 #include "dbu_qry.hrc"
 #include "moduledbu.hxx"
@@ -108,11 +108,7 @@ void LimitBox::LoadDefaultLimits()
     }
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLimitBox( vcl::Window *pParent, VclBuilder::stringmap & )
-{
-    return new LimitBox( pParent, WB_DROPDOWN | WB_VSCROLL );
-}
-
+VCL_BUILDER_FACTORY_ARGS( LimitBox, WB_DROPDOWN | WB_VSCROLL )
 
 } ///dbaui namespace
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 4b3fb8fcee37..37e653e1ad00 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -38,6 +38,7 @@
 #include <vcl/layout.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include <osl/mutex.hxx>
 
@@ -195,8 +196,9 @@ void ExtBoxWithBtns_Impl::InitFromDialog(ExtMgrDialog *pParentDialog)
 }
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtBoxWithBtns(vcl::Window *pParent, VclBuilder::stringmap &)
+VCL_BUILDER_DECL_FACTORY(ExtBoxWithBtns)
 {
+    (void)rMap;
     return new ExtBoxWithBtns_Impl(pParent);
 }
 
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 85b9e41d7c27..77e926f0ef96 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/deployment/DeploymentException.hpp>
 #include <cppuhelper/weakref.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 
 #define USER_PACKAGE_MANAGER    "user"
 #define SHARED_PACKAGE_MANAGER  "shared"
@@ -829,8 +830,9 @@ Size ExtensionBox_Impl::GetOptimalSize() const
     return LogicToPixel(Size(250, 150), MAP_APPFONT);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtensionBox(vcl::Window *pParent, VclBuilder::stringmap &)
+VCL_BUILDER_DECL_FACTORY(ExtensionBox)
 {
+    (void)rMap;
     return new ExtensionBox_Impl(pParent);
 }
 
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 45074279813c..141d64b2ddc7 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -33,8 +33,7 @@
 #include <vcl/xtextedt.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/threadex.hxx>
-
-
+#include <vcl/builderfactory.hxx>
 
 #include <boost/bind.hpp>
 #include "dp_gui_shared.hxx"
@@ -127,7 +126,7 @@ LicenseView::LicenseView( vcl::Window* pParent, WinBits nStyle )
     StartListening( *GetTextEngine() );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLicenseView(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(LicenseView)
 {
     WinBits nWinStyle = WB_CLIPCHILDREN|WB_LEFT;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 18219bfdf60c..4b6b81d5e64e 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -29,6 +29,7 @@
 #include <vcl/waitobj.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/builderfactory.hxx>
 #include <svtools/localresaccess.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
@@ -154,15 +155,10 @@ namespace pcr
         return 0L;
     }
 
-    extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFieldLinkRow(vcl::Window *pParent, VclBuilder::stringmap &)
-    {
-        return new FieldLinkRow(pParent);
-    }
-
+    VCL_BUILDER_FACTORY(FieldLinkRow)
 
     //= FormLinkDialog
 
-
     FormLinkDialog::FormLinkDialog( vcl::Window* _pParent, const Reference< XPropertySet >& _rxDetailForm,
             const Reference< XPropertySet >& _rxMasterForm, const Reference< XComponentContext >& _rxContext,
             const OUString& _sExplanation,
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 8189fca44a92..63ce93e4948b 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -29,13 +29,10 @@
 #include <com/sun/star/form/runtime/FormController.hpp>
 #include <vcl/scrbar.hxx>
 #include <svtools/treelistentry.hxx>
-#include <vcl/builder.hxx>
-
+#include <vcl/builderfactory.hxx>
 
 namespace pcr
 {
-
-
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::awt;
     using namespace ::com::sun::star::lang;
@@ -308,8 +305,7 @@ namespace pcr
         SetSelectionMode( MULTIPLE_SELECTION );
     }
 
-    extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTabOrderListBox(vcl::Window *pParent,
-         VclBuilder::stringmap &rMap)
+    VCL_BUILDER_DECL_FACTORY(TabOrderListBox)
     {
          WinBits nWinStyle = WB_TABSTOP;
          OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index ad305304c98e..682839b85570 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -26,6 +26,7 @@
 #include <cmath>
 
 #include <grid.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include <algorithm>
 #include <boost/scoped_array.hpp>
@@ -717,9 +718,6 @@ double* GridDialog::getNewYValues()
     return m_pGridWindow->getNewYValues();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeGridWindow(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new GridWindow(pParent);
-}
+VCL_BUILDER_FACTORY(GridWindow)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 28b032298cc0..68f774525eb3 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -22,6 +22,7 @@
 #include <tools/config.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/builderfactory.hxx>
 #include <sanedlg.hxx>
 #include <grid.hxx>
 #include <math.h>
@@ -151,7 +152,7 @@ public:
     }
 };
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScanPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(ScanPreview)
 {
     WinBits nWinStyle = 0;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 3a09f866b350..0503da5d0244 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -31,6 +31,7 @@
 #include <osl/file.hxx>
 #include <o3tl/enumrange.hxx>
 #include <vcl/msgbox.hxx>
+#include <vcl/builderfactory.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include "svtools/treelistentry.hxx"
 
@@ -1428,10 +1429,7 @@ void SvxPathControl::dispose()
     vcl::Window::dispose();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxPathControl(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SvxPathControl(pParent);
-}
+VCL_BUILDER_FACTORY(SvxPathControl)
 
 bool SvxPathControl::Notify(NotifyEvent& rNEvt)
 {
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 886cab46c063..134961eb35bb 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -21,6 +21,7 @@
 #include <sfx2/docfile.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/stritem.hxx>
+#include <vcl/builderfactory.hxx>
 #include "formula/IFunctionDescription.hxx"
 
 #include "funcpage.hxx"
@@ -57,10 +58,7 @@ bool FormulaListBox::PreNotify( NotifyEvent& rNEvt )
     return nResult;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFormulaListBox(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new FormulaListBox(pParent, WB_BORDER | WB_SORT);
-}
+VCL_BUILDER_FACTORY_ARGS(FormulaListBox, WB_BORDER | WB_SORT)
 
 FuncPage::FuncPage(vcl::Window* pParent,const IFunctionManager* _pFunctionManager):
     TabPage(pParent, "FunctionPage", "formula/ui/functionpage.ui"),
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index a9d6f6a05862..395787e00e78 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -20,6 +20,7 @@
 #include <vcl/builder.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/scrbar.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include "formula/funcutl.hxx"
 #include "formula/IControlReferenceHandler.hxx"
@@ -55,10 +56,7 @@ void ArgEdit::dispose()
     RefEdit::dispose();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeArgEdit(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new ArgEdit(pParent, WB_BORDER);
-}
+VCL_BUILDER_FACTORY_ARGS(ArgEdit, WB_BORDER)
 
 void ArgEdit::Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
                     ScrollBar& rArgSlider, sal_uInt16 nArgCount )
@@ -367,10 +365,7 @@ EditBox::EditBox( vcl::Window* pParent, WinBits nBits )
     SetHelpId( "" );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeEditBox(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new EditBox(pParent, WB_BORDER);
-}
+VCL_BUILDER_FACTORY_ARGS(EditBox, WB_BORDER)
 
 EditBox::~EditBox()
 {
@@ -491,7 +486,7 @@ RefEdit::RefEdit( vcl::Window* _pParent,IControlReferenceHandler* pParent,
     aIdle.SetPriority( SchedulerPriority::LOW );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRefEdit(vcl::Window *pParent, VclBuilder::stringmap &)
+VCL_BUILDER_DECL_FACTORY(RefEdit)
 {
     return new RefEdit(pParent, NULL, WB_BORDER);
 }
@@ -615,10 +610,7 @@ void RefButton::dispose()
     ImageButton::dispose();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRefButton(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new RefButton(pParent, 0);
-}
+VCL_BUILDER_FACTORY_ARGS(RefButton, 0)
 
 void RefButton::SetStartImage()
 {
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index eb39a60e55d6..6260c3ebe35b 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -19,6 +19,7 @@
 
 #include <svl/zforlist.hxx>
 #include <svl/stritem.hxx>
+#include <vcl/builderfactory.hxx>
 #include "svtools/treelistentry.hxx"
 
 #include "structpg.hxx"
@@ -77,10 +78,7 @@ void StructListBox::LoseFocus()
     SvTreeListBox::LoseFocus();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeStructListBox(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new StructListBox(pParent, WB_BORDER);
-}
+VCL_BUILDER_FACTORY_ARGS(StructListBox, WB_BORDER)
 
 StructPage::StructPage(vcl::Window* pParent):
     TabPage(pParent, "StructPage", "formula/ui/structpage.ui"),
diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx
index 59da99c4933b..78650e663c85 100644
--- a/sc/source/ui/cctrl/editfield.cxx
+++ b/sc/source/ui/cctrl/editfield.cxx
@@ -24,7 +24,7 @@
 #include <comphelper/string.hxx>
 #include <rtl/math.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include "global.hxx"
 
 namespace {
@@ -46,7 +46,7 @@ ScDoubleField::ScDoubleField( vcl::Window* pParent, WinBits nStyle ) :
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScDoubleField(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(ScDoubleField)
 {
     VclBuilder::ensureDefaultWidthChars(rMap);
     return new ScDoubleField(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK);
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index fe916024471c..2a81a8423831 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -19,6 +19,7 @@
 #include <svx/drawitem.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include "anyrefdg.hxx"
 #include "document.hxx"
@@ -142,8 +143,7 @@ void ScCondFormatList::init(ScDocument* pDoc, ScCondFormatDlg* pDialogParent,
     RecalcAll();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScCondFormatList(vcl::Window *pParent,
-    VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(ScCondFormatList)
 {
     WinBits nWinBits = 0;
 
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
index e667ad97b6bf..b217aece02c3 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
@@ -12,16 +12,16 @@
 #include "PivotLayoutTreeList.hxx"
 #include "PivotLayoutDialog.hxx"
 
+#include <vcl/builderfactory.hxx>
 #include <svtools/treelistentry.hxx>
 #include "pivot.hxx"
 #include "scabstdlg.hxx"
 
 using namespace std;
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScPivotLayoutTreeList(vcl::Window *pParent, VclBuilder::stringmap& )
-{
-    return new ScPivotLayoutTreeList(pParent, WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN | WB_FORCE_MAKEVISIBLE);
-}
+VCL_BUILDER_FACTORY_ARGS(ScPivotLayoutTreeList,
+                         WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN |
+                         WB_FORCE_MAKEVISIBLE)
 
 ScPivotLayoutTreeList::ScPivotLayoutTreeList(vcl::Window* pParent, WinBits nBits) :
     ScPivotLayoutTreeListBase(pParent, nBits)
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
index e112e9a5b0da..360c62efd44e 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
@@ -12,16 +12,16 @@
 #include "PivotLayoutTreeListData.hxx"
 #include "PivotLayoutDialog.hxx"
 
+#include <vcl/builderfactory.hxx>
 #include <svtools/treelistentry.hxx>
 #include "pivot.hxx"
 #include "scabstdlg.hxx"
 
 using namespace std;
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScPivotLayoutTreeListData(vcl::Window *pParent, VclBuilder::stringmap& )
-{
-    return new ScPivotLayoutTreeListData(pParent, WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN | WB_FORCE_MAKEVISIBLE);
-}
+VCL_BUILDER_FACTORY_ARGS(ScPivotLayoutTreeListData,
+                         WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN |
+                         WB_FORCE_MAKEVISIBLE)
 
 namespace
 {
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
index 3595286c2fda..5efd63f53b73 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
@@ -12,16 +12,16 @@
 #include "PivotLayoutTreeListLabel.hxx"
 #include "PivotLayoutDialog.hxx"
 
+#include <vcl/builderfactory.hxx>
 #include <svtools/treelistentry.hxx>
 #include "pivot.hxx"
 #include "scabstdlg.hxx"
 
 using namespace std;
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScPivotLayoutTreeListLabel(vcl::Window *pParent, VclBuilder::stringmap& )
-{
-    return new ScPivotLayoutTreeListLabel(pParent, WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN | WB_FORCE_MAKEVISIBLE);
-}
+VCL_BUILDER_FACTORY_ARGS(ScPivotLayoutTreeListLabel,
+                         WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN |
+                         WB_FORCE_MAKEVISIBLE);
 
 ScPivotLayoutTreeListLabel::ScPivotLayoutTreeListLabel(vcl::Window* pParent, WinBits nBits)
     : ScPivotLayoutTreeListBase(pParent, nBits, LABEL_LIST)
diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx
index 3dab776b8a1b..785cb91b71d3 100644
--- a/sc/source/ui/dbgui/csvtablebox.cxx
+++ b/sc/source/ui/dbgui/csvtablebox.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "csvtablebox.hxx"
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/settings.hxx>
 #include "editutil.hxx"
@@ -69,10 +69,7 @@ void ScCsvTableBox::dispose()
     ScCsvControl::dispose();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScCsvTableBox(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new ScCsvTableBox(pParent, WB_BORDER);
-}
+VCL_BUILDER_FACTORY_ARGS(ScCsvTableBox, WB_BORDER)
 
 Size ScCsvTableBox::GetOptimalSize() const
 {
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 4cc9de6ed1b0..8ef5c95ed950 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/sheet/DataPilotFieldShowItemsMode.hpp>
 
 #include <tools/resary.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/msgbox.hxx>
 
 #include "scresid.hxx"
@@ -157,7 +157,7 @@ ScDPFunctionListBox::ScDPFunctionListBox(vcl::Window* pParent, WinBits nStyle)
     FillFunctionNames();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScDPFunctionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(ScDPFunctionListBox)
 {
     WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 7952949c3b67..187fefdddfe3 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -23,6 +23,7 @@
 
 #include <comphelper/string.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/builderfactory.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
@@ -936,8 +937,9 @@ bool ScValidationDlg::RemoveRefDlg( bool bRestoreModal /* = true */ )
     return true;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScRefButtonEx(vcl::Window *pParent, VclBuilder::stringmap &)
+VCL_BUILDER_DECL_FACTORY(ScRefButtonEx)
 {
+    (void)rMap;
     return new ScTPValidationValue::ScRefButtonEx(pParent, 0);
 }
 
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index aad6b77c60f7..45baa5b3c421 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -33,6 +33,7 @@
 #include <svl/zforlist.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <comphelper/processfactory.hxx>
 
@@ -73,10 +74,7 @@ ScAutoFmtPreview::ScAutoFmtPreview(vcl::Window* pParent)
     Init();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScAutoFmtPreview(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new ScAutoFmtPreview(pParent);
-}
+VCL_BUILDER_FACTORY(ScAutoFmtPreview)
 
 void ScAutoFmtPreview::Resize()
 {
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 361c92b5937b..8072c83a067c 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -22,7 +22,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/imagemgr.hxx>
 #include <svl/zforlist.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 
@@ -134,11 +134,7 @@ ScCursorRefEdit::ScCursorRefEdit( vcl::Window* pParent, vcl::Window *pLabel )
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScCursorRefEdit(vcl::Window *pParent,
-    VclBuilder::stringmap &)
-{
-    return new ScCursorRefEdit(pParent, nullptr);
-}
+VCL_BUILDER_FACTORY_ARGS(ScCursorRefEdit, nullptr)
 
 void ScCursorRefEdit::SetCursorLinks( const Link<>& rUp, const Link<>& rDown )
 {
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index 0387e31596f5..55aacefed994 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -31,7 +31,7 @@
 #include <tools/resid.hxx>
 #include <editeng/editrids.hrc>
 #include <editeng/eerdll.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include <boost/scoped_ptr.hpp>
 
@@ -158,7 +158,7 @@ void ScTabBgColorDlg::ScTabBgColorValueSet::dispose()
     SvxColorValueSet::dispose();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScTabBgColorValueSet(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(ScTabBgColorValueSet)
 {
     WinBits nWinBits = WB_TABSTOP;
 
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 2e983ed1981f..38ed89456f5d 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -30,6 +30,7 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include "tphfedit.hxx"
 #include "editutil.hxx"
@@ -135,8 +136,9 @@ void ScEditWindow::dispose()
     Control::dispose();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScEditWindow(vcl::Window *pParent, VclBuilder::stringmap &)
+VCL_BUILDER_DECL_FACTORY(ScEditWindow)
 {
+    (void)rMap;
     return new ScEditWindow (pParent, WB_BORDER|WB_TABSTOP, Left);
 }
 
@@ -344,10 +346,7 @@ ScExtIButton::ScExtIButton(vcl::Window* pParent, WinBits nBits )
     SetDropDown(PushButtonDropdownStyle::Toolbox);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScExtIButton(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new ScExtIButton (pParent, 0);// WB_BORDER|WB_TABSTOP);
-}
+VCL_BUILDER_FACTORY_ARGS(ScExtIButton, 0 /* WB_BORDER|WB_TABSTOP */)
 
 void ScExtIButton::SetPopupMenu(PopupMenu* pPopUp)
 {
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 6d190ec4071a..518410b7dd41 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -42,6 +42,7 @@
 #include <basic/sbxcore.hxx>
 #include <unotools/useroptions.hxx>
 #include <vcl/waitobj.hxx>
+#include <vcl/builderfactory.hxx>
 #include <unotools/localedatawrapper.hxx>
 
 #include "cellsh.hxx"
diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx
index 24e0935878d6..3f4db20ae2ed 100644
--- a/sd/source/filter/html/htmlattr.cxx
+++ b/sd/source/filter/html/htmlattr.cxx
@@ -20,14 +20,14 @@
 #include "htmlattr.hxx"
 #include "htmlex.hxx"
 #include <vcl/decoview.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 
 SdHtmlAttrPreview::SdHtmlAttrPreview( vcl::Window* pParent, WinBits nStyle )
 :Control( pParent, nStyle )
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSdHtmlAttrPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SdHtmlAttrPreview)
 {
     WinBits nWinStyle = 0;
 
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index ad18df4f507a..c2c62acfe3d7 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -34,6 +34,7 @@
 #include "vcl/svapp.hxx"
 #include "vcl/unohelp.hxx"
 #include "vcl/settings.hxx"
+#include "vcl/builderfactory.hxx"
 
 #include "unotools/localedatawrapper.hxx"
 
@@ -51,13 +52,15 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::container;
 using namespace com::sun::star::beans;
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makePrintPreviewWindow(vcl::Window *pParent, VclBuilder::stringmap &)
+VCL_BUILDER_DECL_FACTORY(PrintPreviewWindow)
 {
+    (void)rMap;
     return new PrintDialog::PrintPreviewWindow(pParent);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeShowNupOrderWindow(vcl::Window *pParent, VclBuilder::stringmap &)
+VCL_BUILDER_DECL_FACTORY(ShowNupOrderWindow)
 {
+    (void)rMap;
     return new PrintDialog::ShowNupOrderWindow(pParent);
 }