mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cid#1509199 silence Constant expression result

Browse Source 
rename IsEqualData -> HasSameData

Change-Id: I6294c847c284888e5537e04dc4f84314586c4b85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139514
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2022-09-01 11:32:04 +01:00
parent 64f673238c
commit 5c365c62aa
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sc/inc/autoform.hxx
View File

@@ -163,7 +163,7 @@ public:
const ScNumFormatAbbrev& GetNumFormat( sal_uInt16 nIndex ) const; const ScNumFormatAbbrev& GetNumFormat( sal_uInt16 nIndex ) const;
bool IsEqualData( sal_uInt16 nIndex1, sal_uInt16 nIndex2 ) const; bool HasSameData( sal_uInt16 nIndex1, sal_uInt16 nIndex2 ) const;
void FillToItemSet( sal_uInt16 nIndex, SfxItemSet& rItemSet, const ScDocument& rDoc ) const; void FillToItemSet( sal_uInt16 nIndex, SfxItemSet& rItemSet, const ScDocument& rDoc ) const;
void GetFromItemSet( sal_uInt16 nIndex, const SfxItemSet& rItemSet, const ScNumFormatAbbrev& rNumFormat ); void GetFromItemSet( sal_uInt16 nIndex, const SfxItemSet& rItemSet, const ScNumFormatAbbrev& rNumFormat );

8
sc/source/core/data/table4.cxx
View File

@@ -2617,7 +2617,7 @@ void ScTable::AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW
// Left top corner // Left top corner
AutoFormatArea(nCol, nRow, nCol, nRow, *pPatternAttrs[nIndex], nFormatNo); AutoFormatArea(nCol, nRow, nCol, nRow, *pPatternAttrs[nIndex], nFormatNo);
// Left column // Left column
if (pData->IsEqualData(4, 8)) if (pData->HasSameData(4, 8))
AutoFormatArea(nStartCol, nStartRow + 1, nStartCol, nEndRow - 1, *pPatternAttrs[4], nFormatNo); AutoFormatArea(nStartCol, nStartRow + 1, nStartCol, nEndRow - 1, *pPatternAttrs[4], nFormatNo);
else else
{ {
@@ -2641,7 +2641,7 @@ void ScTable::AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW
nIndex = 3; nIndex = 3;
AutoFormatArea(nCol, nRow, nCol, nRow, *pPatternAttrs[nIndex], nFormatNo); AutoFormatArea(nCol, nRow, nCol, nRow, *pPatternAttrs[nIndex], nFormatNo);
// Right column // Right column
if (pData->IsEqualData(7, 11)) if (pData->HasSameData(7, 11))
AutoFormatArea(nEndCol, nStartRow + 1, nEndCol, nEndRow - 1, *pPatternAttrs[7], nFormatNo); AutoFormatArea(nEndCol, nStartRow + 1, nEndCol, nEndRow - 1, *pPatternAttrs[7], nFormatNo);
else else
{ {
@@ -2681,11 +2681,11 @@ void ScTable::AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW
nIndex = 13; nIndex = 13;
} }
// Body // Body
if ((pData->IsEqualData(5, 6)) && (pData->IsEqualData(9, 10)) && (pData->IsEqualData(5, 9))) if ((pData->HasSameData(5, 6)) && (pData->HasSameData(9, 10)) && (pData->HasSameData(5, 9)))
AutoFormatArea(nStartCol + 1, nStartRow + 1, nEndCol-1, nEndRow - 1, *pPatternAttrs[5], nFormatNo); AutoFormatArea(nStartCol + 1, nStartRow + 1, nEndCol-1, nEndRow - 1, *pPatternAttrs[5], nFormatNo);
else else
{ {
if ((pData->IsEqualData(5, 9)) && (pData->IsEqualData(6, 10))) if ((pData->HasSameData(5, 9)) && (pData->HasSameData(6, 10)))
{ {
nIndex = 5; nIndex = 5;
for (nCol = nStartCol + 1; nCol < nEndCol; nCol++) for (nCol = nStartCol + 1; nCol < nEndCol; nCol++)

2
sc/source/core/tool/autoform.cxx
View File

@@ -378,7 +378,7 @@ const ScNumFormatAbbrev& ScAutoFormatData::GetNumFormat( sal_uInt16 nIndex ) con
return GetField( nIndex ).GetNumFormat(); return GetField( nIndex ).GetNumFormat();
} }
bool ScAutoFormatData::IsEqualData( sal_uInt16 nIndex1, sal_uInt16 nIndex2 ) const bool ScAutoFormatData::HasSameData( sal_uInt16 nIndex1, sal_uInt16 nIndex2 ) const
{ {
bool bEqual = true; bool bEqual = true;
const ScAutoFormatDataField& rField1 = GetField( nIndex1 ); const ScAutoFormatDataField& rField1 = GetField( nIndex1 );