diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2017-12-03 21:46:37 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2017-12-19 22:08:26 +0100 |
commit | 00bc5a097313fbd003675267be961ad3a152ba42 (patch) | |
tree | de9b9e6981d3c2f262b9391335a067d4898185b6 /svl/qa | |
parent | b74da08e556b7b001943f0288a61da53791d4dcf (diff) |
wrap scoped enum around css::util::NumberFormat
Change-Id: Icab5ded8bccdb95f79b3fa35ea164f47919c68fa
Reviewed-on: https://gerrit.libreoffice.org/46339
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'svl/qa')
-rw-r--r-- | svl/qa/unit/svl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index bafb8d13bef9..74e37de42d6e 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -269,7 +269,7 @@ void Test::testNumberFormat() } sal_Int32 nPos; - short nType = css::util::NumberFormat::DEFINED; + SvNumFormatType nType = SvNumFormatType::DEFINED; sal_uInt32 nKey; OUString aCode; // Thai date format (implicit locale). @@ -1081,7 +1081,7 @@ void Test::checkDateInput( SvNumberFormatter& rFormatter, const char* pTimezone, CPPUNIT_ASSERT_MESSAGE( OString("Date not recognized: " + OString(pTimezone) + " " + OString(pIsoDate)).getStr(), bVal); CPPUNIT_ASSERT_MESSAGE("Format parsed is not date.", - (rFormatter.GetType(nIndex) & css::util::NumberFormat::DATE)); + (rFormatter.GetType(nIndex) & SvNumFormatType::DATE)); OUString aOutString; Color *pColor; rFormatter.GetOutputString( fVal, nIndex, aOutString, &pColor); @@ -1495,7 +1495,7 @@ void Test::testColorNamesConversion() // [FARBE1] -> [COLOR1] can't be tested because we have no color table link // set, so the scanner returns nCheckPos error. sal_Int32 nCheckPos; - short nType; + SvNumFormatType nType; sal_uInt32 nKey; OUString aFormatCode; @@ -1504,7 +1504,7 @@ void Test::testColorNamesConversion() aFormatCode = "[" + aGermanKeywords[i] + "]0"; aFormatter.PutandConvertEntry( aFormatCode, nCheckPos, nType, nKey, LANGUAGE_GERMAN, LANGUAGE_ENGLISH_US); CPPUNIT_ASSERT_EQUAL_MESSAGE("CheckPos should be 0.", sal_Int32(0), nCheckPos); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Type should be NUMBER.", css::util::NumberFormat::NUMBER, nType); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Type should be NUMBER.", SvNumFormatType::NUMBER, nType); CPPUNIT_ASSERT_EQUAL( OUString("[" + rEnglishKeywords[i] + "]0"), aFormatCode); } } |