diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-04-21 15:14:49 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2022-04-21 18:03:43 +0200 |
| commit | c09f59eb6173a4a53a2d40ed80aebed18e3882ac (patch) | |
| tree | 632015ac530166b467551cd7cb6ece4470bf588b /desktop | |
| parent | e31cf19e5f5bcdc9e96d1ecd896a611ea035a934 (diff) | |
Drop special-casing for Chart's sidebar property deck
Introduced in commit b33b2afe6a8b4224450da7c686beb81dbf5cd24a
Author Markus Mohrhard <markus.mohrhard@googlemail.com>
Date Thu Jul 09 20:39:06 2015 +0200
big step towards real chart sidebar
later in commit da57c32c5cb27eee38e32d10232b31d459c399df
Author Tor Lillqvist <tml@collabora.com>
Date Fri Feb 28 17:02:30 2020 +0200
tdf#130348: Add special case for ChartDeck, too
and then in commit ff23d87cb00388095a94b90e061564fc179e1823
Author Mert Tumer <mert.tumer@collabora.com>
Date Fri May 08 17:23:12 2020 +0300
mobile: fix calc chart wizard properties is not shown
The normal PropertyDeck can host all the chart-specific panels,
and the other decks that had "all" application context, but are
not needed for charts, have their context fixed.
This cleanup is needed for a following introduction of sidebar
in Math.
Change-Id: I5bb24d52b8dec2133213d7dddfeb91359ed4cb4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133262
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 9a4ec4881805..462e2e5d25af 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -873,22 +873,13 @@ void setupSidebar(std::u16string_view sidebarDeckId = u"") 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.empty()) { pDockingWin->GetSidebarController()->SwitchToDeck(sidebarDeckId); } else { - if (switchToDefault) - pDockingWin->GetSidebarController()->SwitchToDefaultDeck(); + pDockingWin->GetSidebarController()->SwitchToDefaultDeck(); } pDockingWin->SyncUpdate(); |