From df28caa1fc24c6288f4c10854b03612c929ee676 Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Fri, 9 Aug 2019 11:42:47 +0300 Subject: tdf#126723 writerfilter::finishParagraph - me, not previous MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In LO 6.2 commit 480ac84f2f5049fb4337b36f12fd6796e005761b the existing m_xPreviousParagraph was conveniently used to apply the changed properties. I never did like that choice, but despite looking at it, I failed to see that it is set in an inside loop, which means that it was NOT NECESSARILY reset to the current paragaph. So I'm happy to have proof that we should not use m_xPreviousParagraph. Reviewed-on: https://gerrit.libreoffice.org/77185 Tested-by: Jenkins Reviewed-by: Justin Luth Reviewed-by: László Németh (cherry picked from commit d03c92b93d6ba1808a6641b4aa8cb4aae38058bf) Change-Id: I5c7f1b0f097711d65ae0d0be1f0fbc40c8b96e9d Reviewed-on: https://gerrit.libreoffice.org/77249 Tested-by: Jenkins Reviewed-by: Michael Stahl --- sw/qa/extras/ooxmlexport/data/tdf126723.docx | Bin 0 -> 18689 bytes sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 5 +++++ 2 files changed, 5 insertions(+) create mode 100644 sw/qa/extras/ooxmlexport/data/tdf126723.docx (limited to 'sw/qa') diff --git a/sw/qa/extras/ooxmlexport/data/tdf126723.docx b/sw/qa/extras/ooxmlexport/data/tdf126723.docx new file mode 100644 index 000000000000..297ea322fa7d Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf126723.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx index d9f1978705cf..a3a7184b34e0 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx @@ -52,6 +52,11 @@ DECLARE_OOXMLEXPORT_TEST(testTdf121374_sectionHF2, "tdf121374_sectionHF2.doc") CPPUNIT_ASSERT( xHeaderText->getString().startsWith("virkamatka-anomus") ); } +DECLARE_OOXMLEXPORT_TEST(testTdf126723, "tdf126723.docx") +{ + CPPUNIT_ASSERT_EQUAL(static_cast(0), getProperty(getParagraph(2), "ParaLeftMargin")); +} + DECLARE_OOXMLEXPORT_TEST(testTdf121867, "tdf121867.odt") { SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get()); -- cgit