summaryrefslogtreecommitdiff
path: root/include/vcl/builder.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-05-06 14:17:42 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-05-06 14:17:42 +0200
commit3def5194ddaf9c4d766b71527874bd1a973b43e5 (patch)
tree6505c7bce8f695322d50b736a3be52ab7e1bbcff /include/vcl/builder.hxx
parent3992cf60d7f025744e473d5dc97f435a0af4f8f0 (diff)
Revert "Blind fix for MSVC"
9041dac37f912a6f183be9f6b6558f1ef44280c0. The correct fix was f4227c822c7f5a4e1e1b3b4e096cb63cf710a3f1 "Blind fix for MSVC, take two." Change-Id: I6c319a0f7a1d3dbcffbd4be8ac02682e5fdd7802
Diffstat (limited to 'include/vcl/builder.hxx')
-rw-r--r--include/vcl/builder.hxx11
1 files changed, 2 insertions, 9 deletions
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 51d3efc72bd1..bb63cf20d535 100644
--- a/include/vcl/builder.hxx
+++ b/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