diff options
| author | Justin Luth <jluth@mail.com> | 2023-05-27 20:17:44 -0400 |
|---|---|---|
| committer | Justin Luth <jluth@mail.com> | 2023-05-29 17:08:50 +0200 |
| commit | 5bdff09d5e7026c8176d11abfa164b1c44bf4222 (patch) | |
| tree | 242dadaa6434e361eec81456069975b9a94fe085 /sw | |
| parent | 949d1ee783f58504fdf7cb6b6a164384ae82533f (diff) | |
tdf#36711 doc import: special case when DyaAbs is zero
One existing unit test found, but the frame was non-functional.
Noted in an earlier patchset.
make CppunitTest_sw_ww8export CPPUNIT_TEST_NAME=testTdf36711_inlineFrames
Change-Id: I9bc4064b6564b327614e44112304adef59490078
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152346
Reviewed-by: Justin Luth <jluth@mail.com>
Tested-by: Jenkins
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ww8export/data/tdf36711_inlineFrames.doc | bin | 0 -> 37376 bytes | |||
| -rw-r--r-- | sw/qa/extras/ww8export/ww8export.cxx | 5 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 5 |
3 files changed, 10 insertions, 0 deletions
diff --git a/sw/qa/extras/ww8export/data/tdf36711_inlineFrames.doc b/sw/qa/extras/ww8export/data/tdf36711_inlineFrames.doc Binary files differnew file mode 100644 index 000000000000..80a7d64cc8cd --- /dev/null +++ b/sw/qa/extras/ww8export/data/tdf36711_inlineFrames.doc diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index 9658c7e2dd51..0253778f1ec6 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -587,6 +587,11 @@ DECLARE_WW8EXPORT_TEST(testTdf133504_wrapNotBeside, "tdf133504_wrapNotBeside.doc CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_NONE, getProperty<text::WrapTextMode>(getShape(1), "Surround")); } +DECLARE_WW8EXPORT_TEST(testTdf36711_inlineFrames, "tdf36711_inlineFrames.doc") +{ + CPPUNIT_ASSERT_EQUAL(text::RelOrientation::FRAME, getProperty<sal_Int16>(getShape(1), "VertOrientRelation")); +} + DECLARE_WW8EXPORT_TEST(testLayoutHanging, "fdo68967.doc") { // This must not hang in layout diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 134acfba537d..4758c4646286 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -1996,6 +1996,11 @@ bTogglePos(false) // #i18732# switch( rWW.nTDyaAbs ) // particular Y-positions ? { + case 0: // inline + // Specifies that the parent object shall be vertically aligned in line + // with the surrounding text (i.e. shall not allow any text wrapping around it) + eVRel = text::RelOrientation::FRAME; + break; case -4: eVAlign = text::VertOrientation::TOP; if (nYBind < 2) |