From b01554bcdaca076f900c25b672fd691dbe76c9db Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@collabora.com>
Date: Mon, 11 May 2015 09:35:06 +0100
Subject: tdf#91052 - more macros for 'make' constructors.

Change-Id: Ic7ff127e2793993f9dcf1018f8d5ed4f2858a2c4
---
 starmath/source/dialog.cxx  | 14 +++++---------
 starmath/source/utility.cxx |  6 ++----
 2 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'starmath/source')

diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index d185333ad165..24d2ee4e00c5 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -23,7 +23,7 @@
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
 #include <sfx2/app.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/msgbox.hxx>
 #include <svtools/ctrltool.hxx>
@@ -256,7 +256,7 @@ void SmShowFont::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRec
                    (GetOutputSize().Height() - TextSize.Height()) / 2), Text);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSmShowFont(vcl::Window* pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SmShowFont)
 {
     WinBits nWinStyle = 0;
 
@@ -1311,10 +1311,7 @@ void SmShowSymbolSet::dispose()
     VclHBox::dispose();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSmShowSymbolSet(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new SmShowSymbolSet(pParent);
-}
+VCL_BUILDER_FACTORY(SmShowSymbolSet)
 
 void SmShowSymbolSetWindow::calccols()
 {
@@ -1400,7 +1397,7 @@ IMPL_LINK( SmShowSymbolSetWindow, ScrollHdl, ScrollBar*, /*pScrollBar*/)
     return 0;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSmShowSymbol(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SmShowSymbol)
 {
     WinBits nWinStyle = 0;
 
@@ -1694,8 +1691,7 @@ const SmSym * SmSymbolDialog::GetSymbol() const
 }
 
 
-
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSmShowChar(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(SmShowChar)
 {
     WinBits nWinStyle = 0;
 
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 0e54d8e7f606..00485da3dfb0 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -19,6 +19,7 @@
 
 #include <sfx2/app.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/builderfactory.hxx>
 #include <tools/tenccvt.hxx>
 #include <osl/thread.h>
 
@@ -147,10 +148,7 @@ void SmFontPickList::WriteTo(SmFontDialog& rDialog) const
 
 /**************************************************************************/
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSmFontPickListBox(vcl::Window* pParent, VclBuilder::stringmap &)
-{
-    return new SmFontPickListBox(pParent, WB_DROPDOWN);
-}
+VCL_BUILDER_FACTORY_ARGS(SmFontPickListBox, WB_DROPDOWN)
 
 SmFontPickListBox::SmFontPickListBox (vcl::Window* pParent, WinBits nBits) :
     SmFontPickList(4),
-- 
cgit v1.2.3