core.git: Branch 'distro/collabora/co-24.04' - sfx2/source

[Szymon Kłos (via logerrit)]

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

New commits:
commit 031f11bd9096fb192ced1328f9bbcd1b1903e3e7
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Jan 26 16:54:14 2024 +0100
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon Jan 29 04:47:59 2024 +0100

    lok: always toggle sidebar deck
    
    This fixes regression from:
    commit 53fc5fa0fed077b7d11e39b710280f0a84b631ff
    tdf#142978 Show a11y sidebar when finding issues on PDF export
    
    LOK was unable to close sidebar
    
    Change-Id: Icd96394523020c30e63858bc372ba136c2be8158
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162608
    Tested-by: Szymon Kłos <szymon.k...@collabora.com>
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index abb616ce5505..b76354b14705 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3350,8 +3350,11 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
         if (pDeckIdItem)
         {
             const OUString aDeckId(pDeckIdItem->GetValue());
+            // Compatibility with old LOK "toggle always"
+            // TODO: check LOK with tdf#142978 Show a11y sidebar when finding 
issues on PDF export, hash: 53fc5fa
+            const bool isLOK = comphelper::LibreOfficeKit::isActive();
             const SfxBoolItem* pToggleItem = 
rReq.GetArg<SfxBoolItem>(SID_SIDEBAR_DECK_TOGGLE);
-            bool bToggle = pToggleItem && pToggleItem->GetValue();
+            bool bToggle = isLOK || (pToggleItem && pToggleItem->GetValue());
             ::sfx2::sidebar::Sidebar::ShowDeck(aDeckId, this, bToggle);
         }
         rReq.Done();