[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - chart2/source

[Szymon KÅ‚os (via logerrit)]

 chart2/source/controller/sidebar/ChartAreaPanel.cxx |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit aab50bda474910198a048a0714206775300efb40
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Sep 23 15:28:26 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Oct 5 21:53:08 2020 +0200

    Use default diagram page selection for charts
    
    Change-Id: I0bf0e5d2d1ef43a61c1bb723b25bafa30b5ad5c8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103602
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index 959ba2657675..61680fb70716 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;