From 446f9d77af4fe0cedf50e9cbd792cf1aee105675 Mon Sep 17 00:00:00 2001
From: Justin Luth <jluth@mail.com>
Date: Wed, 24 May 2023 08:52:20 -0400
Subject: [PATCH] tdf#155465 doc export: handle para last line - justify

This was already OK for import in OOo 3.3,
but never exported. DOCX export landed in 2019 (no bug report).

No existing unit tests matched for DOC.

make CppunitTest_sw_ww8export4 \
    CPPUNIT_TEST_NAME=testTdf155465_paraAdjustDistribute

Change-Id: Iaea149c21259fe2a9002c8ce7c023327bbd13746
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152199
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
---
 .../data/tdf155465_paraAdjustDistribute.doc   | Bin 0 -> 9728 bytes
 sw/qa/extras/ww8export/ww8export4.cxx         |  19 ++++++++++++++++++
 sw/source/filter/ww8/ww8atr.cxx               |   2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 sw/qa/extras/ww8export/data/tdf155465_paraAdjustDistribute.doc

diff --git a/sw/qa/extras/ww8export/data/tdf155465_paraAdjustDistribute.doc b/sw/qa/extras/ww8export/data/tdf155465_paraAdjustDistribute.doc
new file mode 100644
index 0000000000000000000000000000000000000000..5a661cd837ef0c9532304e3ab5f180728e25b903
GIT binary patch
literal 9728
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

literal 0
HcmV?d00001

diff --git a/sw/qa/extras/ww8export/ww8export4.cxx b/sw/qa/extras/ww8export/ww8export4.cxx
index 414d183ed6b0..9e4551fe872f 100644
--- a/sw/qa/extras/ww8export/ww8export4.cxx
+++ b/sw/qa/extras/ww8export/ww8export4.cxx
@@ -13,6 +13,7 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
+#include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
@@ -101,6 +102,24 @@ DECLARE_WW8EXPORT_TEST(testTdf90408B, "tdf90408B.doc")
     CPPUNIT_ASSERT_EQUAL_MESSAGE("text is 10pt", 10.f, getProperty<float>(xRun, "CharHeight"));
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf155465_paraAdjustDistribute, "tdf155465_paraAdjustDistribute.doc")
+{
+    // Without the accompanying fix in place, this test would have failed with
+    // 'Expected: 2; Actual  : 0', i.e. the first paragraph's ParaAdjust was left, not block.
+    const style::ParagraphAdjust eBlock = style::ParagraphAdjust_BLOCK;
+    auto nAdjust = getProperty<sal_Int16>(getParagraph(1), "ParaAdjust");
+    CPPUNIT_ASSERT_EQUAL(eBlock, static_cast<style::ParagraphAdjust>(nAdjust));
+
+    nAdjust = getProperty<sal_Int16>(getParagraph(1), "ParaLastLineAdjust");
+    CPPUNIT_ASSERT_EQUAL(eBlock, static_cast<style::ParagraphAdjust>(nAdjust));
+
+    nAdjust = getProperty<sal_Int16>(getParagraph(2), "ParaAdjust");
+    CPPUNIT_ASSERT_EQUAL(eBlock, static_cast<style::ParagraphAdjust>(nAdjust));
+
+    nAdjust = getProperty<sal_Int16>(getParagraph(2), "ParaLastLineAdjust");
+    CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_LEFT, static_cast<style::ParagraphAdjust>(nAdjust));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 8d7603f2d9a7..041abc5c65c5 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -5087,7 +5087,7 @@ void WW8AttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust )
             break;
         case SvxAdjust::BlockLine:
         case SvxAdjust::Block:
-            nAdj = nAdjBiDi = 3;
+            nAdj = nAdjBiDi = rAdjust.GetLastBlock() == SvxAdjust::Block ? 4 : 3;
             break;
         case SvxAdjust::Center:
             nAdj = nAdjBiDi = 1;