include/svx/unoshape.hxx | 2 +- svx/source/unodraw/unoshape.cxx | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-)
New commits: commit 0e3f354daa15e92a5a762a638f1674922864943e Author: Xisco Fauli <aniste...@gmail.com> Date: Mon Jun 6 12:47:35 2016 +0200 tdf#89329: use unique_ptr for pImpl in unoshape Change-Id: I1a7a7b68f58430d0975087b0f7c7ab36dc29a686 Reviewed-on: https://gerrit.libreoffice.org/25966 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Michael Stahl <mst...@redhat.com> diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 08c3770..79e3f02 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -119,7 +119,7 @@ private: OUString maShapeName; /** these members are used to optimize XMultiProperty calls */ - SvxShapeImpl* mpImpl; + std::unique_ptr<SvxShapeImpl> mpImpl; bool mbIsMultiPropertyCall; css::uno::WeakReference< css::container::XIndexContainer > mxGluePoints; diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 4c3c4e6..5317374 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -234,9 +234,6 @@ SvxShape::~SvxShape() throw() SdrObject::Free( pObject ); } - delete mpImpl; - mpImpl = nullptr; - EndListeningAll(); // call explicitly within SolarMutexGuard } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits