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

Miklos Vajna vmiklos at collabora.co.uk
Sat Mar 22 06:22:46 PDT 2014


 sw/inc/docary.hxx               |    1 +
 sw/source/core/doc/docnew.cxx   |    2 +-
 sw/source/core/doc/docredln.cxx |    5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 3d5349f290deead4d47708ac8e30da47a76b9177
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Mar 22 14:03:23 2014 +0100

    missing SwExtraRedlineTbl dtor
    
    Change-Id: I58eaedd89fa039945a3907c8f8858599ea5bbe9c

diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 4c51c57..b9c6f95 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -190,6 +190,7 @@ private:
     std::vector<SwExtraRedline*>    m_aExtraRedlines;
 
 public:
+    ~SwExtraRedlineTbl();
     sal_uInt16 GetPos(const SwExtraRedline* p) const;
 
     bool Insert( SwExtraRedline* p );
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index b15be74..4666eb36 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -531,7 +531,7 @@ SwDoc::~SwDoc()
     mbDtor = true;
 
     delete mpRedlineTbl;
-    delete mpExtraRedlineTbl;
+    delete mpExtraRedlineTbl, mpExtraRedlineTbl = 0;
     delete mpUnoCrsrTbl;
     delete mpAutoFmtRedlnComment;
     delete mpUpdtFlds;
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 9af892d..1f63587 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -217,6 +217,11 @@ const SwExtraRedlineTbl& SwDoc::GetExtraRedlineTbl() const
     return *mpExtraRedlineTbl;
 }
 
+SwExtraRedlineTbl::~SwExtraRedlineTbl()
+{
+    DeleteAndDestroyAll();
+}
+
 bool SwDoc::IsRedlineMove() const
 {
     return mbIsRedlineMove;


More information about the Libreoffice-commits mailing list