diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-08-11 13:13:35 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-08-11 14:19:24 +0200 |
| commit | bfed58821fc3a83fec4a985087cd45fa963bed3e (patch) | |
| tree | 427156ed03b2b72069e47d9f1250dc36670c09cf /sw/qa/extras/rtfimport/rtfimport.cxx | |
| parent | c46950fee11f5207fb8324947280cd565ae483e7 (diff) | |
Drop convertMm100ToTwip in favor of the new o3tl::toTwips
Step by step, duplicates from <tools/UnitConversion.hxx> may go
Change-Id: Id4c03ff8adc120ae06dbfdbdfb4f5ff0bb51f489
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120315
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/qa/extras/rtfimport/rtfimport.cxx')
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index ae99eab0d49a..d946aba364e2 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -1575,8 +1575,8 @@ CPPUNIT_TEST_FIXTURE(Test, testDefaultValues) CPPUNIT_ASSERT_EQUAL(double(12), getProperty<double>(run, "CharHeight")); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(run, "CharEscapement")); CPPUNIT_ASSERT_EQUAL(sal_Int32(100), getProperty<sal_Int32>(run, "CharEscapementHeight")); - CPPUNIT_ASSERT_EQUAL(sal_Int64(20), - convertMm100ToTwip(getProperty<sal_Int16>(run, "CharKerning"))); + CPPUNIT_ASSERT_EQUAL(sal_Int64(20), o3tl::toTwips(getProperty<sal_Int16>(run, "CharKerning"), + o3tl::Length::mm100)); CPPUNIT_ASSERT_EQUAL(sal_Int32(COL_AUTO), getProperty<sal_Int32>(run, "CharColor")); run = getRun(paragraph, 8, "expand0pt"); @@ -1592,8 +1592,8 @@ CPPUNIT_TEST_FIXTURE(Test, testDefaultValues) CPPUNIT_ASSERT_EQUAL(double(12), getProperty<double>(run, "CharHeight")); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(run, "CharEscapement")); CPPUNIT_ASSERT_EQUAL(sal_Int32(100), getProperty<sal_Int32>(run, "CharEscapementHeight")); - CPPUNIT_ASSERT_EQUAL(sal_Int64(20), - convertMm100ToTwip(getProperty<sal_Int16>(run, "CharKerning"))); + CPPUNIT_ASSERT_EQUAL(sal_Int64(20), o3tl::toTwips(getProperty<sal_Int16>(run, "CharKerning"), + o3tl::Length::mm100)); CPPUNIT_ASSERT_EQUAL(sal_Int32(COL_AUTO), getProperty<sal_Int32>(run, "CharColor")); run = getRun(paragraph, 10, "expand0pt"); |