diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-13 09:48:54 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-18 07:22:32 +0100 |
commit | b06b3bcc6900014989da8060d126a45f31c9b8b7 (patch) | |
tree | e55aff0c04494c1008d298b6521d92610be6e45e /xmloff/source/text/XMLPropertyBackpatcher.hxx | |
parent | 80d44971b6e857a40f2716645fb22b84ac15deef (diff) |
use unique_ptr in XMLPropertyBackpatcher
and drop what looks like a very old (from 2000) workaround for long
typenames and linker problems
Change-Id: I9b4b42b0c37cacaa447a104bd2cf0d4aa76ba5fc
Reviewed-on: https://gerrit.libreoffice.org/65142
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff/source/text/XMLPropertyBackpatcher.hxx')
-rw-r--r-- | xmloff/source/text/XMLPropertyBackpatcher.hxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx index 8747b8aad00b..029f25e66e4a 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.hxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx @@ -22,6 +22,7 @@ #define INCLUDED_XMLOFF_SOURCE_TEXT_XMLPROPERTYBACKPATCHER_HXX #include <map> +#include <memory> #include <vector> namespace com { namespace sun { namespace star { @@ -65,13 +66,8 @@ class XMLPropertyBackpatcher typedef ::std::vector< css::uno::Reference<css::beans::XPropertySet> > BackpatchListType; - /* use void* instead of BackpatchListType to avoid linker problems - with long typenames. The real typename (commented out) contains - >1200 chars. */ - /// backpatch list for unresolved IDs - //::std::map<const OUString, BackpatchListType*> aBackpatchListMap; - ::std::map<const OUString, void*> aBackpatchListMap; + ::std::map<const OUString, std::unique_ptr<BackpatchListType>> aBackpatchListMap; /// mapping of names -> IDs ::std::map<const OUString, A> aIDMap; |