diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-04-25 18:31:08 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-04-26 15:55:29 +0200 |
| commit | 4f0b568ef35353b276ae560fb43502b6f6b2bfdb (patch) | |
| tree | b336c36b1207fa59ee6402ec2673e3017be48760 | |
| parent | 41df42a8dc758571dd7635c358a09bf412051649 (diff) | |
tdf#38703 i#42807 sw: stop clearing Undo stack on ToX Update
Reverts the "fix" for i#42807 from CWS swqcore08 since there's
now SwUndoUpdateIndex.
Change-Id: I6e71513c4a6da57bafcbc3d57b8fa113153d6c2d
Reviewed-on: https://gerrit.libreoffice.org/71324
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
| -rw-r--r-- | sw/source/core/doc/doc.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/index/toxmgr.cxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/wrtsh/wrtsh2.cxx | 9 |
3 files changed, 0 insertions, 12 deletions
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index de810a488f33..cee2e7745278 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -1733,8 +1733,6 @@ void SwDoc::ChangeTOX(SwTOXBase & rTOX, const SwTOXBase & rNew, { if (GetIDocumentUndoRedo().DoesUndo()) { - GetIDocumentUndoRedo().DelAllUndoObj(); - GetIDocumentUndoRedo().AppendUndo( std::make_unique<SwUndoTOXChange>(this, &rTOX, rNew)); } diff --git a/sw/source/uibase/index/toxmgr.cxx b/sw/source/uibase/index/toxmgr.cxx index afae269713fb..d2ed262f00b2 100644 --- a/sw/source/uibase/index/toxmgr.cxx +++ b/sw/source/uibase/index/toxmgr.cxx @@ -436,7 +436,6 @@ bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc, if (pDoc->GetIDocumentUndoRedo().DoesUndo()) { - pDoc->GetIDocumentUndoRedo().DelAllUndoObj(); pDoc->GetIDocumentUndoRedo().StartUndo(SwUndoId::TOXCHANGE, nullptr); } diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx index 6fbd3d6203d9..9298ffb95494 100644 --- a/sw/source/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/uibase/wrtsh/wrtsh2.cxx @@ -324,15 +324,6 @@ void SwWrtShell::UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet) if(CanInsert()) { SwEditShell::UpdateTableOf(rTOX, pSet); - - if (pSet == nullptr) - { - SwDoc *const pDoc_ = GetDoc(); - if (pDoc_) - { - pDoc_->GetIDocumentUndoRedo().DelAllUndoObj(); - } - } } } |