ODT import: copy direct para formatting for first para in insert mode

It was inconsistent that we copied the paragraph style, but not the
direct paragraph formatting from the to-be-deleted first inserted node
to the last-before-insertion node.

Change-Id: Ie5161c6314d7c1a71599bfe4eeafd3398450bd77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103864
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins

1 files changed, 8 insertions, 0 deletions

diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 00c141332a15..2d591f122e57 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -786,7 +786,15 @@ void SwXMLImport::endDocument()
                 if (!pTextNode->GetText().isEmpty())
                     pDelNd->FormatToTextAttr( pTextNode );
                 else
+                {
                     pTextNode->ChgFormatColl( pDelNd->GetTextColl() );
+                    if (!pDelNd->GetNoCondAttr(RES_PARATR_LIST_ID, /*bInParents=*/false))
+                    {
+                        // MergeListsAtDocumentInsertPosition() will deal with lists below, copy
+                        // paragraph direct formatting otherwise.
+                        pDelNd->CopyCollFormat(*pTextNode);
+                    }
+                }
                 pTextNode->JoinNext();
             }
         }