diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-10-07 15:53:15 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-10-07 16:30:45 +0200 |
| commit | aff70ac6ce3362fb76a74aa0d732a979bd047537 (patch) | |
| tree | 230ddcbb8c01e859054e454ba381a8a5fe8411a5 /sw/source/filter/rtf | |
| parent | cc6941e8ce4a22cd7bdcdf1db72da02546b35fd2 (diff) | |
RTF import: copy direct para formatting for first para in insert mode
This is really similar to commit
ae9fe9d7107b2e25c9316033651e49c08537c0e9 (ODT import: copy direct para
formatting for first para in insert mode, 2020-10-02), except that was
for the ODT import.
Change-Id: I5f4e82162f1c18335f472c004c742e0e0f0664f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104060
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw/source/filter/rtf')
| -rw-r--r-- | sw/source/filter/rtf/swparrtf.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index b6ae62bf6bf9..214322ebafa7 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -136,7 +136,15 @@ ErrCode SwRTFReader::Read(SwDoc& rDoc, const OUString& /*rBaseURL*/, SwPaM& rPam if (pTextNode->GetText().getLength()) pDelNd->FormatToTextAttr(pTextNode); else + { pTextNode->ChgFormatColl(pDelNd->GetTextColl()); + if (!pDelNd->GetNoCondAttr(RES_PARATR_LIST_ID, /*bInParents=*/false)) + { + // Lists would need manual merging, but copy paragraph direct formatting + // otherwise. + pDelNd->CopyCollFormat(*pTextNode); + } + } pTextNode->JoinNext(); } } |