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

[Marco Cecchetti (via logerrit)]

 chart2/source/inc/ChartColorPalettes.hxx   |    4 ---
 chart2/source/tools/ChartColorPalettes.cxx |   33 +----------------------------
 2 files changed, 2 insertions(+), 35 deletions(-)

New commits:
commit d3d6d68f3bc2abba9f701bfe4c9e2b1deec39a02
Author:     Marco Cecchetti <marco.cecche...@collabora.com>
AuthorDate: Fri Jun 13 14:48:47 2025 +0200
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon Aug 18 21:48:28 2025 +0200

    Revert "lok: chart: color palette: send value set info for mouse over"
    
    This reverts commit 4c965bc30a0bd06dd6f74897a8f41a53535f778d.
    Reverting since we move from valueset to iconview
    
    Change-Id: I45700e6416494d0e140e3ecc59b4d7f9af6be258
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189535
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/chart2/source/inc/ChartColorPalettes.hxx 
b/chart2/source/inc/ChartColorPalettes.hxx
index 8cb02e042d19..48e5e252bae4 100644
--- a/chart2/source/inc/ChartColorPalettes.hxx
+++ b/chart2/source/inc/ChartColorPalettes.hxx
@@ -22,7 +22,6 @@ public:
     typedef Link<const MouseEvent&, void> MouseEventHandler;
 
 private:
-    OUString msDrawingAreaId;
     std::vector<ChartColorPalette> maColorSets;
     MouseEventHandler maMouseMoveHdl;
 
@@ -40,9 +39,6 @@ public:
     void insert(ChartColorPalette const& rColorSet);
     const ChartColorPalette* getPalette(sal_uInt32 nItem) const;
     void setMouseMoveHdl(const MouseEventHandler& rLink);
-
-private:
-    void sendItemInfo() const;
 };
 } // end namespace chart
 
diff --git a/chart2/source/tools/ChartColorPalettes.cxx 
b/chart2/source/tools/ChartColorPalettes.cxx
index 73742c6b30c1..1ff465d1fea1 100644
--- a/chart2/source/tools/ChartColorPalettes.cxx
+++ b/chart2/source/tools/ChartColorPalettes.cxx
@@ -9,10 +9,6 @@
 
 #include <ChartColorPalettes.hxx>
 #include <ChartColorPaletteHelper.hxx>
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>
-#include <comphelper/lok.hxx>
-#include <sfx2/viewsh.hxx>
-#include <tools/json_writer.hxx>
 #include <vcl/event.hxx>
 
 namespace chart
@@ -38,11 +34,9 @@ const ChartColorPalette* 
ChartColorPalettes::getPalette(const sal_uInt32 nItem)
 void ChartColorPalettes::SetDrawingArea(weld::DrawingArea* pDrawingArea)
 {
     ValueSet::SetDrawingArea(pDrawingArea);
-    msDrawingAreaId = pDrawingArea->get_buildable_name();
-
     SetStyle(WB_TABSTOP | WB_DOUBLEBORDER | WB_FLATVALUESET);
     SetItemWidth(BORDER * 6 + SIZE * ChartColorPaletteSize / 2);
-    SetItemHeight(BORDER * 4 + SIZE * 2);
+    SetItemHeight(BORDER * 5 + SIZE * 2);
 }
 
 void ChartColorPalettes::UserDraw(const UserDrawEvent& rUserDrawEvent)
@@ -61,25 +55,6 @@ void ChartColorPalettes::StyleUpdated()
     ValueSet::StyleUpdated();
 }
 
-void ChartColorPalettes::sendItemInfo() const
-{
-    if (!comphelper::LibreOfficeKit::isActive() || msDrawingAreaId.isEmpty())
-        return;
-
-    tools::JsonWriter aJsonWriter;
-    aJsonWriter.put("jsontype", "valueset");
-    aJsonWriter.put("action", "update");
-    aJsonWriter.put("drawingarea", msDrawingAreaId);
-    aJsonWriter.put("itemwidth", BORDER * 6 + SIZE * ChartColorPaletteSize / 
2);
-    aJsonWriter.put("itemheight", BORDER * 4 + SIZE * 2);
-
-    if (const SfxViewShell* pViewShell = SfxViewShell::Current())
-    {
-        pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG,
-                                               
aJsonWriter.finishAndGetAsOString());
-    }
-}
-
 bool ChartColorPalettes::MouseMove(const MouseEvent& rMEvt)
 {
     bool bRes = ValueSet::MouseMove(rMEvt);
@@ -87,11 +62,7 @@ bool ChartColorPalettes::MouseMove(const MouseEvent& rMEvt)
     return bRes;
 }
 
-void ChartColorPalettes::setMouseMoveHdl(const MouseEventHandler& rLink)
-{
-    sendItemInfo();
-    maMouseMoveHdl = rLink;
-}
+void ChartColorPalettes::setMouseMoveHdl(const MouseEventHandler& rLink) { 
maMouseMoveHdl = rLink; }
 
 } // end namespace chart
 
commit 67dba87802ebb265776a6d04e66eb3aaa3ef264b
Author:     Marco Cecchetti <marco.cecche...@collabora.com>
AuthorDate: Fri Jun 13 14:47:47 2025 +0200
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon Aug 18 21:48:20 2025 +0200

    Revert "lok: chart: send value set info: move from 'update' to 'action'"
    
    This reverts commit b571fc0f4a9eec7e5410b15ac8076adfd787d64f.
    Reverting since we move from valueset to iconview
    
    Change-Id: I9dd1c1d4a761b697a5f87661c58df94f2a7ce397
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189534
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/chart2/source/tools/ChartColorPalettes.cxx 
b/chart2/source/tools/ChartColorPalettes.cxx
index 0043f0df8567..73742c6b30c1 100644
--- a/chart2/source/tools/ChartColorPalettes.cxx
+++ b/chart2/source/tools/ChartColorPalettes.cxx
@@ -68,7 +68,7 @@ void ChartColorPalettes::sendItemInfo() const
 
     tools::JsonWriter aJsonWriter;
     aJsonWriter.put("jsontype", "valueset");
-    aJsonWriter.put("action", "action");
+    aJsonWriter.put("action", "update");
     aJsonWriter.put("drawingarea", msDrawingAreaId);
     aJsonWriter.put("itemwidth", BORDER * 6 + SIZE * ChartColorPaletteSize / 
2);
     aJsonWriter.put("itemheight", BORDER * 4 + SIZE * 2);