cid#1607247 Overflowed constant
Change-Id: I9648bc8a41a44a98fd8d0d78e889228948e38a34 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178045 Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Tested-by: Jenkins
This commit is contained in:
parent
813f34d672
commit
32767d081e
4 changed files with 7 additions and 7 deletions
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -78,7 +78,7 @@ public:
|
|||
class ScCondFormatDlg : public ScAnyRefDlgController
|
||||
{
|
||||
private:
|
||||
sal_Int32 mnKey;
|
||||
sal_uInt32 mnKey;
|
||||
|
||||
ScAddress maPos;
|
||||
ScViewData* mpViewData;
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
|
@ -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(
|
||||
|
|
Loading…
Reference in a new issue