From 266ce1cd530b4ccb2f6ca8c58553da150e9ef40d Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@collabora.com>
Date: Sat, 9 May 2015 21:15:13 +0100
Subject: tdf#91052 - more macros for 'make' constructors.

Change-Id: Id05266810760f73db2daba10d1efa14aa9f88dd9
---
 formula/source/ui/dlg/funcpage.cxx |  6 ++----
 formula/source/ui/dlg/funcutl.cxx  | 18 +++++-------------
 formula/source/ui/dlg/structpg.cxx |  6 ++----
 3 files changed, 9 insertions(+), 21 deletions(-)

(limited to 'formula')

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"),
-- 
cgit