diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-11-13 09:04:59 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-11-13 11:16:08 +0100 |
| commit | f2dfa6bec9895892b58e22682ecdc5865fc249a3 (patch) | |
| tree | c7d2d514f01ecf96fc7dfc53c5867c7a0b9e7052 /sc | |
| parent | 6532bdc0a27eb31dcacf02e3bb1a587270a48b6f (diff) | |
Fix (some of) fallouts from tools::Long change to 64 bit on _WIN64
Change-Id: I297d43c594c5d8c3378e8b7f29ad798e89e4ebaf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105776
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/unit/helper/qahelper.cxx | 4 | ||||
| -rw-r--r-- | sc/qa/unit/ucalc_pivottable.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index db5efcea77e7..2ba82ae91944 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -189,11 +189,11 @@ void testFormats(ScBootstrapFixture* pTest, ScDocument* pDoc, sal_Int32 nFormat) const ScPatternAttr* pPattern = pDoc->GetPattern(0, 0, 1); vcl::Font aFont; pPattern->GetFont(aFont,SC_AUTOCOL_RAW); - CPPUNIT_ASSERT_EQUAL_MESSAGE("font size should be 10", 200l, aFont.GetFontSize().getHeight()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("font size should be 10", tools::Long(200), aFont.GetFontSize().getHeight()); CPPUNIT_ASSERT_EQUAL_MESSAGE("font color should be black", COL_AUTO, aFont.GetColor()); pPattern = pDoc->GetPattern(0,1,1); pPattern->GetFont(aFont, SC_AUTOCOL_RAW); - CPPUNIT_ASSERT_EQUAL_MESSAGE("font size should be 12", 240l, aFont.GetFontSize().getHeight()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("font size should be 12", tools::Long(240), aFont.GetFontSize().getHeight()); pPattern = pDoc->GetPattern(0,2,1); pPattern->GetFont(aFont, SC_AUTOCOL_RAW); CPPUNIT_ASSERT_EQUAL_MESSAGE("font should be italic", ITALIC_NORMAL, aFont.GetItalic()); diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx index 50c21b672a7b..54a4e85d6dcf 100644 --- a/sc/qa/unit/ucalc_pivottable.cxx +++ b/sc/qa/unit/ucalc_pivottable.cxx @@ -776,7 +776,7 @@ void Test::testPivotTableCache() ScDPCache aCache(*m_pDoc); aCache.InitFromDoc(*m_pDoc, aDataRange); tools::Long nDimCount = aCache.GetColumnCount(); - CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong dimension count.", 3L, nDimCount); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong dimension count.", tools::Long(3), nDimCount); OUString aDimName = aCache.GetDimensionName(0); CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong dimension name", OUString("F1"), aDimName); aDimName = aCache.GetDimensionName(1); @@ -791,7 +791,7 @@ void Test::testPivotTableCache() // Dimension 0 - a mix of strings and values. tools::Long nMemCount = aCache.GetDimMemberCount(0); - CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong dimension member count", 6L, nMemCount); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong dimension member count", tools::Long(6), nMemCount); const ScDPItemData* pItem = aCache.GetItemDataById(0, 0); CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && pItem->GetType() == ScDPItemData::Value && @@ -821,7 +821,7 @@ void Test::testPivotTableCache() // Dimension 1 - duplicate values in source. nMemCount = aCache.GetDimMemberCount(1); - CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong dimension member count", 3L, nMemCount); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong dimension member count", tools::Long(3), nMemCount); pItem = aCache.GetItemDataById(1, 0); CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && pItem->GetType() == ScDPItemData::String && @@ -839,7 +839,7 @@ void Test::testPivotTableCache() // Dimension 2 - values only. nMemCount = aCache.GetDimMemberCount(2); - CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong dimension member count", 6L, nMemCount); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong dimension member count", tools::Long(6), nMemCount); pItem = aCache.GetItemDataById(2, 0); CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && pItem->GetType() == ScDPItemData::Value && |