Revert "Blind fix for MSVC"

9041dac3.  The correct fix was
f4227c82 "Blind fix for MSVC, take two."

Change-Id: I6c319a0f7a1d3dbcffbd4be8ac02682e5fdd7802

include/vcl/builder.hxx

@@ -31,24 +31,17 @@ class DateField;
 class TimeField;
 class VclMultiLineEdit;
 
-namespace vcl { namespace detail {
-
-class SAL_DLLPUBLIC_TEMPLATE ModuleMap:
-    public boost::ptr_map<OUString, osl::Module>
-{};
-
-} }
-
 class VCL_DLLPUBLIC VclBuilder: private boost::noncopyable
 {
 public:
     typedef std::map<OString, OString> stringmap;
     typedef Window* (*customMakeWidget)(Window *pParent, stringmap &rVec);
 private:
+    typedef boost::ptr_map<OUString, osl::Module> ModuleMap;
     //We store these until the builder is deleted, that way we can use the
     //ui-previewer on custom widgets and guarantee the modules they are from
     //exist for the duration of the dialog
-    vcl::detail::ModuleMap m_aModuleMap;
+    ModuleMap m_aModuleMap;
 
     //If the toplevel window has any properties which need to be set on it,
     //but the toplevel is the owner of the builder, then its ctor

vcl/source/window/builder.cxx

@@ -1223,7 +1223,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
             OUString sFunction(OStringToOUString(OString("make") + name.copy(nDelim+1), RTL_TEXTENCODING_UTF8));
 #ifndef DISABLE_DYNLOADING
             OUString sModule = sModuleBuf.makeStringAndClear();
-            vcl::detail::ModuleMap::iterator aI = m_aModuleMap.find(sModule);
+            ModuleMap::iterator aI = m_aModuleMap.find(sModule);
             osl::Module* pModule = NULL;
             if (aI == m_aModuleMap.end())
             {