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 /writerfilter | |
| 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 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 860633e3fb76..08c6bfd7f820 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -136,14 +136,14 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon if (eDocumentType == SourceDocumentType::OOXML) { // tdf#108350 - // In OOXML (i.e. Word since 2007), the default document font is Calibri 11 pt. - // If a document doesn't contain font information, we should assume our - // metric-compatible equivalent Carlito to provide best layout match. + // In Word since version 2007, the default document font is Calibri 11 pt. + // If a DOCX document doesn't contain font information, we should assume + // the intended font to provide best layout match. try { uno::Reference< beans::XPropertySet > xDefProps(GetTextFactory()->createInstance("com.sun.star.text.Defaults"), uno::UNO_QUERY_THROW); - xDefProps->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME), css::uno::Any(OUString("Carlito"))); + xDefProps->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME), css::uno::Any(OUString("Calibri"))); xDefProps->setPropertyValue(getPropertyName(PROP_CHAR_HEIGHT), css::uno::Any(double(11))); } catch (const uno::Exception& rException) |