[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source

[Mert Tumer (via logerrit)]

 desktop/source/lib/init.cxx |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 2f283b44c708f3b30cef25ebd8e04a5b4c48c626
Author:     Mert Tumer <mert.tumer at collabora.com>
AuthorDate: Wed Jun 10 14:41:41 2020 +0300
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Jun 26 11:30:51 2020 +0200

    Fix .uno:SidebarHide command works for online
    
    Change-Id: I03743d15300687b1da947d3c44be6a42aab83107
    Signed-off-by: Mert Tumer <mert.tumer at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96618
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97059

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 69e8073b0bd0..51a8c80ad049 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -910,6 +910,16 @@ void setupSidebar(bool bShow, OUString sidebarDeckId = "")
         SetLastExceptionMsg("No view shell or sidebar");
 }
 
+void hideSidebar()
+{
+    SfxViewShell* pViewShell = SfxViewShell::Current();
+    SfxViewFrame* pViewFrame = pViewShell? pViewShell->GetViewFrame(): nullptr;
+    if (pViewFrame)
+        pViewFrame->SetChildWindow(SID_SIDEBAR, false, false);
+    else
+        SetLastExceptionMsg("No view shell or sidebar");
+}
+
 VclPtr<Window> getSidebarWindow()
 {
     VclPtr<Window> xRet;
@@ -3957,7 +3967,7 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* pThis, const char* pComma
     }
     else if (gImpl && aCommand == ".uno:SidebarHide")
     {
-        setupSidebar(false);
+        hideSidebar();
         return;
     }