sc/qa/unit/ucalc_condformat.cxx | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-)
New commits: commit 4727613f12d9207c2d28d23bae041164b15bf4d9 Author: Mike Kaganski <[email protected]> AuthorDate: Mon Nov 24 06:49:41 2025 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Mon Nov 24 08:57:31 2025 +0100 Drop useless static_casts The specific calls to GetAttr already returned the properly-typed result; so assigning it to a more generic reference just to cast to the needed type immediately could be avoided. Change-Id: I985fbd653dda24580b99e94e39203cba600255c3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194404 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/sc/qa/unit/ucalc_condformat.cxx b/sc/qa/unit/ucalc_condformat.cxx index c2b6e12ecae3..eea080d2652a 100644 --- a/sc/qa/unit/ucalc_condformat.cxx +++ b/sc/qa/unit/ucalc_condformat.cxx @@ -328,8 +328,7 @@ CPPUNIT_TEST_FIXTURE(TestCondformat, testDataBarCondCopyPaste) CPPUNIT_ASSERT(nIndex0 != nPastedKey); CPPUNIT_ASSERT_EQUAL(nIndex1, nPastedKey); - const SfxPoolItem& rItem = m_pDoc->GetAttr(nCol, 3, 0, ATTR_CONDITIONAL); - const ScCondFormatItem& rCondFormatItem = static_cast<const ScCondFormatItem&>(rItem); + const ScCondFormatItem& rCondFormatItem = m_pDoc->GetAttr(nCol, 3, 0, ATTR_CONDITIONAL); CPPUNIT_ASSERT_EQUAL(size_t(1), rCondFormatItem.GetCondFormatData().size()); CPPUNIT_ASSERT_EQUAL(nPastedKey, rCondFormatItem.GetCondFormatData().front()); } @@ -354,8 +353,7 @@ CPPUNIT_TEST_FIXTURE(TestCondformat, testDataBarCondCopyPaste) CPPUNIT_ASSERT(nIndex1 != nPastedKey); CPPUNIT_ASSERT_EQUAL(nIndex2, nPastedKey); - const SfxPoolItem& rItem = m_pDoc->GetAttr(nCol, 4, 0, ATTR_CONDITIONAL); - const ScCondFormatItem& rCondFormatItem = static_cast<const ScCondFormatItem&>(rItem); + const ScCondFormatItem& rCondFormatItem = m_pDoc->GetAttr(nCol, 4, 0, ATTR_CONDITIONAL); CPPUNIT_ASSERT_EQUAL(size_t(1), rCondFormatItem.GetCondFormatData().size()); CPPUNIT_ASSERT_EQUAL(nPastedKey, rCondFormatItem.GetCondFormatData().front()); } @@ -380,8 +378,7 @@ CPPUNIT_TEST_FIXTURE(TestCondformat, testDataBarCondCopyPaste) CPPUNIT_ASSERT(nIndex1 != nPastedKey); CPPUNIT_ASSERT_EQUAL(nIndex2, nPastedKey); - const SfxPoolItem& rItem = m_pDoc->GetAttr(nCol, 4, 0, ATTR_CONDITIONAL); - const ScCondFormatItem& rCondFormatItem = static_cast<const ScCondFormatItem&>(rItem); + const ScCondFormatItem& rCondFormatItem = m_pDoc->GetAttr(nCol, 4, 0, ATTR_CONDITIONAL); CPPUNIT_ASSERT_EQUAL(size_t(1), rCondFormatItem.GetCondFormatData().size()); CPPUNIT_ASSERT_EQUAL(nPastedKey, rCondFormatItem.GetCondFormatData().front()); } @@ -482,8 +479,7 @@ CPPUNIT_TEST_FIXTURE(TestCondformat, testColorScaleCondCopyPaste) CPPUNIT_ASSERT(nIndex0 != nPastedKey); CPPUNIT_ASSERT_EQUAL(nIndex1, nPastedKey); - const SfxPoolItem& rItem = m_pDoc->GetAttr(nCol, 3, 0, ATTR_CONDITIONAL); - const ScCondFormatItem& rCondFormatItem = static_cast<const ScCondFormatItem&>(rItem); + const ScCondFormatItem& rCondFormatItem = m_pDoc->GetAttr(nCol, 3, 0, ATTR_CONDITIONAL); CPPUNIT_ASSERT_EQUAL(size_t(1), rCondFormatItem.GetCondFormatData().size()); CPPUNIT_ASSERT_EQUAL(nPastedKey, rCondFormatItem.GetCondFormatData().front()); } @@ -508,8 +504,7 @@ CPPUNIT_TEST_FIXTURE(TestCondformat, testColorScaleCondCopyPaste) CPPUNIT_ASSERT(nIndex1 != nPastedKey); CPPUNIT_ASSERT_EQUAL(nIndex2, nPastedKey); - const SfxPoolItem& rItem = m_pDoc->GetAttr(nCol, 4, 0, ATTR_CONDITIONAL); - const ScCondFormatItem& rCondFormatItem = static_cast<const ScCondFormatItem&>(rItem); + const ScCondFormatItem& rCondFormatItem = m_pDoc->GetAttr(nCol, 4, 0, ATTR_CONDITIONAL); CPPUNIT_ASSERT_EQUAL(size_t(1), rCondFormatItem.GetCondFormatData().size()); CPPUNIT_ASSERT_EQUAL(nPastedKey, rCondFormatItem.GetCondFormatData().front()); } @@ -534,8 +529,7 @@ CPPUNIT_TEST_FIXTURE(TestCondformat, testColorScaleCondCopyPaste) CPPUNIT_ASSERT(nIndex1 != nPastedKey); CPPUNIT_ASSERT_EQUAL(nIndex2, nPastedKey); - const SfxPoolItem& rItem = m_pDoc->GetAttr(nCol, 4, 0, ATTR_CONDITIONAL); - const ScCondFormatItem& rCondFormatItem = static_cast<const ScCondFormatItem&>(rItem); + const ScCondFormatItem& rCondFormatItem = m_pDoc->GetAttr(nCol, 4, 0, ATTR_CONDITIONAL); CPPUNIT_ASSERT_EQUAL(size_t(1), rCondFormatItem.GetCondFormatData().size()); CPPUNIT_ASSERT_EQUAL(nPastedKey, rCondFormatItem.GetCondFormatData().front()); } @@ -572,8 +566,7 @@ CPPUNIT_TEST_FIXTURE(TestCondformat, testCondCopyPaste) aRangeList.Join(aTargetRange); CPPUNIT_ASSERT_EQUAL(aRangeList, pPastedFormat->GetRange()); CPPUNIT_ASSERT_EQUAL(nIndex, pPastedFormat->GetKey()); - const SfxPoolItem& rItem = m_pDoc->GetAttr( 7, 7, 0, ATTR_CONDITIONAL ); - const ScCondFormatItem& rCondFormatItem = static_cast<const ScCondFormatItem&>(rItem); + const ScCondFormatItem& rCondFormatItem = m_pDoc->GetAttr(7, 7, 0, ATTR_CONDITIONAL); CPPUNIT_ASSERT_EQUAL(size_t(1), rCondFormatItem.GetCondFormatData().size()); CPPUNIT_ASSERT_EQUAL(nIndex, rCondFormatItem.GetCondFormatData().front()); @@ -611,8 +604,7 @@ CPPUNIT_TEST_FIXTURE(TestCondformat, testCondCopyPasteSingleCell) aRangeList.Join(aTargetRange); CPPUNIT_ASSERT_EQUAL(aRangeList, pPastedFormat->GetRange()); CPPUNIT_ASSERT_EQUAL(nIndex, pPastedFormat->GetKey()); - const SfxPoolItem& rItem = m_pDoc->GetAttr( 4, 4, 0, ATTR_CONDITIONAL ); - const ScCondFormatItem& rCondFormatItem = static_cast<const ScCondFormatItem&>(rItem); + const ScCondFormatItem& rCondFormatItem = m_pDoc->GetAttr(4, 4, 0, ATTR_CONDITIONAL); CPPUNIT_ASSERT_EQUAL(size_t(1), rCondFormatItem.GetCondFormatData().size()); CPPUNIT_ASSERT_EQUAL(nIndex, rCondFormatItem.GetCondFormatData().front() ); @@ -654,8 +646,7 @@ CPPUNIT_TEST_FIXTURE(TestCondformat, testCondCopyPasteSingleCellToRange) CPPUNIT_ASSERT_EQUAL(aRangeList, pPastedFormat->GetRange()); sal_uInt32 nPastedKey = pPastedFormat->GetKey(); CPPUNIT_ASSERT_EQUAL(nIndex, nPastedKey); - const SfxPoolItem& rItem = m_pDoc->GetAttr( nCol, nRow, 0, ATTR_CONDITIONAL ); - const ScCondFormatItem& rCondFormatItem = static_cast<const ScCondFormatItem&>(rItem); + const ScCondFormatItem& rCondFormatItem = m_pDoc->GetAttr(nCol, nRow, 0, ATTR_CONDITIONAL); CPPUNIT_ASSERT_EQUAL(size_t(1), rCondFormatItem.GetCondFormatData().size()); CPPUNIT_ASSERT_EQUAL(nIndex, rCondFormatItem.GetCondFormatData().front() ); @@ -693,8 +684,7 @@ CPPUNIT_TEST_FIXTURE(TestCondformat, testCondCopyPasteSingleCellIntoSameFormatRa CPPUNIT_ASSERT_EQUAL(size_t(1), m_pDoc->GetCondFormList(0)->size()); CPPUNIT_ASSERT_EQUAL(aRangeList, pPastedFormat->GetRange()); CPPUNIT_ASSERT_EQUAL(nIndex, pPastedFormat->GetKey()); - const SfxPoolItem& rItem = m_pDoc->GetAttr(2, 2, 0, ATTR_CONDITIONAL); - const ScCondFormatItem& rCondFormatItem = static_cast<const ScCondFormatItem&>(rItem); + const ScCondFormatItem& rCondFormatItem = m_pDoc->GetAttr(2, 2, 0, ATTR_CONDITIONAL); CPPUNIT_ASSERT_EQUAL(size_t(1), rCondFormatItem.GetCondFormatData().size()); CPPUNIT_ASSERT_EQUAL(nIndex, rCondFormatItem.GetCondFormatData().front()); @@ -809,8 +799,7 @@ CPPUNIT_TEST_FIXTURE(TestCondformat, testCondCopyPasteSheet) const ScRangeList& rRange = rFormat.GetRange(); CPPUNIT_ASSERT_EQUAL(ScRangeList(ScRange(0,0,1,3,3,1)), rRange); sal_uInt32 nKey = rFormat.GetKey(); - const SfxPoolItem& rItem = m_pDoc->GetAttr( 2, 2, 1, ATTR_CONDITIONAL ); - const ScCondFormatItem& rCondFormatItem = static_cast<const ScCondFormatItem&>(rItem); + const ScCondFormatItem& rCondFormatItem = m_pDoc->GetAttr(2, 2, 1, ATTR_CONDITIONAL); CPPUNIT_ASSERT_EQUAL(size_t(1), rCondFormatItem.GetCondFormatData().size()); CPPUNIT_ASSERT_EQUAL( nKey, rCondFormatItem.GetCondFormatData().front() );
