[Libreoffice-commits] core.git: include/svx svx/source

Xisco Fauli anistenis at gmail.com
Mon Jun 6 07:08:18 UTC 2016


 include/svx/sdrpagewindow.hxx       |    3 ++-
 svx/source/svdraw/sdrpagewindow.cxx |    2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit e41d9a9ef9579c1f31dbca988d27f8320146a334
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Mon Jun 6 00:44:22 2016 +0200

    tdf#89329: use unique_ptr for pImpl in sdrpagewindow
    
    Change-Id: I001da407617c5dc992986191e78f2cba403ac161
    Reviewed-on: https://gerrit.libreoffice.org/25939
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index 48845fb..0adc7e4 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -24,6 +24,7 @@
 #include <svx/svdtypes.hxx>
 #include <svx/svxdllapi.h>
 #include <rtl/ref.hxx>
+#include <memory>
 
 #include <com/sun/star/awt/XControlContainer.hpp>
 
@@ -47,7 +48,7 @@ class SVX_DLLPUBLIC SdrPageWindow
 {
     struct Impl;
 
-    Impl* mpImpl;
+    std::unique_ptr<Impl> mpImpl;
 
     SdrPageWindow( const SdrPageWindow& ) = delete;
     SdrPageWindow& operator= ( const SdrPageWindow& ) = delete;
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index 642c867..e6db452 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -149,8 +149,6 @@ SdrPageWindow::~SdrPageWindow()
         uno::Reference< lang::XComponent > xComponent(mpImpl->mxControlContainer, uno::UNO_QUERY);
         xComponent->dispose();
     }
-
-    delete mpImpl;
 }
 
 SdrPageView& SdrPageWindow::GetPageView() const


More information about the Libreoffice-commits mailing list