diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-04-21 15:14:49 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2022-06-05 07:33:48 +0200 |
| commit | 2493e90ef3b955a06c80ecb5e5f6b4173b5b71ef (patch) | |
| tree | 839b9cae6c8ae6766ac494387045ecf09dc07187 /sfx2 | |
| parent | ff053bd7fe05edd55cab25200e2445487e726b08 (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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135395
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/Context.cxx | 9 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/sfx2/source/sidebar/Context.cxx b/sfx2/source/sidebar/Context.cxx index 8a254ebbe2f7..2065fbd0473b 100644 --- a/sfx2/source/sidebar/Context.cxx +++ b/sfx2/source/sidebar/Context.cxx @@ -46,14 +46,7 @@ Context::Context ( sal_Int32 Context::EvaluateMatch ( const Context& rOther) const { - bool bApplicationNameIsAny (rOther.msApplication == AnyApplicationName); - - // special case for charts which use a whole own set of decks - if (msApplication == "com.sun.star.chart2.ChartDocument") - { - bApplicationNameIsAny = false; - } - + const bool bApplicationNameIsAny (rOther.msApplication == AnyApplicationName); if (rOther.msApplication == msApplication || bApplicationNameIsAny) { // Application name matches. diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 279b602cb2a6..1973650a20a1 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -470,9 +470,7 @@ void SidebarController::NotifyResize() // it's the PropertyDeck that really has many panes // that can collapse or expand. For others, limit // the height to something sensible. - // tdf#130348: Add special case for ChartDeck, too. - const sal_Int32 nExtHeight = (msCurrentDeckId == "PropertyDeck" ? 2000 : - (msCurrentDeckId == "ChartDeck" ? 1200 : 600)); + const sal_Int32 nExtHeight = (msCurrentDeckId == "PropertyDeck" ? 2000 : 600); // No TabBar in LOK (use nWidth in full). mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth, nExtHeight); } |