[Libreoffice-commits] core.git: svx/source sw/source

Michael Meeks michael.meeks at collabora.com
Mon May 11 05:51:00 PDT 2015 

 svx/source/dialog/dlgctl3d.cxx                    |   12 +-----
 svx/source/dialog/dlgctrl.cxx                     |   42 ++++++----------------
 svx/source/dialog/fntctrl.cxx                     |    4 +-
 svx/source/dialog/fontlb.cxx                      |    4 +-
 svx/source/dialog/frmdirlbox.cxx                  |    8 +---
 svx/source/dialog/frmsel.cxx                      |    5 +-
 svx/source/dialog/graphctl.cxx                    |    3 +
 svx/source/dialog/imapdlg.cxx                     |    6 +--
 svx/source/dialog/langbox.cxx                     |    8 +---
 svx/source/dialog/measctrl.cxx                    |    4 +-
 svx/source/dialog/pagectrl.cxx                    |    9 +---
 svx/source/dialog/paraprev.cxx                    |    7 +--
 svx/source/dialog/rubydialog.cxx                  |   11 +----
 svx/source/dialog/svxbmpnumvalueset.cxx           |   11 +----
 svx/source/dialog/swframeexample.cxx              |    7 +--
 svx/source/dialog/txencbox.cxx                    |    4 +-
 svx/source/form/datanavi.cxx                      |    6 +--
 svx/source/gallery2/galctrl.cxx                   |    4 +-
 svx/source/sidebar/possize/SidebarDialControl.cxx |    7 +--
 svx/source/tbxctrls/SvxColorValueSet.cxx          |    4 +-
 svx/source/tbxctrls/itemwin.cxx                   |   15 +------
 sw/source/ui/chrdlg/drpcps.cxx                    |    6 +--
 sw/source/ui/config/optload.cxx                   |    6 +--
 sw/source/ui/config/optpage.cxx                   |    6 +--
 sw/source/ui/dbui/createaddresslistdialog.cxx     |    4 +-
 sw/source/ui/dbui/mmaddressblockpage.cxx          |   11 ++---
 sw/source/ui/envelp/envlop1.cxx                   |    7 +--
 sw/source/ui/envelp/labfmt.cxx                    |    6 +--
 sw/source/ui/fldui/FldRefTreeListBox.cxx          |    4 +-
 sw/source/ui/fldui/fldvar.cxx                     |    3 +
 sw/source/ui/frmdlg/column.cxx                    |    6 +--
 sw/source/ui/frmdlg/frmpage.cxx                   |    6 +--
 sw/source/ui/index/cnttab.cxx                     |    8 +---
 sw/source/ui/misc/bookmark.cxx                    |    6 +--
 sw/source/ui/misc/glosbib.cxx                     |   13 ++----
 sw/source/ui/misc/glossary.cxx                    |    6 +--
 sw/source/ui/misc/outline.cxx                     |    6 +--
 sw/source/ui/table/tautofmt.cxx                   |    3 +
 sw/source/uibase/cctrl/actctrl.cxx                |    4 +-
 sw/source/uibase/dbui/dbtree.cxx                  |    4 +-
 sw/source/uibase/dbui/mailmergehelper.cxx         |    3 +
 sw/source/uibase/frmdlg/colex.cxx                 |   16 ++------
 sw/source/uibase/misc/numberingtypelistbox.cxx    |    4 +-
 sw/source/uibase/utlui/condedit.cxx               |    4 +-
 sw/source/uibase/utlui/numfmtlb.cxx               |    3 +
 45 files changed, 117 insertions(+), 209 deletions(-)

New commits:
commit ceb6f473837261f2a6e43e028ce9da3daccc2f6c
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Mon May 11 13:42:10 2015 +0100

    tdf#91052 - more macros for 'make' constructors.
    
    Change-Id: Iece86485c52041b66cde91d7fbc772db16d90a93

diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 2972abd..748c92a 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 7f97061..ad7c410 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 72eed9f..a1bb1d4 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 6b7d1ad..625bbd3 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 5c2465d..ef87c9f 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 cc38f1e..567bc36 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 85b96ec..f1b3a9e 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 4c8fcdf..295c32f 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 59d8671..9311c53 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 c07f41a..a9c3a9e 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 aa9154a..574e32f 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 523cfe4..ea0b7f0 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 b840b4e..9fcc007 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 1e9953f..4ad4d87 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 1facb43..c21adb0 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 bc16ac1..c038a5d 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 2eb65f4..c5712e1 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 90e0f1a..ba1d4b9 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 df10da6..8f9db39 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 baecf49..ef448a4 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 02f38d5..0b575c2 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 )
 {
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index cb0f411..825c7e2 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -36,6 +36,7 @@
 #include <sfx2/objsh.hxx>
 #include <editeng/svxfont.hxx>
 #include <vcl/print.hxx>
+#include <vcl/builderfactory.hxx>
 #include <sfx2/printer.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <editeng/scripttypeitem.hxx>
@@ -132,10 +133,7 @@ public:
     void        DrawPrev( const Point& rPt );
 };
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwDropCapsPict(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SwDropCapsPict(pParent, WB_BORDER);
-}
+VCL_BUILDER_FACTORY_ARGS(SwDropCapsPict, WB_BORDER)
 
 void SwDropCapsPict::SetText( const OUString& rT )
 {
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 5f0cc8b..4247606 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -43,7 +43,7 @@
 
 #include <svtools/insdlg.hxx>
 #include <svtools/treelistentry.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/settings.hxx>
 
 #include <comphelper/classids.hxx>
@@ -388,7 +388,7 @@ SwCaptionPreview::SwCaptionPreview( vcl::Window* pParent, WinBits nStyle )
     Init();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwCaptionPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SwCaptionPreview)
 {
     WinBits nBits = 0;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
@@ -934,7 +934,7 @@ void CaptionComboBox::KeyInput(const KeyEvent& rEvt)
         SwComboBox::KeyInput(rEvt);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCaptionComboBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(CaptionComboBox)
 {
     WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK;
     bool bDropdown = VclBuilder::extractDropdown(rMap);
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 9d5e019..fa53537 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -65,6 +65,7 @@
 #include <svx/strarray.hxx>
 
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
@@ -1614,10 +1615,7 @@ SwMarkPreview::SwMarkPreview( vcl::Window *pParent, WinBits nWinBits ) :
     SetMapMode(MAP_PIXEL);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwMarkPreview(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SwMarkPreview(pParent, 0);
-}
+VCL_BUILDER_FACTORY_ARGS(SwMarkPreview, 0)
 
 SwMarkPreview::~SwMarkPreview()
 {
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 193e55b..a9c1226 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -24,6 +24,7 @@
 #include <comphelper/string.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/msgbox.hxx>
+#include <vcl/builderfactory.hxx>
 #include <svtools/controldims.hrc>
 #include <unotools/pathoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
@@ -107,8 +108,9 @@ SwAddressControl_Impl::SwAddressControl_Impl(vcl::Window* pParent, WinBits nBits
     m_pScrollBar->EnableDrag();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwAddressControlImpl(vcl::Window *pParent, VclBuilder::stringmap &)
+VCL_BUILDER_DECL_FACTORY(SwAddressControlImpl)
 {
+    (void)rMap;
     return new SwAddressControl_Impl(pParent, WB_BORDER | WB_DIALOGCONTROL);
 }
 
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 35214f5..2c25df2 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -24,6 +24,7 @@
 #include <vcl/layout.hxx>
 #include <vcl/txtattr.hxx>
 #include <vcl/xtextedt.hxx>
+#include <vcl/builderfactory.hxx>
 #include <mmconfigitem.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
@@ -845,10 +846,7 @@ public:
     virtual Size GetOptimalSize() const SAL_OVERRIDE;
 };
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwAssignFieldsControl(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SwAssignFieldsControl(pParent, WB_BORDER);
-}
+VCL_BUILDER_FACTORY_ARGS(SwAssignFieldsControl, WB_BORDER)
 
 SwAssignFieldsControl::SwAssignFieldsControl(vcl::Window* pParent, WinBits nBits) :
     Control(pParent, nBits | WB_DIALOGCONTROL | WB_TABSTOP | WB_DIALOGCONTROL),
@@ -1288,8 +1286,7 @@ void DDListBox::dispose()
     SvTreeListBox::dispose();
 }
 
-
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDDListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(DDListBox)
 {
     WinBits nWinStyle = WB_TABSTOP;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
@@ -1351,7 +1348,7 @@ Size AddressMultiLineEdit::GetOptimalSize() const
     return LogicToPixel(Size(160, 60), MAP_APPFONT);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAddressMultiLineEdit(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(AddressMultiLineEdit)
 {
     WinBits nWinStyle = WB_LEFT|WB_TABSTOP;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index e6072f7..b552d03 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -19,7 +19,7 @@
 
 #include "dbmgr.hxx"
 #include <sfx2/app.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
 
@@ -57,10 +57,7 @@ Size SwEnvPreview::GetOptimalSize() const
     return LogicToPixel(Size(84 , 63), MAP_APPFONT);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwEnvPreview(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SwEnvPreview(pParent, 0);
-}
+VCL_BUILDER_FACTORY_ARGS(SwEnvPreview, 0)
 
 void SwEnvPreview::DataChanged( const DataChangedEvent& rDCEvt )
 {
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index be2171b..6801e24 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -20,6 +20,7 @@
 #include <tools/poly.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include <viewopt.hxx>
 
@@ -84,10 +85,7 @@ Size SwLabPreview::GetOptimalSize() const
     return LogicToPixel(Size(146 , 161), MapMode(MAP_APPFONT));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwLabPreview(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SwLabPreview(pParent);
-}
+VCL_BUILDER_FACTORY(SwLabPreview)
 
 void SwLabPreview::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &)
 {
diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx
index c04603c..c84b5c4 100644
--- a/sw/source/ui/fldui/FldRefTreeListBox.cxx
+++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx
@@ -20,7 +20,7 @@
 #include <FldRefTreeListBox.hxx>
 
 #include <helpid.h>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/help.hxx>
 
 SwFldRefTreeListBox::SwFldRefTreeListBox(vcl::Window* pParent, WinBits nStyle)
@@ -28,7 +28,7 @@ SwFldRefTreeListBox::SwFldRefTreeListBox(vcl::Window* pParent, WinBits nStyle)
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwFldRefTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SwFldRefTreeListBox)
 {
     WinBits nWinStyle = WB_TABSTOP;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 06774c8..8da46a4 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -19,6 +19,7 @@
 
 #include <swtypes.hxx>
 #include <sfx2/linkmgr.hxx>
+#include <vcl/builderfactory.hxx>
 #include <IDocumentFieldsAccess.hxx>
 #include <usrfld.hxx>
 #include <docufld.hxx>
@@ -1262,7 +1263,7 @@ SelectionListBox::SelectionListBox(vcl::Window* pParent, WinBits nStyle)
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSelectionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SelectionListBox)
 {
     WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK;
 
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index e7e0033..d45c5c4 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -36,6 +36,7 @@
 #include <sfx2/dispatch.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include <swmodule.hxx>
 #include <sal/macros.h>
@@ -1425,9 +1426,6 @@ void ColumnValueSet::DataChanged( const DataChangedEvent& rDCEvt )
     ValueSet::DataChanged( rDCEvt );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColumnValueSet(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new ColumnValueSet(pParent);
-}
+VCL_BUILDER_FACTORY(ColumnValueSet)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 7da73f2..17e23f5 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -68,6 +68,7 @@
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/builderfactory.hxx>
 #include <boost/scoped_ptr.hpp>
 
 using namespace ::com::sun::star;
@@ -2660,10 +2661,7 @@ Size BmpWindow::GetOptimalSize() const
     return LogicToPixel(Size(127 , 66), MapMode(MAP_APPFONT));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBmpWindow(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new BmpWindow(pParent, 0);
-}
+VCL_BUILDER_FACTORY_ARGS(BmpWindow, 0)
 
 void BmpWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
 {
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 9bdf2e1..2bac0f5 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -23,6 +23,7 @@
 #include <rsc/rscsfx.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/help.hxx>
+#include <vcl/builderfactory.hxx>
 #include <svl/stritem.hxx>
 #include <svl/urihelper.hxx>
 #include <unotools/pathoptions.hxx>
@@ -1758,7 +1759,7 @@ void SwIdxTreeListBox::dispose()
     SvTreeListBox::dispose();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwIdxTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SwIdxTreeListBox)
 {
     WinBits nWinStyle = WB_TABSTOP;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
@@ -2736,10 +2737,7 @@ SwTokenWindow::SwTokenWindow(vcl::Window* pParent)
     m_pRightScrollWin->SetClickHdl(aLink);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwTokenWindow(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SwTokenWindow(pParent);
-}
+VCL_BUILDER_FACTORY(SwTokenWindow)
 
 void SwTokenWindow::setAllocation(const Size &rAllocation)
 {
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 5eaf63a..f3c5597 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -21,6 +21,7 @@
 #include <sfx2/request.hxx>
 #include <svl/stritem.hxx>
 #include <vcl/msgbox.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include "view.hxx"
 #include "basesh.hxx"
@@ -238,9 +239,6 @@ bool BookmarkCombo::PreNotify( NotifyEvent& rNEvt )
     return nHandled;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBookmarkCombo(vcl::Window* pParent, VclBuilder::stringmap &)
-{
-    return new BookmarkCombo(pParent, 0);
-}
+VCL_BUILDER_FACTORY_ARGS(BookmarkCombo, 0)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 98953c0..b1ec21d 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -21,6 +21,7 @@
 #include <tools/stream.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/help.hxx>
+#include <vcl/builderfactory.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/pathoptions.hxx>
@@ -407,12 +408,9 @@ void FEdit::KeyInput( const KeyEvent& rKEvent )
         Edit::KeyInput( rKEvent );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFEdit(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new FEdit(pParent);
-}
+VCL_BUILDER_FACTORY(FEdit)
 
-void    SwGlossaryGroupTLB::RequestHelp( const HelpEvent& rHEvt )
+void SwGlossaryGroupTLB::RequestHelp( const HelpEvent& rHEvt )
 {
     Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() ));
     SvTreeListEntry* pEntry = GetEntry( aPos );
@@ -441,9 +439,6 @@ void    SwGlossaryGroupTLB::RequestHelp( const HelpEvent& rHEvt )
     }
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwGlossaryGroupTLB(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SwGlossaryGroupTLB(pParent);
-}
+VCL_BUILDER_FACTORY(SwGlossaryGroupTLB)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 1f7a6ff..388e7e5 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -22,6 +22,7 @@
 #include <vcl/menu.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/help.hxx>
+#include <vcl/builderfactory.hxx>
 #include <svl/stritem.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/lingucfg.hxx>
@@ -852,10 +853,7 @@ Size SwGlTreeListBox::GetOptimalSize() const
     return LogicToPixel(Size(212, 84), MapMode(MAP_APPFONT));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwGlTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SwGlTreeListBox(pParent, WB_BORDER | WB_TABSTOP);
-}
+VCL_BUILDER_FACTORY_ARGS(SwGlTreeListBox, WB_BORDER | WB_TABSTOP)
 
 void SwGlTreeListBox::Clear()
 {
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 83c0e92..94a6f27 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -21,6 +21,7 @@
 #include <vcl/menu.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include <sfx2/tabdlg.hxx>
 #include <editeng/brushitem.hxx>
@@ -918,10 +919,7 @@ static long lcl_DrawGraphic(vcl::RenderContext* pVDev, const SwNumFmt &rFmt, lon
     return nRet;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeNumberingPreview(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new NumberingPreview(pParent);
-}
+VCL_BUILDER_FACTORY(NumberingPreview)
 
 // paint numbering's preview
 void NumberingPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ )
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index c1e10cf..3332023 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -22,6 +22,7 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include <svl/zforlist.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -532,7 +533,7 @@ AutoFmtPreview::AutoFmtPreview(vcl::Window* pParent, WinBits nStyle) :
     Init();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAutoFmtPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(AutoFmtPreview)
 {
     WinBits nWinStyle = 0;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx
index 04f9932..119dbb3 100644
--- a/sw/source/uibase/cctrl/actctrl.cxx
+++ b/sw/source/uibase/cctrl/actctrl.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <comphelper/string.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include "actctrl.hxx"
 
 void NumEditAction::Action()
@@ -62,7 +62,7 @@ void ReturnActionEdit::KeyInput( const KeyEvent& rEvt)
         Edit::KeyInput(rEvt);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeReturnActionEdit(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(ReturnActionEdit)
 {
     VclBuilder::ensureDefaultWidthChars(rMap);
     return new ReturnActionEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK);
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 2d893cb..0e9fa0d 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -41,7 +41,7 @@
 #include <wrtsh.hxx>
 #include <dbtree.hxx>
 #include <osl/mutex.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/treelistentry.hxx>
 
@@ -180,7 +180,7 @@ SwDBTreeList::SwDBTreeList(vcl::Window *pParent, WinBits nStyle)
         InitTreeList();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwDBTreeList(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SwDBTreeList)
 {
     WinBits nStyle = WB_TABSTOP;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index c342034..d827f70 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -37,6 +37,7 @@
 #include <comphelper/string.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include <sfx2/passwd.hxx>
 
@@ -206,7 +207,7 @@ void SwAddressPreview::dispose()
     vcl::Window::dispose();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwAddressPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SwAddressPreview)
 {
     WinBits nWinStyle = WB_TABSTOP;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx
index 8294576..790f0b3 100644
--- a/sw/source/uibase/frmdlg/colex.cxx
+++ b/sw/source/uibase/frmdlg/colex.cxx
@@ -32,6 +32,7 @@
 #include <vcl/builder.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 #include <tgrditem.hxx>
 #include <viewopt.hxx>
 #include "colex.hxx"
@@ -314,10 +315,7 @@ void SwColExample::DrawPage( const Point& rOrg,
     }
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwColExample(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SwColExample(pParent);
-}
+VCL_BUILDER_FACTORY(SwColExample)
 
 SwColumnOnlyExample::SwColumnOnlyExample(vcl::Window* pParent)
     : Window(pParent)
@@ -343,10 +341,7 @@ SwColumnOnlyExample::SwColumnOnlyExample(vcl::Window* pParent)
     SetMapMode( aMapMode );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwColumnOnlyExample(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SwColumnOnlyExample(pParent);
-}
+VCL_BUILDER_FACTORY(SwColumnOnlyExample)
 
 void SwColumnOnlyExample::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ )
 {
@@ -613,9 +608,6 @@ void SwPageGridExample::UpdateExample( const SfxItemSet& rSet )
     SwPageExample::UpdateExample(rSet);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwPageGridExample(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SwPageGridExample(pParent);
-}
+VCL_BUILDER_FACTORY(SwPageGridExample)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx
index 8f8264e..30b6b05 100644
--- a/sw/source/uibase/misc/numberingtypelistbox.cxx
+++ b/sw/source/uibase/misc/numberingtypelistbox.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/text/XDefaultNumberingProvider.hpp>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/text/XNumberingTypeInfo.hpp>
+#include <vcl/builderfactory.hxx>
 
 #include <unomid.h>
 
@@ -54,8 +55,9 @@ bool SwNumberingTypeListBox::set_property(const OString &rKey, const OString &rV
     return true;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwNumberingTypeListBox(vcl::Window *pParent, VclBuilder::stringmap &)
+VCL_BUILDER_DECL_FACTORY(SwNumberingTypeListBox)
 {
+    (void)rMap;
     SwNumberingTypeListBox *pListBox = new SwNumberingTypeListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP);
     pListBox->EnableAutoSize(true);
     return pListBox;
diff --git a/sw/source/uibase/utlui/condedit.cxx b/sw/source/uibase/utlui/condedit.cxx
index dbf9da5..907ac1f 100644
--- a/sw/source/uibase/utlui/condedit.cxx
+++ b/sw/source/uibase/utlui/condedit.cxx
@@ -21,7 +21,7 @@
 
 #include <condedit.hxx>
 #include <svx/dbaexchange.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 
 using namespace ::svx;
 using namespace ::com::sun::star::uno;
@@ -34,7 +34,7 @@ ConditionEdit::ConditionEdit(vcl::Window* pParent, WinBits nStyle)
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeConditionEdit(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(ConditionEdit)
 {
     VclBuilder::ensureDefaultWidthChars(rMap);
     return new ConditionEdit(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 56d87e6..32bab7f 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -28,6 +28,7 @@
 #include <svx/svxids.hrc>
 #include <svx/numinf.hxx>
 #include <vcl/msgbox.hxx>
+#include <vcl/builderfactory.hxx>
 #include <svx/flagsdef.hxx>
 #include <svl/itemset.hxx>
 #include <docsh.hxx>
@@ -68,7 +69,7 @@ NumFormatListBox::NumFormatListBox(vcl::Window* pWin, WinBits nStyle) :
     Init(css::util::NumberFormat::NUMBER, true);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeNumFormatListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(NumFormatListBox)
 {
     WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK;

More information about the Libreoffice-commits mailing list