[Libreoffice-commits] core.git: sw/source

[László Németh (via logerrit)]

 sw/source/core/doc/DocumentRedlineManager.cxx |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit b86b87eb34c686c67ae86c6f635e5218a5654898
Author:     László Németh <nemeth at numbertext.org>
AuthorDate: Fri Jul 5 16:01:32 2019 +0200
Commit:     László Németh <nemeth at numbertext.org>
CommitDate: Sat Jul 6 21:34:00 2019 +0200

    tdf#120338 DOCX: reject other paragraph formatting changes
    
    now including RES_FRMATTR attributes eg. border,
    background color etc.
    
    Also similar fix and clean-up for
    commit 705b728d26b4480ec6b51d9fe1362a0154ea9bf9
    "tdf#119571 fix style & numbering at tracked deletion"
    and commit b69c518df68ce673b28d589da6626bd3d860f309
    "tdf#54819 keep style & numbering at tracked deletion".
    
    Change-Id: Ied54883ea567902c2f08900148705cea25eab2a9
    Reviewed-on: https://gerrit.libreoffice.org/75142
    Tested-by: Jenkins
    Reviewed-by: László Németh <nemeth at numbertext.org>

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index d2d0adde11d4..63283b91ed5b 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -674,8 +674,8 @@ namespace
                         std::set<sal_uInt16> aResetAttrsArray;
 
                         sal_uInt16 aResetableSetRange[] = {
-                                RES_PARATR_LINESPACING, RES_PARATR_OUTLINELEVEL,
-                                RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END - 1,
+                                RES_PARATR_BEGIN, RES_PARATR_END - 1,
+                                RES_PARATR_LIST_BEGIN, RES_FRMATR_END - 1,
                                 0
                         };
 
@@ -821,14 +821,16 @@ namespace
             SfxItemSet aTmp(
                 pDoc->GetAttrPool(),
                 svl::Items<
-                    RES_PARATR_LINESPACING, RES_PARATR_OUTLINELEVEL,
-                    RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END - 1>{});
+                    RES_PARATR_BEGIN, RES_PARATR_END - 3, // skip RSID and GRABBAG
+                    RES_PARATR_LIST_BEGIN, RES_UL_SPACE,  // skip PAGEDESC and BREAK
+                    RES_CNTNT, RES_FRMATR_END - 1>{});
 
             SfxItemSet aTmp2(
                 pDoc->GetAttrPool(),
                 svl::Items<
-                    RES_PARATR_LINESPACING, RES_PARATR_OUTLINELEVEL,
-                    RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END - 1>{});
+                    RES_PARATR_BEGIN, RES_PARATR_END - 3, // skip RSID and GRABBAG
+                    RES_PARATR_LIST_BEGIN, RES_UL_SPACE,  // skip PAGEDESC and BREAK
+                    RES_CNTNT, RES_FRMATR_END - 1>{});
 
             pToNode->GetParaAttr(aTmp, 0, 0);
             pFromNode->GetParaAttr(aTmp2, 0, 0);