[Libreoffice-commits] core.git: sw/source

Noel Grandin noel.grandin at collabora.co.uk
Fri Oct 27 09:05:58 UTC 2017


 sw/source/core/doc/DocumentRedlineManager.cxx |    2 --
 sw/source/core/inc/DocumentRedlineManager.hxx |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit ab60b88390097dd98ad1e765b8dd94d1abaa3c65
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Oct 26 10:58:39 2017 +0200

    use std::unique_ptr in DocumentRedlineManager
    
    Change-Id: Iba073b3a251827fefaba790e33dfc7c01b0b2154
    Reviewed-on: https://gerrit.libreoffice.org/43897
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index 672412edfeba..47482eb2f5bc 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -2696,8 +2696,6 @@ void DocumentRedlineManager::checkRedlining(RedlineFlags& _rReadlineMode)
 
 DocumentRedlineManager::~DocumentRedlineManager()
 {
-    delete mpRedlineTable; mpRedlineTable = nullptr;
-    delete mpExtraRedlineTable; mpExtraRedlineTable = nullptr;
 }
 
 }
diff --git a/sw/source/core/inc/DocumentRedlineManager.hxx b/sw/source/core/inc/DocumentRedlineManager.hxx
index afe8d4090271..166c7e56804d 100644
--- a/sw/source/core/inc/DocumentRedlineManager.hxx
+++ b/sw/source/core/inc/DocumentRedlineManager.hxx
@@ -130,8 +130,8 @@ private:
     SwDoc& m_rDoc;
 
     RedlineFlags meRedlineFlags;     //< Current Redline Mode.
-    SwRedlineTable        *mpRedlineTable;           //< List of all Ranged Redlines.
-    SwExtraRedlineTable   *mpExtraRedlineTable;      //< List of all Extra Redlines.
+    std::unique_ptr<SwRedlineTable> mpRedlineTable;           //< List of all Ranged Redlines.
+    std::unique_ptr<SwExtraRedlineTable> mpExtraRedlineTable;      //< List of all Extra Redlines.
     std::unique_ptr<OUString> mpAutoFormatRedlnComment;  //< Comment for Redlines inserted via AutoFormat.
     bool mbIsRedlineMove;    //< true: Redlines are moved into to / out of the section.
     bool mbReadlineChecked;    //< true: if the query was already shown


More information about the Libreoffice-commits mailing list