[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - sfx2/source

[Michael Stahl (via logerrit)]

 sfx2/source/view/viewfrm.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 61b0c6605932873ccf8ef321cbb41464d366cb70
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Tue Jun 27 19:50:51 2023 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Jun 28 12:52:48 2023 +0200

    tdf#146547 sfx2: preserve modified state from read-only to editable
    
    SfxViewFrame::ExecReload_Impl() calls DoSaveCompleted() which resets the
    modified state, but in this case the document wasn't actually saved.
    
    Change-Id: I54f6508a652cc42a127bc59058c5b435dd1a25a2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153676
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 79241a1fd32ab03cd2bb34fb303ce7f2fa93e57e)

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 2b39c4b1ef3c..bbfb37e5291d 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -330,9 +330,12 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                             m_pFrame->RemoveInfoBar("readonly");
                         if (m_pMed)
                         {
+                            bool const 
isEnableSetModified(m_pSh->IsEnableSetModified());
+                            m_pSh->EnableSetModified(false);
                             // tdf#116066: DoSaveCompleted should be called 
after SetReadOnlyUI
                             m_pSh->DoSaveCompleted(m_pMed);
                             m_pSh->Broadcast(SfxHint(SfxHintId::ModeChanged));
+                            m_pSh->EnableSetModified(isEnableSetModified);
                         }
                     }
                 }