diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-07-29 17:45:03 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-07-30 00:02:32 +0200 |
| commit | 2036db5ecd227f97e0e5ab403de61b80fff93c38 (patch) | |
| tree | e071ab562f91126143c2bc98653c0e2b6e0bae14 /sfx2 | |
| parent | db46b03885e5814fa904b4f1190a0063f198c1b6 (diff) | |
tdf#135244: move LockAllViews to SfxObjectShell
... so that it may be called from SfxObjectShell::SaveTo_Impl, and
handle export cases in addition to save (as) handled in tdf#41063.
Change-Id: Ie39196656dd1a95dcb6bab3ae8138c2f5c8729e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99714
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index f3a6b22f0a11..0d4f04702d3c 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -1134,6 +1134,8 @@ bool SfxObjectShell::SaveTo_Impl UpdateDocInfoForSave(); ModifyBlocker_Impl aMod(this); + // tdf#41063, tdf#135244: prevent jumping to cursor at any temporary modification + auto aViewGuard(LockAllViews()); std::shared_ptr<const SfxFilter> pFilter = rMedium.GetFilter(); if ( !pFilter ) |