diff options
| author | Jonathan Clark <jonathan@libreoffice.org> | 2024-09-20 00:50:21 -0600 |
|---|---|---|
| committer | Jonathan Clark <jonathan@libreoffice.org> | 2024-09-20 11:18:53 +0200 |
| commit | 2b030ded43f440a898733290af087d4aeed53368 (patch) | |
| tree | 946c3297398a2776924a53a8a5800c08c1efedf1 /sw | |
| parent | 92067587039473db38b139ecb56a3c64544e975b (diff) | |
tdf#85435 sw: No longer clear AddExtLeading for doc files with grid
This change removes a problematic workaround from the doc importer,
which was clearing the AddExtLeading compatibility flag for any doc file
containing a document grid.
The original intention for this workaround was to fix tdf#129808. At
some point, the workaround was disabled by inverting the value assigned
to the compatibility flag. Unfortunately, either way causes unfortunate
side effects.
Since tdf#129808 is now fixed elsewhere, this workaround no longer
serves any apparent purpose.
Change-Id: Ice46f1473916b072e183010f8888f6be62761bb3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173695
Tested-by: Jenkins
Reviewed-by: Jonathan Clark <jonathan@libreoffice.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ww8export/data/tdf85435.doc | bin | 0 -> 55296 bytes | |||
| -rw-r--r-- | sw/qa/extras/ww8export/ww8export4.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sw/qa/extras/ww8export/data/tdf85435.doc b/sw/qa/extras/ww8export/data/tdf85435.doc Binary files differnew file mode 100644 index 000000000000..0571e7ffb148 --- /dev/null +++ b/sw/qa/extras/ww8export/data/tdf85435.doc diff --git a/sw/qa/extras/ww8export/ww8export4.cxx b/sw/qa/extras/ww8export/ww8export4.cxx index 59a682a347f9..c17ea139f401 100644 --- a/sw/qa/extras/ww8export/ww8export4.cxx +++ b/sw/qa/extras/ww8export/ww8export4.cxx @@ -639,6 +639,12 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf54862) verify(); } +DECLARE_WW8EXPORT_TEST(testTdf85435, "tdf85435.doc") +{ + // Without the fix, this document only has one page. + CPPUNIT_ASSERT_EQUAL(2, getPages()); +} + } // end of anonymous namespace CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index d1b262858c4b..08d02b772a4c 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -261,12 +261,6 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrameFormat &rFormat, const wwSection &r aGrid.SetGridType(eType); - // seem to not add external leading in word, or the character would run across - // two line in some cases. - // TODO: tdf#85435 suggests that this is wrong - if (eType != GRID_NONE) - m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::ADD_EXT_LEADING, false); - //force to set document as standard page mode bool bSquaredMode = false; m_rDoc.SetDefaultPageMode( bSquaredMode ); |