core.git: Branch 'distro/collabora/co-25.04' - chart2/source

[Mike Kaganski (via logerrit)]

 chart2/source/controller/main/ControllerCommandDispatch.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 607efd59d2b8f996d1432e95645cd71436d2d851
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Sep 15 11:46:28 2025 +0500
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Sep 15 15:02:28 2025 +0200

    tdf#168320: these commands are only relevant for LOK
    
    Commit 29dbaea278eee2372df96bd27375264d1bd54198 (Use 
comphelper::dispatchCommand
    in LokChartHelper::Dispatch, 2025-07-10) added some LOK-related UNO 
commands to
    ControllerCommandDispatch::updateCommandAvailability. But since these 
commands
    do not get respective m_aCommandArguments there, their state update events 
have
    empty state, making their controls show some default values, when queried in
    desktop case.
    
    Make the commands LOK-only in updateCommandAvailability, as intended. 
Possibly
    at some point, we could generalize updateCommandAvailability somehow to list
    all the properties of selection; but for now, keep it simple.
    
    Change-Id: I151deb1582c537471296255cf6b8630565419d12
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190941
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    (cherry picked from commit 32021330c70480723e54b0689da0b07f45bf8798)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190952
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx 
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 80986f72818b..8c4806d880e2 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -631,10 +631,13 @@ void 
ControllerCommandDispatch::updateCommandAvailability()
     m_aCommandAvailability[ u".uno:FormatTrendlineEquation"_ustr ] = 
bFormatObjectAvailable && bControllerStateIsValid && 
m_apControllerState->bMayFormatTrendlineEquation;
     m_aCommandAvailability[ u".uno:FormatStockLoss"_ustr ] = 
bFormatObjectAvailable;
     m_aCommandAvailability[ u".uno:FormatStockGain"_ustr ] = 
bFormatObjectAvailable;
-    m_aCommandAvailability[ u".uno:FillColor"_ustr ] = bFormatObjectAvailable;
-    m_aCommandAvailability[ u".uno:XLineColor"_ustr ] = bFormatObjectAvailable;
-    m_aCommandAvailability[ u".uno:LineWidth"_ustr ] = bFormatObjectAvailable;
-    m_aCommandAvailability[ u".uno:FillGradient"_ustr ] = 
bFormatObjectAvailable;
+    if (comphelper::LibreOfficeKit::isActive())
+    {
+        m_aCommandAvailability[u".uno:FillColor"_ustr] = 
bFormatObjectAvailable;
+        m_aCommandAvailability[u".uno:XLineColor"_ustr] = 
bFormatObjectAvailable;
+        m_aCommandAvailability[u".uno:LineWidth"_ustr] = 
bFormatObjectAvailable;
+        m_aCommandAvailability[u".uno:FillGradient"_ustr] = 
bFormatObjectAvailable;
+    }
 
     m_aCommandAvailability[ u".uno:DiagramType"_ustr ] = bIsWritable;
     m_aCommandAvailability[ u".uno:Legend"_ustr ] = bIsWritable && 
m_apModelState->bHasLegend;