summaryrefslogtreecommitdiff
path: root/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2019-10-04 09:36:45 +0300
committerMiklos Vajna <vmiklos@collabora.com>2019-10-07 09:28:25 +0200
commit875793d841165aaaaefa2c34b855e8f0f8a8c214 (patch)
treed51d5d141506559cc5d11c776bcdcb061753c7d4 /sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
parenta4b255ecdaba4c13933dfd3558f3cf7dab5ec0e5 (diff)
related tdf#99602 writerfilter TODO: subscript - use ParaStyle fontsize
The existing code handled two situations: 1.) if both position(escapement) and fontsize set via direct properties 2.) if fontsize came from the document default properties. That misses both paragraph style fontsize (very common) and character style fontsize. This patch adds checking for the paragraph style's fontsize. Change-Id: I25312cd4544cfd1be09b21c96a270cb05e4f5b8f Reviewed-on: https://gerrit.libreoffice.org/80179 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/qa/extras/ooxmlexport/ooxmlexport10.cxx')
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport10.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 911c343922eb..17b91ecb9180 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -213,8 +213,10 @@ DECLARE_OOXMLEXPORT_TEST(testFontEsc, "test_tdf120412.docx")
return;
// don't lose the run with superscript formatting
assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r", 2);
- // raising is greater than 100%
- assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r[2]/w:rPr/w:position","val", "24");
+ // Superscript should be raised by 100% (11pt). Was 110% (12pt)
+ // calculated using docDefault with fontsize 10pt (note only w:szCs defined as 11pt, not w:sz)
+ // instead of inherited normal paraStyle fontsize 11pt (related to tdf#99602)
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r[2]/w:rPr/w:position","val", "22");
}
DECLARE_OOXMLEXPORT_TEST(testMceWpg, "mce-wpg.docx")