diff options
| author | László Németh <nemeth@numbertext.org> | 2019-07-05 16:01:32 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2019-07-06 21:34:00 +0200 |
| commit | b86b87eb34c686c67ae86c6f635e5218a5654898 (patch) | |
| tree | e5b4e26dba2997570a5351dd74141a1dc1a9115e | |
| parent | 02999ba5e40475b5ddc7280376fd68c4b380d27e (diff) | |
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@numbertext.org>
| -rw-r--r-- | sw/source/core/doc/DocumentRedlineManager.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
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); |