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

[Noel Grandin (via logerrit)]

 chart2/source/controller/dialogs/tp_ChartColorPalette.cxx     |    4 ++--
 chart2/source/controller/sidebar/ChartAreaPanel.cxx           |    2 +-
 chart2/source/controller/sidebar/ChartColorPaletteControl.cxx |    4 ++--
 desktop/source/lib/init.cxx                                   |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit b70fff0bbff223244a6c86806e80d7f89bc8e526
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jun 20 15:52:28 2025 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Jun 21 11:20:48 2025 +0200

    fix visual studio warning
    
    warning C4245: 'return': conversion from 'int' to 'sal_uInt32', 
signed/unsigned mismatch
    
    code was introduced in
        commit 51bbf3b037112d1fc2c13c7b18215c2a86758c98
        Author: Marco Cecchetti <marco.cecche...@collabora.com>
        Date:   Fri Apr 11 16:43:30 2025 +0200
        chart color palette for data series: dialog tab pane
    
    Looks like this fix was applied to the code was fixed before it was 
submitted to master.
    
    25.04: also fix warnings:
    
    * C4100: 'pThis': unreferenced formal parameter
    * C4245: 'initializing': conversion from 'int' to 'sal_uInt32',
              signed/unsigned mismatch
    
    Change-Id: I645078163cbf086d1a13f55d70fe302d0338c2a4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186769
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/chart2/source/controller/dialogs/tp_ChartColorPalette.cxx 
b/chart2/source/controller/dialogs/tp_ChartColorPalette.cxx
index a48907fa62c6..c52148c9dc17 100644
--- a/chart2/source/controller/dialogs/tp_ChartColorPalette.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartColorPalette.cxx
@@ -173,7 +173,7 @@ ChartColorPaletteTabPage::SelectValueSetHdl(const 
std::unique_ptr<ChartColorPale
     const sal_uInt32 nItemId = xValueSet->GetSelectedItemId();
 
     if (!nItemId)
-        return -1;
+        return static_cast<sal_uInt32>(-1);
 
     const sal_uInt32 nIndex = nItemId - 1;
 
@@ -181,7 +181,7 @@ ChartColorPaletteTabPage::SelectValueSetHdl(const 
std::unique_ptr<ChartColorPale
     {
         return nIndex;
     }
-    return -1;
+    return static_cast<sal_uInt32>(-1);
 }
 } //namespace chart
 
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx 
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index e4e8d2d92e2a..02da1e14e834 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -543,7 +543,7 @@ void ChartAreaPanel::selectionChanged(bool bCorrectType)
                     {
                         if (xInfo->hasPropertyByName(u"FillColor"_ustr))
                         {
-                            sal_uInt32 nFillColor = -1;
+                            sal_uInt32 nFillColor = sal_uInt32(-1);
                             xPropSet->getPropertyValue(u"FillColor"_ustr) >>= 
nFillColor;
                             if (nFillColor != static_cast<sal_uInt32>(-1))
                             {
diff --git a/chart2/source/controller/sidebar/ChartColorPaletteControl.cxx 
b/chart2/source/controller/sidebar/ChartColorPaletteControl.cxx
index 3a3e8c1b5db2..13f1f8730718 100644
--- a/chart2/source/controller/sidebar/ChartColorPaletteControl.cxx
+++ b/chart2/source/controller/sidebar/ChartColorPaletteControl.cxx
@@ -360,7 +360,7 @@ ChartColorPalettePopup::SelectValueSetHdl(const 
std::unique_ptr<ChartColorPalett
     const sal_uInt32 nItemId = xValueSet->GetSelectedItemId();
 
     if (!nItemId)
-        return -1;
+        return sal_uInt32(-1);
 
     const sal_uInt32 nIndex = nItemId - 1;
 
@@ -370,7 +370,7 @@ ChartColorPalettePopup::SelectValueSetHdl(const 
std::unique_ptr<ChartColorPalett
         mbItemSelected = true;
         return nIndex;
     }
-    return -1;
+    return sal_uInt32(-1);
 }
 
 IMPL_LINK_NOARG(ChartColorPalettePopup, ColorfulMouseMoveHdl, const 
MouseEvent&, void)
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 89b8b8287205..7dcf6ed46d33 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -7635,7 +7635,7 @@ static void 
doc_setAccessibilityState(SAL_UNUSED_PARAMETER LibreOfficeKitDocumen
     SfxLokHelper::setAccessibilityState(nId, nEnabled);
 }
 
-static void doc_setColorPreviewState(SAL_UNUSED_PARAMETER 
LibreOfficeKitDocument* pThis, int nId,
+static void doc_setColorPreviewState(SAL_UNUSED_PARAMETER 
LibreOfficeKitDocument* /*pThis*/, int nId,
                                      bool bEnabled)
 {
     SolarMutexGuard aGuard;