diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2019-10-01 20:34:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-02 08:01:59 +0200 |
| commit | d820136dab6271dd591842002b2591e041801cf7 (patch) | |
| tree | b9ca863a858ea994eba8cf3bf445088dfabbd2e5 /sd/source | |
| parent | b1ca0e5ad728e1d4105c961b27c9256d86f867c1 (diff) | |
save/restore locking properly in ImplSdPPTImport::Import
noticed in passing
Change-Id: Ia13b1095e1dcc576f767af90bd1c001ab03f2c44
Reviewed-on: https://gerrit.libreoffice.org/79993
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 606bb18a8025..92327dbee3f2 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -226,6 +226,7 @@ bool ImplSdPPTImport::Import() if ( !m_bOk ) return false; + bool bWasLocked = pSdrModel->isLocked(); pSdrModel->setLock(true); const bool bSavedUndoEnabled = pSdrModel->IsUndoEnabled(); pSdrModel->EnableUndo(false); @@ -1396,7 +1397,7 @@ bool ImplSdPPTImport::Import() sfx2::LoadOlePropertySet(xDocProps, &mrStorage); xDocProps->setTemplateName(OUString()); - pSdrModel->setLock(false); + pSdrModel->setLock(bWasLocked); pSdrModel->EnableUndo(bSavedUndoEnabled); return m_bOk; } |