[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756' - sfx2/source

Serge Krot (via logerrit) logerrit at kemper.freedesktop.org
Fri Nov 8 16:40:35 UTC 2019


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

New commits:
commit b92e774bbfe83aba80c8d480399887394937cc96
Author:     Serge Krot <Serge.Krot at cib.de>
AuthorDate: Fri Nov 8 17:31:49 2019 +0100
Commit:     Serge Krot (CIB) <Serge.Krot at cib.de>
CommitDate: Fri Nov 8 17:39:46 2019 +0100

    Switch to read-only mode: do not force reload document if possible
    
    Change-Id: I5f83e7626e58cb4b558b54130b725b1041b7142f
    Reviewed-on: https://gerrit.libreoffice.org/82313
    Reviewed-by: Serge Krot (CIB) <Serge.Krot at cib.de>
    Tested-by: Serge Krot (CIB) <Serge.Krot at cib.de>

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
old mode 100644
new mode 100755
index fafe5df417dc..e3f39e3aab40
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -459,6 +459,8 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                  || pVersionItem )
             // <- tdf#82744
             {
+                bNeedsReload = true;
+
                 bool bOK = false;
                 bool bRetryIgnoringLock = false;
                 bool bOpenTemplate = false;
@@ -601,7 +603,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                 }
             }
 
-            rReq.AppendItem( SfxBoolItem( SID_FORCERELOAD, true) );
+            rReq.AppendItem( SfxBoolItem( SID_FORCERELOAD, bNeedsReload) );
             rReq.AppendItem( SfxBoolItem( SID_SILENT, true ));
 
             [[fallthrough]]; //TODO ???


More information about the Libreoffice-commits mailing list