diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2019-10-19 01:12:07 +0200 |
---|---|---|
committer | Michael Stahl <michael.stahl@cib.de> | 2019-10-21 11:23:04 +0200 |
commit | 13d3b6e5b8323d7af686b7ade2785827b7854920 (patch) | |
tree | a281f9be710a5b5cb8ed277ec93a983b03182087 /sw | |
parent | f28db273e6638325b46efd3a651b414ea1bc6025 (diff) |
Fix FIXME sortMarks should be private (sw)
Change-Id: Iaf9360ae5f722c6fc0afb3cbb8e648b64b89d38d
Reviewed-on: https://gerrit.libreoffice.org/81118
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/doc/CntntIdxStore.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/inc/MarkManager.hxx | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx index 7355257bf711..bc970410eeb1 100644 --- a/sw/source/core/doc/CntntIdxStore.cxx +++ b/sw/source/core/doc/CntntIdxStore.cxx @@ -283,7 +283,7 @@ void ContentIdxStoreImpl::RestoreBkmks(SwDoc* pDoc, updater_t const & rUpdater) if (!m_aBkmkEntries.empty()) { // tdf#105705 sort bookmarks because SaveBkmks special handling of // "bMarkPosEqual" may destroy sort order - dynamic_cast<sw::mark::MarkManager&>(*pMarkAccess).sortMarks(); + pMarkAccess->assureSortedMarkContainers(); } } diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index a97f28c21b53..120149ccc039 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -118,10 +118,9 @@ namespace sw { // make names OUString getUniqueMarkName(const OUString& rName) const; - public: // FIXME should be private, needs refactor - void sortMarks(); - private: + void sortSubsetMarks(); + void sortMarks(); // container for all marks, this container owns the objects it points to container_t m_vAllMarks; |