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

[Mert Tumer (via logerrit)]

 desktop/source/lib/init.cxx                |   20 ++++++++++++++++----
 include/sfx2/sidebar/SidebarController.hxx |    1 +
 2 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 3e8917702642595526a43f3d6866ba9b0446e50b
Author:     Mert Tumer <mert.tumer at collabora.com>
AuthorDate: Fri May 8 17:23:12 2020 +0300
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Jun 26 11:30:31 2020 +0200

    mobile: fix calc chart wizard properties is not shown
    
    Change-Id: I2fd98ddbdb529c3f224299c6824b4743797925be
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93747
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97061
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2190c7d49e6a..69e8073b0bd0 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -886,10 +886,24 @@ void setupSidebar(bool bShow, OUString sidebarDeckId = "")
         if (!pDockingWin)
             return;
 
+        OUString currentDeckId = pDockingWin->GetSidebarController()->GetCurrentDeckId();
+
+        // check if it is the chart deck id, if it is, don't switch to default deck
+        bool switchToDefault = true;
+
+        if (currentDeckId == "ChartDeck")
+            switchToDefault = false;
+
         if (!sidebarDeckId.isEmpty())
         {
             pDockingWin->GetSidebarController()->SwitchToDeck(sidebarDeckId);
         }
+        else
+        {
+            if (switchToDefault)
+                pDockingWin->GetSidebarController()->SwitchToDefaultDeck();
+        }
+
         pDockingWin->SyncUpdate();
     }
     else
@@ -3801,7 +3815,6 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* pThis, const char* pComma
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
     OUString aCommand(pCommand, strlen(pCommand), RTL_TEXTENCODING_UTF8);
     LibLODocument_Impl* pDocument = static_cast<LibLODocument_Impl*>(pThis);
-    OUString sidebarDeckId = "PropertyDeck";
 
     std::vector<beans::PropertyValue> aPropertyValuesVector(jsonToPropertyValuesVector(pArguments));
 
@@ -3934,13 +3947,12 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* pThis, const char* pComma
     }
     else if (gImpl && aCommand == ".uno:LOKSidebarWriterPage")
     {
-        sidebarDeckId = "WriterPageDeck";
-        setupSidebar(true, sidebarDeckId);
+        setupSidebar(true, "WriterPageDeck");
         return;
     }
     else if (gImpl && aCommand == ".uno:SidebarShow")
     {
-        setupSidebar(true, sidebarDeckId);
+        setupSidebar(true);
         return;
     }
     else if (gImpl && aCommand == ".uno:SidebarHide")
diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx
index eb459b1a708f..440ff55b7bfc 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -134,6 +134,7 @@ public:
     FocusManager& GetFocusManager() { return maFocusManager;}
 
     ResourceManager* GetResourceManager() { return mpResourceManager.get();}
+    auto& GetCurrentDeckId() const { return msCurrentDeckId; }
 
    // std::unique_ptr<ResourceManager> GetResourceManager() { return mpResourceManager;}