sc/source/ui/condformat/condformatdlgdata.cxx | 4 ++--
sc/source/ui/inc/condformatdlg.hxx | 2 +-
sc/source/ui/inc/condformatdlgdata.hxx | 6 +++---
sc/source/ui/view/cellsh1.cxx | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 32767d081e10bac317b21cd53b48755837b5b533
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Dec 7 14:56:52 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Dec 8 12:33:30 2024 +0100
cid#1607247 Overflowed constant
Change-Id: I9648bc8a41a44a98fd8d0d78e889228948e38a34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178045
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git a/sc/source/ui/condformat/condformatdlgdata.cxx
b/sc/source/ui/condformat/condformatdlgdata.cxx
index 89cd51b41abb..024bd8d9bd9a 100644
--- a/sc/source/ui/condformat/condformatdlgdata.cxx
+++ b/sc/source/ui/condformat/condformatdlgdata.cxx
@@ -14,7 +14,7 @@
#include <condformatdlgdata.hxx>
ScCondFormatDlgData::ScCondFormatDlgData(std::shared_ptr<ScConditionalFormatList>
pCondFormats,
- sal_Int32 nItem, bool bManaged):
+ sal_uInt32 nItem, bool bManaged):
mpCondFormats(std::move(pCondFormats)),
mnItem(nItem),
meDialogType(condformat::dialog::CONDITION),
@@ -32,7 +32,7 @@ condformat::dialog::ScCondFormatDialogType
ScCondFormatDlgData::GetDialogType()
return meDialogType;
}
-sal_Int32 ScCondFormatDlgData::GetIndex() const
+sal_uInt32 ScCondFormatDlgData::GetIndex() const
{
return mnItem;
}
diff --git a/sc/source/ui/inc/condformatdlg.hxx
b/sc/source/ui/inc/condformatdlg.hxx
index 1946196b5028..19b2322bdcaa 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -78,7 +78,7 @@ public:
class ScCondFormatDlg : public ScAnyRefDlgController
{
private:
- sal_Int32 mnKey;
+ sal_uInt32 mnKey;
ScAddress maPos;
ScViewData* mpViewData;
diff --git a/sc/source/ui/inc/condformatdlgdata.hxx
b/sc/source/ui/inc/condformatdlgdata.hxx
index bbee525b3bdd..31d42265601c 100644
--- a/sc/source/ui/inc/condformatdlgdata.hxx
+++ b/sc/source/ui/inc/condformatdlgdata.hxx
@@ -30,7 +30,7 @@ class ScConditionalFormatList;
class ScCondFormatDlgData
{
public:
- ScCondFormatDlgData(std::shared_ptr<ScConditionalFormatList> pCondFormats,
sal_Int32 nItem,
+ ScCondFormatDlgData(std::shared_ptr<ScConditionalFormatList> pCondFormats,
sal_uInt32 nItem,
bool bManaged);
ScCondFormatDlgData(ScCondFormatDlgData const&) = default;
@@ -38,7 +38,7 @@ public:
bool IsManaged() const;
condformat::dialog::ScCondFormatDialogType GetDialogType() const;
- sal_Int32 GetIndex() const;
+ sal_uInt32 GetIndex() const;
void SetDialogType(condformat::dialog::ScCondFormatDialogType eType);
@@ -46,7 +46,7 @@ public:
private:
std::shared_ptr<ScConditionalFormatList> mpCondFormats;
- sal_Int32 mnItem;
+ sal_uInt32 mnItem;
condformat::dialog::ScCondFormatDialogType meDialogType;
bool mbManaged;
};
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 4b94a67eed1a..99f5075f6b3a 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2958,7 +2958,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
else if (nRet == DLG_RET_EDIT)
{
ScConditionalFormat* pFormat =
pDlg->GetCondFormatSelected();
- sal_Int32 nIndex = pFormat ? pFormat->GetKey() :
-1;
+ sal_uInt32 nIndex = pFormat ? pFormat->GetKey() :
sal_uInt32(-1);
// Put the xml string parameter to initialize the
// Conditional Format Dialog. ( edit selected
conditional format )
pTabViewShell->setScCondFormatDlgItem(
