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

[Muhammet Kara (via logerrit)]

 framework/source/services/ContextChangeEventMultiplexer.cxx |   24 ++++++++++--
 1 file changed, 21 insertions(+), 3 deletions(-)

New commits:
commit cf45a48f64b65c4019fe1e5eb543d56b8c6809c1
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Mon Nov 25 21:55:31 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Tue Nov 26 01:56:16 2019 +0100

    tdf#94288: Show chart props sidebar on activation
    
    Change-Id: I2119b59e3b4e36a34c9925cb624558d2da49ecc7
    Reviewed-on: https://gerrit.libreoffice.org/83714
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx
index 66755c88ccc9..0078ae68e0ac 100644
--- a/framework/source/services/ContextChangeEventMultiplexer.cxx
+++ b/framework/source/services/ContextChangeEventMultiplexer.cxx
@@ -163,11 +163,29 @@ void SAL_CALL ContextChangeEventMultiplexer::addContextChangeEventListener (
     // the current context.
     if (rxEventFocus.is() && pFocusDescriptor!=nullptr)
     {
+        if (pFocusDescriptor->msCurrentApplicationName.isEmpty() && pFocusDescriptor->msCurrentContextName.isEmpty()
+                && rxEventFocus.is())
+        {
+            Reference< lang::XServiceInfo > xServInfo( rxEventFocus, uno::UNO_QUERY_THROW );
+            if( xServInfo.is() && xServInfo->getImplementationName() == "com.sun.star.comp.chart2.ChartController")
+            {
+                css::ui::ContextChangeEventObject aEvent (
+                            rxEventFocus,
+                            "com.sun.star.chart2.ChartDocument",
+                            "Chart");
+                rxListener->notifyContextChangeEvent(aEvent);
+
+                return;
+            }
+
+        }
+
         css::ui::ContextChangeEventObject aEvent (
-            nullptr,
-            pFocusDescriptor->msCurrentApplicationName,
-            pFocusDescriptor->msCurrentContextName);
+                    nullptr,
+                    pFocusDescriptor->msCurrentApplicationName,
+                    pFocusDescriptor->msCurrentContextName);
         rxListener->notifyContextChangeEvent(aEvent);
+
     }
 }