diff options
| author | Mert Tumer <mert.tumer@collabora.com> | 2020-05-08 17:23:12 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-05-10 16:38:58 +0200 |
| commit | 3ea23d3b13e08f2ac9d83446acc588bbf1d4ad74 (patch) | |
| tree | 935e775d458a92677eda4662bb3f541b3a04a1bc /desktop | |
| parent | lok: unit test for metric field or formatted field control (diff) | |
| download | core-3ea23d3b13e08f2ac9d83446acc588bbf1d4ad74.tar.gz core-3ea23d3b13e08f2ac9d83446acc588bbf1d4ad74.zip | |
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@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 40c19ca439fd..203ece44ef51 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -1147,10 +1147,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 @@ -3661,7 +3675,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)); @@ -3795,13 +3808,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") |