summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-04-30 22:57:50 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-04-30 22:57:50 +0200
commit9041dac37f912a6f183be9f6b6558f1ef44280c0 (patch)
tree15d02abd7fd1bff933c375384c60eb98aa023183 /include
parent67a9f79219057f0e57fa309452b9e9748ed95f59 (diff)
Blind fix for MSVC
...preventing full instantiation of boost::ptr_map<OUString,osl::Module> (which fails because osl::Module is not copy-constructible) which MSVC thinks is necessary if that template instantiation inherits the VCL_DLLPUBLIC from the VclBuilder class that uses it. Change-Id: I8cd5608c80d7ce9b12ba678430f5ef283a427e93
Diffstat (limited to 'include')
-rw-r--r--include/vcl/builder.hxx11
1 files changed, 9 insertions, 2 deletions
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index ff7276656aea..fff53c34c3d7 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -30,17 +30,24 @@ 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
{
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
- ModuleMap m_aModuleMap;
+ vcl::detail::ModuleMap m_aModuleMap;
struct PackingData
{