diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-06-06 16:19:31 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-06-09 20:50:29 +0200 |
| commit | 4b470b64ecc267d3c802730436ab969df5c8378a (patch) | |
| tree | c9d74d091fed2cd2e373e242a74440e88a6d2f70 /sw | |
| parent | 8ebbfad8d31d75fe09c5521f70edb889ed5fa9c5 (diff) | |
tdf#104450: Use Calibri; let LO to fallback to Carlito
Using Calibri will allow to keep originally intended font
on round-trip. If Calibri is absent on a system, LO will
fallback to Carlito for rendering, but keep original font
intact.
Reviewed-on: https://gerrit.libreoffice.org/38456
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit dd1ba90f6069b41e3f2c301809afefc6f63da710)
Change-Id: I8f29bed29bc7f48912b2637053ff128ea904c7a1
Reviewed-on: https://gerrit.libreoffice.org/38590
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 2111cea8e953..4d027678f098 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1381,11 +1381,10 @@ DECLARE_OOXMLIMPORT_TEST(testTdf100072, "tdf100072.docx") DECLARE_OOXMLIMPORT_TEST(testTdf108350, "tdf108350.docx") { - // For OOXML without explicit font information, font needs to be Carlito 11 pt, - // our bundled metrically compatible substitute for Calibri. + // For OOXML without explicit font information, font needs to be Calibri 11 pt uno::Reference<text::XTextRange> xPara(getParagraph(1)); uno::Reference<beans::XPropertySet> xRun(getRun(xPara, 1), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("Carlito"), getProperty<OUString>(xRun, "CharFontName")); + CPPUNIT_ASSERT_EQUAL(OUString("Calibri"), getProperty<OUString>(xRun, "CharFontName")); CPPUNIT_ASSERT_EQUAL(double(11), getProperty<double>(xRun, "CharHeight")); } |