diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org> | 2018-01-25 01:55:43 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org> | 2018-01-25 01:55:47 +0100 |
| commit | 2caa5e4247b1076961510682a0340657050d49b3 (patch) | |
| tree | 6876dbda4c1afc9c8a573fb41be24b3f24abecb4 | |
| parent | 062275c75db2a0959c853baaf103d900822bacf0 (diff) | |
Remove SwEndNoteInfo::ReleaseCollection
- obsoleted by SwClient::EndListeningAll()
Change-Id: Id086a42e778b7630c44af4a6ddf2a23d77538c2b
| -rw-r--r-- | sw/inc/ftninfo.hxx | 1 | ||||
| -rw-r--r-- | sw/source/core/doc/docnew.cxx | 8 |
2 files changed, 4 insertions, 5 deletions
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 598ba687070b..2794c7a3668b 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -497,8 +497,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"); @@ -710,8 +710,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 |