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

[Bjoern Michaelsen]

 sw/inc/ftninfo.hxx            |    1 -
 sw/source/core/doc/docnew.cxx |    8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 80fc1fe32aff770164e257ab63f715be9cd2d5ab
Author: Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
Date:   Thu Jan 25 01:55:43 2018 +0100

    Remove SwEndNoteInfo::ReleaseCollection
    
    - obsoleted by SwClient::EndListeningAll()
    
    Change-Id: Id086a42e778b7630c44af4a6ddf2a23d77538c2b
    Reviewed-on: https://gerrit.libreoffice.org/48549
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at libreoffice.org>

diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index eeeb39e1129d..9a6982a81893 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -71,7 +71,6 @@ public:
 
     void SetPrefix(const OUString& rSet) { sPrefix = rSet; }
     void SetSuffix(const OUString& rSet) { sSuffix = rSet; }
-    void ReleaseCollection() { if ( GetRegisteredInNonConst() ) GetRegisteredInNonConst()->Remove( this ); }
 };
 
 enum SwFootnotePos
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index e71260ac584e..5c55de44eb9a 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -498,8 +498,8 @@ SwDoc::~SwDoc()
 
     // Delete for Collections
     // So that we get rid of the dependencies
-    mpFootnoteInfo->ReleaseCollection();
-    mpEndNoteInfo->ReleaseCollection();
+    mpFootnoteInfo->EndListeningAll();
+    mpEndNoteInfo->EndListeningAll();
 
     assert(mpDfltTextFormatColl == (*mpTextFormatCollTable)[0]
             && "Default-Text-Collection must always be at the start");
@@ -711,8 +711,8 @@ void SwDoc::ClearDoc()
 
     // Delete for Collections
     // So that we get rid of the dependencies
-    mpFootnoteInfo->ReleaseCollection();
-    mpEndNoteInfo->ReleaseCollection();
+    mpFootnoteInfo->EndListeningAll();
+    mpEndNoteInfo->EndListeningAll();
 
     // Optimization: Based on the fact that Standard is always 2nd in the
     // array, we should delete it as the last. With this we avoid