diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-16 13:51:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-17 09:00:55 +0200 |
| commit | 7fac547c442aa699d94c48e40fcf8b58f9457161 (patch) | |
| tree | 440caf2b2de05ec40ac8a96301cecfd824d33505 /include | |
| parent | da6de7dacb7001b569718d413a90f4f56bf0dd31 (diff) | |
use rtl::Reference in SvXMLEmbeddedObjectHelper
instead of manual ref counting
Change-Id: I6b88b72dd28183feca46fc04841a2e8f19e5c47a
Reviewed-on: https://gerrit.libreoffice.org/43421
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/xmleohlp.hxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx index 8d93889e3723..b2aafdac31f3 100644 --- a/include/svx/xmleohlp.hxx +++ b/include/svx/xmleohlp.hxx @@ -22,12 +22,13 @@ #include <cppuhelper/compbase.hxx> #include <osl/mutex.hxx> -#include <map> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/document/XEmbeddedObjectResolver.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <svx/svxdllapi.h> +#include <map> +#include <memory> enum class SvXMLEmbeddedObjectHelperMode { @@ -43,9 +44,6 @@ class OutputStorageWrapper_Impl; class SVX_DLLPUBLIC SvXMLEmbeddedObjectHelper : public cppu::WeakComponentImplHelper< css::document::XEmbeddedObjectResolver, css::container::XNameAccess > { - typedef ::std::map< OUString, OutputStorageWrapper_Impl* > SvXMLEmbeddedObjectHelper_Impl; -private: - ::osl::Mutex maMutex; const OUString maReplacementGraphicsContainerStorageName; @@ -59,7 +57,8 @@ private: css::uno::Reference < css::embed::XStorage > mxTempStorage; // package // objects SvXMLEmbeddedObjectHelperMode meCreateMode; - SvXMLEmbeddedObjectHelper_Impl *mpStreamMap; + std::unique_ptr<std::map< OUString, rtl::Reference<OutputStorageWrapper_Impl> >> + mpStreamMap; SVX_DLLPRIVATE bool ImplGetStorageNames( const OUString& rURLStr, |