editeng/source/misc/txtrange.cxx | 2 +-
filter/source/msfilter/escherex.cxx | 2 +-
include/vcl/weld.hxx | 8 ++++----
sw/source/uibase/inc/prcntfld.hxx | 4 ++--
vcl/inc/salvtables.hxx | 4 ++--
vcl/source/app/salvtables.cxx | 4 ++--
vcl/source/window/builder.cxx | 4 ++--
vcl/unx/gtk3/gtkinst.cxx | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit ccbf0c4d6d2c8fffcc10d85b50ce6f47b565c72f
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Sep 28 20:00:04 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Sep 30 21:34:33 2024 +0200
cid#1607858 silence Overflowed constant
and
cid#1608350 Overflowed constant
Change-Id: I63ad25445df936821c896628b95686a535ef52cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174209
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 02e452209876..333abe2019df 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -456,7 +456,7 @@ void SvxBoundArgs::Add()
nBoolIdx = nBoolIdx - next;
nCount = nCount - next;
aBoolArr.erase( aBoolArr.begin() + nBoolIdx, aBoolArr.begin()
+ (nBoolIdx + next) );
- if( nBoolIdx )
+ if (nBoolIdx > 0)
aBoolArr[ nBoolIdx - 1 ] = false;
#if OSL_DEBUG_LEVEL > 1
else
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index d3be3f16906b..c0b854d5de48 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2507,7 +2507,7 @@ static void ConvertEnhancedCustomShapeEquation(
OSL_ENSURE(false, "Attempted out of bound access to
rEquationOrder of CustomShape (!)");
}
}
- nMask <<= 1;
+ nMask = sal_uInt32(nMask << 1);
}
}
}
commit ab0eb26f6ab5d02dd9c44d0257a416068809ac08
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Sep 28 20:16:06 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Sep 30 21:34:17 2024 +0200
cid#1608502 Overflowed constant
and
cid#1607222 Overflowed constant
Change-Id: If145bae8d05470173d1af6e7f540f8f40d7ab8b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174208
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 49c92ebb290a..5988012528b0 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1864,8 +1864,8 @@ public:
get_range(dummy, max);
return max;
}
- virtual void set_increments(int step, int page) = 0;
- virtual void get_increments(int& step, int& page) const = 0;
+ virtual void set_increments(sal_Int64 step, sal_Int64 page) = 0;
+ virtual void get_increments(sal_Int64& step, sal_Int64& page) const = 0;
virtual void set_digits(unsigned int digits) = 0;
virtual unsigned int get_digits() const = 0;
@@ -2137,14 +2137,14 @@ public:
return max;
}
- void set_increments(int step, int page, FieldUnit eValueUnit)
+ void set_increments(sal_Int64 step, sal_Int64 page, FieldUnit eValueUnit)
{
step = convert_value_from(step, eValueUnit);
page = convert_value_from(page, eValueUnit);
m_xSpinButton->set_increments(step, page);
}
- void get_increments(int& step, int& page, FieldUnit eDestUnit) const
+ void get_increments(sal_Int64& step, sal_Int64& page, FieldUnit eDestUnit)
const
{
m_xSpinButton->get_increments(step, page);
step = convert_value_to(step, eDestUnit);
diff --git a/sw/source/uibase/inc/prcntfld.hxx
b/sw/source/uibase/inc/prcntfld.hxx
index d8393d3097be..3b4775e6a524 100644
--- a/sw/source/uibase/inc/prcntfld.hxx
+++ b/sw/source/uibase/inc/prcntfld.hxx
@@ -30,8 +30,8 @@ class SW_DLLPUBLIC SwPercentField
sal_Int64 m_nRefValue; // 100% value for conversion (in Twips)
sal_Int64 m_nOldMax;
sal_Int64 m_nOldMin;
- int m_nOldSpinSize;
- int m_nOldPageSize;
+ sal_Int64 m_nOldSpinSize;
+ sal_Int64 m_nOldPageSize;
sal_Int64 m_nLastPercent;
sal_Int64 m_nLastValue;
sal_uInt16 m_nOldDigits;
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index f57ecc9395e3..01da5ed831f6 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -709,9 +709,9 @@ public:
virtual void get_range(sal_Int64& min, sal_Int64& max) const override;
- virtual void set_increments(int step, int /*page*/) override;
+ virtual void set_increments(sal_Int64 step, sal_Int64 /*page*/) override;
- virtual void get_increments(int& step, int& page) const override;
+ virtual void get_increments(sal_Int64& step, sal_Int64& page) const
override;
virtual void set_digits(unsigned int digits) override;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 4dc96a6a1d46..2f1e5bb7a996 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -5792,12 +5792,12 @@ void SalInstanceSpinButton::get_range(sal_Int64& min,
sal_Int64& max) const
max = fromField(m_rFormatter.GetMaxValue());
}
-void SalInstanceSpinButton::set_increments(int step, int /*page*/)
+void SalInstanceSpinButton::set_increments(sal_Int64 step, sal_Int64 /*page*/)
{
m_rFormatter.SetSpinSize(toField(step));
}
-void SalInstanceSpinButton::get_increments(int& step, int& page) const
+void SalInstanceSpinButton::get_increments(sal_Int64& step, sal_Int64& page)
const
{
step = fromField(m_rFormatter.GetSpinSize());
page = fromField(m_rFormatter.GetSpinSize());
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 8000b7c565fd..2b8381f89b65 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -335,7 +335,7 @@ namespace weld
void MetricSpinButton::set_digits(unsigned int digits)
{
- int step, page;
+ sal_Int64 step, page;
get_increments(step, page, m_eSrcUnit);
sal_Int64 value = get_value(m_eSrcUnit);
m_xSpinButton->set_digits(digits);
@@ -348,7 +348,7 @@ namespace weld
{
if (eUnit != m_eSrcUnit)
{
- int step, page;
+ sal_Int64 step, page;
get_increments(step, page, m_eSrcUnit);
sal_Int64 value = get_value(m_eSrcUnit);
m_eSrcUnit = eUnit;
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 8ad82a2a58ff..8ebd7625b259 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -17676,14 +17676,14 @@ public:
max = fromGtk(gtkmax);
}
- virtual void set_increments(int step, int page) override
+ virtual void set_increments(sal_Int64 step, sal_Int64 page) override
{
disable_notify_events();
gtk_spin_button_set_increments(m_pButton, toGtk(step), toGtk(page));
enable_notify_events();
}
- virtual void get_increments(int& step, int& page) const override
+ virtual void get_increments(sal_Int64& step, sal_Int64& page) const
override
{
double gtkstep, gtkpage;
gtk_spin_button_get_increments(m_pButton, >kstep, >kpage);
