dev/null |binary
sw/qa/extras/ww8export/ww8export4.cxx | 11 -----------
sw/source/filter/ww8/ww8par.cxx | 1 -
3 files changed, 12 deletions(-)
New commits:
commit d34ffd5bbc6ecf1e98a834c31af6d87653213dda
Author: Justin Luth <jl...@mail.com>
AuthorDate: Wed Feb 8 11:55:42 2023 -0500
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Feb 9 09:09:41 2023 +0000
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 <jl...@mail.com>
Reviewed-by: Justin Luth <jl...@mail.com>
(cherry picked from commit 7b3e0639962bab6e757381ad2b3e4868c61ed3b7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146625
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
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
Binary files a/sw/qa/extras/ww8export/data/tdf148360.doc and /dev/null differ
diff --git a/sw/qa/extras/ww8export/ww8export4.cxx
b/sw/qa/extras/ww8export/ww8export4.cxx
index f409c8e8dfa8..69596ded0303 100644
--- a/sw/qa/extras/ww8export/ww8export4.cxx
+++ b/sw/qa/extras/ww8export/ww8export4.cxx
@@ -32,17 +32,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
