5 files changed, 11 insertions, 22 deletions
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index c3aabda5c4aa..5437aff4bcab 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -24,7 +24,7 @@
 #include <sfx2/sfx.hrc>
 #include <sfx2/sfxresid.hxx>
 #include <unotools/historyoptions.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/pngread.hxx>
 #include <tools/urlobj.hxx>
 #include <com/sun/star/util/URLTransformer.hpp>
@@ -57,10 +57,7 @@ RecentDocsView::RecentDocsView( vcl::Window* pParent )
     setItemDimensions( mnItemMaxSize, mnItemMaxSize, mnTextHeight, mnItemPadding );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRecentDocsView(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new RecentDocsView(pParent);
-}
+VCL_BUILDER_FACTORY(RecentDocsView)
 
 bool RecentDocsView::typeMatchesExtension(ApplicationType type, const OUString &rExt)
 {
diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx
index 3c42d29b508c..61c3f2c07fa0 100644
--- a/sfx2/source/control/templatedefaultview.cxx
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -9,13 +9,10 @@
 
 #include <sfx2/templatedefaultview.hxx>
 #include <sfx2/thumbnailview.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <sfx2/app.hxx>
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTemplateDefaultView(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new TemplateDefaultView(pParent);
-}
+VCL_BUILDER_FACTORY(TemplateDefaultView)
 
 TemplateDefaultView::TemplateDefaultView( Window* pParent)
     : TemplateLocalView(pParent)
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index c2e42d9a7eae..2dbbad5174e3 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -16,7 +16,7 @@
 #include <svl/inettype.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 #include <vcl/pngread.hxx>
 
 #include <com/sun/star/embed/ElementModes.hpp>
@@ -38,10 +38,7 @@ TemplateLocalView::TemplateLocalView ( vcl::Window* pParent)
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTemplateLocalView(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new TemplateLocalView(pParent);
-}
+VCL_BUILDER_FACTORY(TemplateLocalView)
 
 TemplateLocalView::~TemplateLocalView()
 {
diff --git a/sfx2/source/control/templateremoteview.cxx b/sfx2/source/control/templateremoteview.cxx
index f33407a8e5f8..ffc0b7b3b3f1 100644
--- a/sfx2/source/control/templateremoteview.cxx
+++ b/sfx2/source/control/templateremoteview.cxx
@@ -16,7 +16,7 @@
 #include <tools/urlobj.hxx>
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/commandenvironment.hxx>
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
@@ -54,8 +54,9 @@ TemplateRemoteView::TemplateRemoteView (vcl::Window *pParent, WinBits nWinStyle,
     m_xCmdEnv = new ucbhelper::CommandEnvironment( xGlobalInteractionHandler, Reference< XProgressHandler >() );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTemplateRemoteView(vcl::Window *pParent, VclBuilder::stringmap &)
+VCL_BUILDER_DECL_FACTORY(TemplateRemoteView)
 {
+    (void)rMap;
     return new TemplateRemoteView(pParent, WB_VSCROLL, false);
 }
 
diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx
index 7ba4e8248548..30cd035da20d 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -10,17 +10,14 @@
 #include "templatesearchview.hxx"
 #include "templatesearchviewitem.hxx"
 
-#include <vcl/builder.hxx>
+#include <vcl/builderfactory.hxx>
 
 TemplateSearchView::TemplateSearchView (vcl::Window *pParent, WinBits nWinStyle)
     : ThumbnailView(pParent,nWinStyle)
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTemplateSearchView(vcl::Window *pParent, VclBuilder::stringmap &)
-{
-    return new TemplateSearchView(pParent);
-}
+VCL_BUILDER_FACTORY(TemplateSearchView)
 
 void TemplateSearchView::setOpenTemplateHdl(const Link<> &rLink)
 {