comphelper/source/container/embeddedobjectcontainer.cxx | 7 +++---- include/comphelper/embeddedobjectcontainer.hxx | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit e88107c0552a2165d3e3e8137ebbd80d97b5570e Author: Xisco Fauli <[email protected]> Date: Wed Jun 1 01:25:41 2016 +0200 tdf#89329: use unique_ptr for pImpl in embeddedobjectcontainer Change-Id: I679555e2eb51e2b9660bb035a08d8da8b1687cab Reviewed-on: https://gerrit.libreoffice.org/25747 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index 65d41aa..8207e5a 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -96,8 +96,8 @@ const uno::Reference < embed::XStorage >& EmbedImpl::GetReplacements() } EmbeddedObjectContainer::EmbeddedObjectContainer() + : pImpl(new EmbedImpl) { - pImpl = new EmbedImpl; pImpl->mxStorage = ::comphelper::OStorageHelper::GetTemporaryStorage(); pImpl->mbOwnsStorage = true; pImpl->mbUserAllowsLinkUpdate = true; @@ -105,8 +105,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer() } EmbeddedObjectContainer::EmbeddedObjectContainer( const uno::Reference < embed::XStorage >& rStor ) + : pImpl(new EmbedImpl) { - pImpl = new EmbedImpl; pImpl->mxStorage = rStor; pImpl->mbOwnsStorage = false; pImpl->mbUserAllowsLinkUpdate = true; @@ -114,8 +114,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer( const uno::Reference < embed:: } EmbeddedObjectContainer::EmbeddedObjectContainer( const uno::Reference < embed::XStorage >& rStor, const uno::Reference < uno::XInterface >& xModel ) + : pImpl(new EmbedImpl) { - pImpl = new EmbedImpl; pImpl->mxStorage = rStor; pImpl->mbOwnsStorage = false; pImpl->mbUserAllowsLinkUpdate = true; @@ -191,7 +191,6 @@ EmbeddedObjectContainer::~EmbeddedObjectContainer() pImpl->mxStorage->dispose(); delete pImpl->mpTempObjectContainer; - delete pImpl; } void EmbeddedObjectContainer::CloseEmbeddedObjects() diff --git a/include/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx index a54aa2a..70a583c 100644 --- a/include/comphelper/embeddedobjectcontainer.hxx +++ b/include/comphelper/embeddedobjectcontainer.hxx @@ -30,6 +30,7 @@ #include <comphelper/comphelperdllapi.h> #include <rtl/ustring.hxx> +#include <memory> namespace comphelper { @@ -52,7 +53,7 @@ namespace comphelper struct EmbedImpl; class COMPHELPER_DLLPUBLIC EmbeddedObjectContainer { - EmbedImpl* pImpl; + std::unique_ptr<EmbedImpl> pImpl; css::uno::Reference < css::embed::XEmbeddedObject > Get_Impl( const OUString&, const css::uno::Reference < css::embed::XEmbeddedObject >& xCopy, _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
