summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Luth <jluth@mail.com>2023-02-08 11:55:42 -0500
committerJustin Luth <jluth@mail.com>2023-02-08 19:15:36 +0000
commit7b3e0639962bab6e757381ad2b3e4868c61ed3b7 (patch)
tree51dd1df23197fa0161004c89b33a4a4dbb7426a8
parent6f1dd12d808a41ca70d4a33787f1bdff9d44a5ac (diff)
Revert "tdf#148360 doc import: add NO_NUMBERING_SHOW_FOLLOWBY(true)"
This reverts commit 2405a36f3bcd43f80371ccaed47f7523ff0d8757 which was backported to 7.4.1. This solves the regression report for DOC in tdf#153042. The problem is that the tab-without-numbering is displaying in cases where it shouldn't (i.e. when the tabstop position matches the first line indent). Although the patch itself is fine (DOC should do the same thing as DOCX) the feature is incomplete, even for DOCX/RTF. So just remove DOC from this mix - especially since there seem to be a LOT more instances of DOC files that need the incomplete aspect. Once it is proven to work OK for DOCX, we can add DOC back in. Change-Id: I3c550fc2ca29cf1490ec0a5e3979a6acbd102385 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146670 Tested-by: Justin Luth <jluth@mail.com> Reviewed-by: Justin Luth <jluth@mail.com>
-rw-r--r--sw/qa/extras/ww8export/data/tdf148360.docbin10240 -> 0 bytes
-rw-r--r--sw/qa/extras/ww8export/ww8export4.cxx11
-rw-r--r--sw/source/filter/ww8/ww8par.cxx1
3 files changed, 0 insertions, 12 deletions
diff --git a/sw/qa/extras/ww8export/data/tdf148360.doc b/sw/qa/extras/ww8export/data/tdf148360.doc
deleted file mode 100644
index 3969a560999f..000000000000
--- a/sw/qa/extras/ww8export/data/tdf148360.doc
+++ /dev/null
Binary files differ
diff --git a/sw/qa/extras/ww8export/ww8export4.cxx b/sw/qa/extras/ww8export/ww8export4.cxx
index 316e2e26de8f..2fbe6911a2df 100644
--- a/sw/qa/extras/ww8export/ww8export4.cxx
+++ b/sw/qa/extras/ww8export/ww8export4.cxx
@@ -33,17 +33,6 @@ public:
}
};
-CPPUNIT_TEST_FIXTURE(Test, testTdf148360)
-{
- loadAndReload("tdf148360.doc");
- const auto& pLayout = parseLayoutDump();
-
- // Ensure first element is a tab
- assertXPath(pLayout, "/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/child::*[1]", "type", "PortionType::TabLeft");
- // and only then goes content
- assertXPath(pLayout, "/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/child::*[2]", "type", "PortionType::Text");
-}
-
CPPUNIT_TEST_FIXTURE(Test, testTdf77964)
{
loadAndReload("tdf77964.doc");
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 448057636fab..48ad05bc1681 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1890,7 +1890,6 @@ void SwWW8ImplReader::ImportDop()
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::SURROUND_TEXT_WRAP_SMALL, true);
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::PROP_LINE_SPACING_SHRINKS_FIRST_LINE, true);
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::CONTINUOUS_ENDNOTES, true);
- m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::NO_NUMBERING_SHOW_FOLLOWBY, true);
// rely on default for HYPHENATE_URLS=false
// COMPATIBILITY FLAGS END