[Libreoffice-commits] core.git: sfx2/source

[Samuel Mehrbrodt (via logerrit)]

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

New commits:
commit a9634d6cb31d7aa9184c5f234fb6f8c1c6885357
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Mon Feb 17 17:00:27 2020 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Thu Feb 20 09:58:26 2020 +0100

    Revert "Don't display reload as toggle command"
    
    Turns out the reload toggle is used to turn off html documents meta refresh
    https://www.w3schools.com/TAGS/att_meta_http_equiv.asp where LibreOffice honours that html refresh and toggling this off will stop it doing that
    
    This reverts commit 89b80daec907a456f08946dd9ebbc6efbd9b5391.
    
    Change-Id: I6928a693d5ffde9ea01020be4e59631e8b10be93
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88793
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 3534e2b889aa..4d697710c0af 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -931,6 +931,13 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
             {
                 if ( !pSh->CanReload_Impl() || pSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED )
                     rSet.DisableItem(nWhich);
+                else
+                {
+                    // If any ChildFrame is reloadable, the slot is enabled,
+                    // so you can perform CTRL-Reload
+                    rSet.Put( SfxBoolItem( nWhich, false));
+                }
+
                 break;
             }
         }