summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2020-09-23 15:28:26 +0200
committerSzymon Kłos <szymon.klos@collabora.com>2020-10-06 13:22:25 +0200
commit5e7518c980855c51049cf1ca5e8b77363bd1ec19 (patch)
tree0c5291bb58e1f7284dbbc3dc0773434be37a3bdd
parent22d94ce0abef7cdd5e344a28e1b1ee4caf6cd8f8 (diff)
Use default diagram page selection for charts
Change-Id: I0bf0e5d2d1ef43a61c1bb723b25bafa30b5ad5c8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103602 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104013 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
-rw-r--r--chart2/source/controller/sidebar/ChartAreaPanel.cxx15
1 files changed, 14 insertions, 1 deletions
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index de1c21af679a..c5db392cf34f 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -46,7 +46,20 @@ OUString getCID(const css::uno::Reference<css::frame::XModel>& xModel)
css::uno::Any aAny = xSelectionSupplier->getSelection();
if (!aAny.hasValue())
- return OUString();
+ {
+ // if no selection, default to diagram wall so sidebar can show some editable properties
+ ChartController* pController = dynamic_cast<ChartController*>(xController.get());
+ if (pController)
+ {
+ pController->select( css::uno::Any( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) ) );
+ xSelectionSupplier = css::uno::Reference<css::view::XSelectionSupplier>(xController, css::uno::UNO_QUERY);
+ if (xSelectionSupplier.is())
+ aAny = xSelectionSupplier->getSelection();
+ }
+
+ if (!aAny.hasValue())
+ return OUString();
+ }
OUString aCID;
aAny >>= aCID;