summaryrefslogtreecommitdiff
path: root/sw/qa/extras
diff options
context:
space:
mode:
Diffstat (limited to 'sw/qa/extras')
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport8.cxx4
-rw-r--r--sw/qa/extras/ooxmlimport/data/tdf108350.docxbin0 -> 1271 bytes
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx10
3 files changed, 12 insertions, 2 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index 7fc5d19b2db3..ac7ba7838132 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -350,7 +350,7 @@ DECLARE_OOXMLEXPORT_TEST(testN766487, "n766487.docx")
* oPara = oParas.nextElement
* oRuns = oPara.createEnumeration
* oRun = oRuns.nextElement
- * xray oRun.CharHeight ' 12, was larger
+ * xray oRun.CharHeight ' 11, was larger
* oPara = oParas.nextElement
* xray oPara.ParaFirstLineIndent ' -635, was 0
*/
@@ -363,7 +363,7 @@ DECLARE_OOXMLEXPORT_TEST(testN766487, "n766487.docx")
uno::Reference<beans::XPropertySet> xPropertySet(xRunEnum->nextElement(), uno::UNO_QUERY);
float fValue = 0;
xPropertySet->getPropertyValue("CharHeight") >>= fValue;
- CPPUNIT_ASSERT_EQUAL(12.f, fValue);
+ CPPUNIT_ASSERT_EQUAL(11.f, fValue);
xPropertySet.set(xParaEnum->nextElement(), uno::UNO_QUERY);
sal_Int32 nValue = 0;
diff --git a/sw/qa/extras/ooxmlimport/data/tdf108350.docx b/sw/qa/extras/ooxmlimport/data/tdf108350.docx
new file mode 100644
index 000000000000..b62b3e127838
--- /dev/null
+++ b/sw/qa/extras/ooxmlimport/data/tdf108350.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 15aebdab076b..60d74ea7572a 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1287,6 +1287,16 @@ DECLARE_OOXMLIMPORT_TEST(testTdf76446, "tdf76446.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int64(3128), nRot);
}
+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.
+ 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(double(11), getProperty<double>(xRun, "CharHeight"));
+}
+
// tests should only be added to ooxmlIMPORT *if* they fail round-tripping in ooxmlEXPORT