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

Change-Id: Id05266810760f73db2daba10d1efa14aa9f88dd9

4 files changed, 8 insertions, 17 deletions

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);