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

Change-Id: Id05266810760f73db2daba10d1efa14aa9f88dd9

3 files changed, 8 insertions, 5 deletions

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 4b3fb8fcee37..37e653e1ad00 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -38,6 +38,7 @@
 #include <vcl/layout.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include <osl/mutex.hxx>
 
@@ -195,8 +196,9 @@ void ExtBoxWithBtns_Impl::InitFromDialog(ExtMgrDialog *pParentDialog)
 }
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtBoxWithBtns(vcl::Window *pParent, VclBuilder::stringmap &)
+VCL_BUILDER_DECL_FACTORY(ExtBoxWithBtns)
 {
+    (void)rMap;
     return new ExtBoxWithBtns_Impl(pParent);
 }
 
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 85b9e41d7c27..77e926f0ef96 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/deployment/DeploymentException.hpp>
 #include <cppuhelper/weakref.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 
 #define USER_PACKAGE_MANAGER    "user"
 #define SHARED_PACKAGE_MANAGER  "shared"
@@ -829,8 +830,9 @@ Size ExtensionBox_Impl::GetOptimalSize() const
     return LogicToPixel(Size(250, 150), MAP_APPFONT);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtensionBox(vcl::Window *pParent, VclBuilder::stringmap &)
+VCL_BUILDER_DECL_FACTORY(ExtensionBox)
 {
+    (void)rMap;
     return new ExtensionBox_Impl(pParent);
 }
 
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 45074279813c..141d64b2ddc7 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -33,8 +33,7 @@
 #include <vcl/xtextedt.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/threadex.hxx>
-
-
+#include <vcl/builderfactory.hxx>
 
 #include <boost/bind.hpp>
 #include "dp_gui_shared.hxx"
@@ -127,7 +126,7 @@ LicenseView::LicenseView( vcl::Window* pParent, WinBits nStyle )
     StartListening( *GetTextEngine() );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLicenseView(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+VCL_BUILDER_DECL_FACTORY(LicenseView)
 {
     WinBits nWinStyle = WB_CLIPCHILDREN|WB_LEFT;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);