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

Change-Id: Id05266810760f73db2daba10d1efa14aa9f88dd9

6 files changed, 19 insertions, 20 deletions

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