tdf#64222 sw: better DOCX import/export of paragraph marker formatting

The problem here is that Word allows formatting the paragraph end
marker, and applies the same formatting to the generated numbering
string; Writer has no such marker thing.

This is currently represented by an empty AUTOFMT hint at the end of the
paragraph, which is created almost by accident in
SwXText::finishParagraph(), because the paragraph properties are set on
a SwPaM that doesn't select the whole paragraph but sits at the end.

This is a bit fragile and the hint may have unfortunate accidents such
as being merged into a preceding AUTOFMT hint if it happens to have the
same items in it.

It ought to work better to have an item in SwTextNode's SwAttrSet to
store these special items; has the advantage that the items will also be
copied when you split the paragraph, like in Word.

Add a RES_PARATR_LIST_AUTOFMT and UNO property "ListAutoFormat" (which
should be considered a first draft...) and use it in preference (where
possible) or in addition to (where necessary due to other missing
pieces) the empty hint.

Also revert the change in checkApplyParagraphMarkFormatToNumbering() to
consider hints that start before the end of the paragraph, as it has
unintended side effects as pointed out by Mike Kaganski.

Change-Id: Ic1d5dd9db2bab0c5e4594712bb45973aa1442da3
Reviewed-on: https://gerrit.libreoffice.org/78729
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

1 files changed, 99 insertions, 99 deletions

diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 72c20b21cc8a..6e818b03349b 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -187,120 +187,120 @@ class SvxLRSpaceItem;
 #define     RES_PARATR_LIST_ISRESTART              TypedWhichId<SfxBoolItem>(84)
 #define     RES_PARATR_LIST_RESTARTVALUE           TypedWhichId<SfxInt16Item>(85)
 #define     RES_PARATR_LIST_ISCOUNTED              TypedWhichId<SfxBoolItem>(86)
-#define RES_PARATR_LIST_END (87)
+#define     RES_PARATR_LIST_AUTOFMT                TypedWhichId<SwFormatAutoFormat>(87)//TypedWhichId<SfxSetItem>(87)
+#define RES_PARATR_LIST_END (88)
 
 #define RES_FRMATR_BEGIN RES_PARATR_LIST_END
 #define     RES_FILL_ORDER                         TypedWhichId<SwFormatFillOrder>(RES_FRMATR_BEGIN)
-#define     RES_FRM_SIZE                           TypedWhichId<SwFormatFrameSize>(88)
-#define     RES_PAPER_BIN                          TypedWhichId<SvxPaperBinItem>(89)
-#define     RES_LR_SPACE                           TypedWhichId<SvxLRSpaceItem>(90)
-#define     RES_UL_SPACE                           TypedWhichId<SvxULSpaceItem>(91)
-#define     RES_PAGEDESC                           TypedWhichId<SwFormatPageDesc>(92)
-#define     RES_BREAK                              TypedWhichId<SvxFormatBreakItem>(93)
-#define     RES_CNTNT                              TypedWhichId<SwFormatContent>(94)
-#define     RES_HEADER                             TypedWhichId<SwFormatHeader>(95)
-#define     RES_FOOTER                             TypedWhichId<SwFormatFooter>(96)
-#define     RES_PRINT                              TypedWhichId<SvxPrintItem>(97)
-#define     RES_OPAQUE                             TypedWhichId<SvxOpaqueItem>(98)
-#define     RES_PROTECT                            TypedWhichId<SvxProtectItem>(99)
-#define     RES_SURROUND                           TypedWhichId<SwFormatSurround>(100)
-#define     RES_VERT_ORIENT                        TypedWhichId<SwFormatVertOrient>(101)
-#define     RES_HORI_ORIENT                        TypedWhichId<SwFormatHoriOrient>(102)
-#define     RES_ANCHOR                             TypedWhichId<SwFormatAnchor>(103)
-#define     RES_BACKGROUND                         TypedWhichId<SvxBrushItem>(104)
-#define     RES_BOX                                TypedWhichId<SvxBoxItem>(105)
-#define     RES_SHADOW                             TypedWhichId<SvxShadowItem>(106)
-#define     RES_FRMMACRO                           TypedWhichId<SvxMacroItem>(107)
-#define     RES_COL                                TypedWhichId<SwFormatCol>(108)
-#define     RES_KEEP                               TypedWhichId<SvxFormatKeepItem>(109)
-#define     RES_URL                                TypedWhichId<SwFormatURL>(110)
-#define     RES_EDIT_IN_READONLY                   TypedWhichId<SwFormatEditInReadonly>(111)
-#define     RES_LAYOUT_SPLIT                       TypedWhichId<SwFormatLayoutSplit>(112)
-#define     RES_CHAIN                              TypedWhichId<SwFormatChain>(113)
-#define     RES_TEXTGRID                           TypedWhichId<SwTextGridItem>(114)
-#define     RES_LINENUMBER                         TypedWhichId<SwFormatLineNumber>(115)
-#define     RES_FTN_AT_TXTEND                      TypedWhichId<SwFormatFootnoteAtTextEnd>(116)
-#define     RES_END_AT_TXTEND                      TypedWhichId<SwFormatEndAtTextEnd>(117)
-#define     RES_COLUMNBALANCE                      TypedWhichId<SwFormatNoBalancedColumns>(118)
-#define     RES_FRAMEDIR                           TypedWhichId<SvxFrameDirectionItem>(119)
-#define     RES_HEADER_FOOTER_EAT_SPACING          TypedWhichId<SwHeaderAndFooterEatSpacingItem>(120)
-#define     RES_ROW_SPLIT                          TypedWhichId<SwFormatRowSplit>(121)
-#define     RES_FOLLOW_TEXT_FLOW                   TypedWhichId<SwFormatFollowTextFlow>(122)
-#define     RES_COLLAPSING_BORDERS                 TypedWhichId<SfxBoolItem>(123)
-#define     RES_WRAP_INFLUENCE_ON_OBJPOS           TypedWhichId<SwFormatWrapInfluenceOnObjPos>(124)
-#define     RES_AUTO_STYLE                         TypedWhichId<SwFormatAutoFormat>(125)
-#define     RES_FRMATR_STYLE_NAME                  TypedWhichId<SfxStringItem>(126)
-#define     RES_FRMATR_CONDITIONAL_STYLE_NAME      TypedWhichId<SfxStringItem>(127)
-#define     RES_FRMATR_GRABBAG                     TypedWhichId<SfxGrabBagItem>(128)
-#define     RES_TEXT_VERT_ADJUST                   TypedWhichId<SdrTextVertAdjustItem>(129)
-#define RES_FRMATR_END 130
+#define     RES_FRM_SIZE                           TypedWhichId<SwFormatFrameSize>(89)
+#define     RES_PAPER_BIN                          TypedWhichId<SvxPaperBinItem>(90)
+#define     RES_LR_SPACE                           TypedWhichId<SvxLRSpaceItem>(91)
+#define     RES_UL_SPACE                           TypedWhichId<SvxULSpaceItem>(92)
+#define     RES_PAGEDESC                           TypedWhichId<SwFormatPageDesc>(93)
+#define     RES_BREAK                              TypedWhichId<SvxFormatBreakItem>(94)
+#define     RES_CNTNT                              TypedWhichId<SwFormatContent>(95)
+#define     RES_HEADER                             TypedWhichId<SwFormatHeader>(96)
+#define     RES_FOOTER                             TypedWhichId<SwFormatFooter>(97)
+#define     RES_PRINT                              TypedWhichId<SvxPrintItem>(98)
+#define     RES_OPAQUE                             TypedWhichId<SvxOpaqueItem>(99)
+#define     RES_PROTECT                            TypedWhichId<SvxProtectItem>(100)
+#define     RES_SURROUND                           TypedWhichId<SwFormatSurround>(101)
+#define     RES_VERT_ORIENT                        TypedWhichId<SwFormatVertOrient>(102)
+#define     RES_HORI_ORIENT                        TypedWhichId<SwFormatHoriOrient>(103)
+#define     RES_ANCHOR                             TypedWhichId<SwFormatAnchor>(104)
+#define     RES_BACKGROUND                         TypedWhichId<SvxBrushItem>(105)
+#define     RES_BOX                                TypedWhichId<SvxBoxItem>(106)
+#define     RES_SHADOW                             TypedWhichId<SvxShadowItem>(107)
+#define     RES_FRMMACRO                           TypedWhichId<SvxMacroItem>(108)
+#define     RES_COL                                TypedWhichId<SwFormatCol>(109)
+#define     RES_KEEP                               TypedWhichId<SvxFormatKeepItem>(110)
+#define     RES_URL                                TypedWhichId<SwFormatURL>(111)
+#define     RES_EDIT_IN_READONLY                   TypedWhichId<SwFormatEditInReadonly>(112)
+#define     RES_LAYOUT_SPLIT                       TypedWhichId<SwFormatLayoutSplit>(113)
+#define     RES_CHAIN                              TypedWhichId<SwFormatChain>(114)
+#define     RES_TEXTGRID                           TypedWhichId<SwTextGridItem>(115)
+#define     RES_LINENUMBER                         TypedWhichId<SwFormatLineNumber>(116)
+#define     RES_FTN_AT_TXTEND                      TypedWhichId<SwFormatFootnoteAtTextEnd>(117)
+#define     RES_END_AT_TXTEND                      TypedWhichId<SwFormatEndAtTextEnd>(118)
+#define     RES_COLUMNBALANCE                      TypedWhichId<SwFormatNoBalancedColumns>(119)
+#define     RES_FRAMEDIR                           TypedWhichId<SvxFrameDirectionItem>(120)
+#define     RES_HEADER_FOOTER_EAT_SPACING          TypedWhichId<SwHeaderAndFooterEatSpacingItem>(121)
+#define     RES_ROW_SPLIT                          TypedWhichId<SwFormatRowSplit>(122)
+#define     RES_FOLLOW_TEXT_FLOW                   TypedWhichId<SwFormatFollowTextFlow>(123)
+#define     RES_COLLAPSING_BORDERS                 TypedWhichId<SfxBoolItem>(124)
+#define     RES_WRAP_INFLUENCE_ON_OBJPOS           TypedWhichId<SwFormatWrapInfluenceOnObjPos>(125)
+#define     RES_AUTO_STYLE                         TypedWhichId<SwFormatAutoFormat>(126)
+#define     RES_FRMATR_STYLE_NAME                  TypedWhichId<SfxStringItem>(127)
+#define     RES_FRMATR_CONDITIONAL_STYLE_NAME      TypedWhichId<SfxStringItem>(128)
+#define     RES_FRMATR_GRABBAG                     TypedWhichId<SfxGrabBagItem>(129)
+#define     RES_TEXT_VERT_ADJUST                   TypedWhichId<SdrTextVertAdjustItem>(130)
+#define RES_FRMATR_END 131
 
 #define RES_GRFATR_BEGIN RES_FRMATR_END
-#define     RES_GRFATR_MIRRORGRF    TypedWhichId<SwMirrorGrf>(RES_GRFATR_BEGIN) // 130
-#define     RES_GRFATR_CROPGRF      TypedWhichId<SwCropGrf>(131)
-
-#define     RES_GRFATR_ROTATION     TypedWhichId<SwRotationGrf>(132)
-#define     RES_GRFATR_LUMINANCE    TypedWhichId<SwLuminanceGrf>(133)
-#define     RES_GRFATR_CONTRAST     TypedWhichId<SwContrastGrf>(134)
-#define     RES_GRFATR_CHANNELR     TypedWhichId<SwChannelRGrf>(135)
-#define     RES_GRFATR_CHANNELG     TypedWhichId<SwChannelGGrf>(136)
-#define     RES_GRFATR_CHANNELB     TypedWhichId<SwChannelBGrf>(137)
-#define     RES_GRFATR_GAMMA        TypedWhichId<SwGammaGrf>(138)
-#define     RES_GRFATR_INVERT       TypedWhichId<SwInvertGrf>(139)
-#define     RES_GRFATR_TRANSPARENCY TypedWhichId<SwTransparencyGrf>(140)
-#define     RES_GRFATR_DRAWMODE     TypedWhichId<SwDrawModeGrf>(141)
-
-#define     RES_GRFATR_DUMMY1       TypedWhichId<SfxBoolItem>(142)
-#define     RES_GRFATR_DUMMY2       TypedWhichId<SfxBoolItem>(143)
-#define     RES_GRFATR_DUMMY3       TypedWhichId<SfxBoolItem>(144)
-#define     RES_GRFATR_DUMMY4       TypedWhichId<SfxBoolItem>(145)
-#define     RES_GRFATR_DUMMY5       TypedWhichId<SfxBoolItem>(146)
-#define RES_GRFATR_END (147)
+#define     RES_GRFATR_MIRRORGRF    TypedWhichId<SwMirrorGrf>(RES_GRFATR_BEGIN) // 131
+#define     RES_GRFATR_CROPGRF      TypedWhichId<SwCropGrf>(132)
+
+#define     RES_GRFATR_ROTATION     TypedWhichId<SwRotationGrf>(133)
+#define     RES_GRFATR_LUMINANCE    TypedWhichId<SwLuminanceGrf>(134)
+#define     RES_GRFATR_CONTRAST     TypedWhichId<SwContrastGrf>(135)
+#define     RES_GRFATR_CHANNELR     TypedWhichId<SwChannelRGrf>(136)
+#define     RES_GRFATR_CHANNELG     TypedWhichId<SwChannelGGrf>(137)
+#define     RES_GRFATR_CHANNELB     TypedWhichId<SwChannelBGrf>(138)
+#define     RES_GRFATR_GAMMA        TypedWhichId<SwGammaGrf>(139)
+#define     RES_GRFATR_INVERT       TypedWhichId<SwInvertGrf>(140)
+#define     RES_GRFATR_TRANSPARENCY TypedWhichId<SwTransparencyGrf>(141)
+#define     RES_GRFATR_DRAWMODE     TypedWhichId<SwDrawModeGrf>(142)
+
+#define     RES_GRFATR_DUMMY1       TypedWhichId<SfxBoolItem>(143)
+#define     RES_GRFATR_DUMMY2       TypedWhichId<SfxBoolItem>(144)
+#define     RES_GRFATR_DUMMY3       TypedWhichId<SfxBoolItem>(145)
+#define     RES_GRFATR_DUMMY4       TypedWhichId<SfxBoolItem>(146)
+#define     RES_GRFATR_DUMMY5       TypedWhichId<SfxBoolItem>(147)
+#define RES_GRFATR_END (148)
 
 #define RES_BOXATR_BEGIN RES_GRFATR_END
-#define     RES_BOXATR_FORMAT       TypedWhichId<SwTableBoxNumFormat>(RES_BOXATR_BEGIN) // 147
-#define     RES_BOXATR_FORMULA      TypedWhichId<SwTableBoxFormula>(148)
-#define     RES_BOXATR_VALUE        TypedWhichId<SwTableBoxValue>(149)
-#define RES_BOXATR_END (150)
+#define     RES_BOXATR_FORMAT       TypedWhichId<SwTableBoxNumFormat>(RES_BOXATR_BEGIN) // 148
+#define     RES_BOXATR_FORMULA      TypedWhichId<SwTableBoxFormula>(149)
+#define     RES_BOXATR_VALUE        TypedWhichId<SwTableBoxValue>(150)
+#define RES_BOXATR_END (151)
 
 #define RES_UNKNOWNATR_BEGIN RES_BOXATR_END
-#define     RES_UNKNOWNATR_CONTAINER TypedWhichId<SvXMLAttrContainerItem>(RES_UNKNOWNATR_BEGIN)// 150
-#define RES_UNKNOWNATR_END (151)
+#define     RES_UNKNOWNATR_CONTAINER TypedWhichId<SvXMLAttrContainerItem>(RES_UNKNOWNATR_BEGIN)// 151
+#define RES_UNKNOWNATR_END (152)
 
 // Format IDs
 #define RES_FMT_BEGIN RES_UNKNOWNATR_END
-#define     RES_CHRFMT                TypedWhichId<SwCharFormat>(RES_FMT_BEGIN)  // 151
-#define     RES_FRMFMT                TypedWhichId<SwFrameFormat>(152)
-#define     RES_FLYFRMFMT             TypedWhichId<SwFlyFrameFormat>(153)
-#define     RES_TXTFMTCOLL            TypedWhichId<SwTextFormatColl>(154)
-#define     RES_GRFFMTCOLL            TypedWhichId<SwGrfFormatColl>(155)
-#define     RES_DRAWFRMFMT            TypedWhichId<SwDrawFrameFormat>(156)
-#define     RES_CONDTXTFMTCOLL        TypedWhichId<SwConditionTextFormatColl>(157)
-#define RES_FMT_END 158
+#define     RES_CHRFMT                TypedWhichId<SwCharFormat>(RES_FMT_BEGIN)  // 152
+#define     RES_FRMFMT                TypedWhichId<SwFrameFormat>(153)
+#define     RES_FLYFRMFMT             TypedWhichId<SwFlyFrameFormat>(154)
+#define     RES_TXTFMTCOLL            TypedWhichId<SwTextFormatColl>(155)
+#define     RES_GRFFMTCOLL            TypedWhichId<SwGrfFormatColl>(156)
+#define     RES_DRAWFRMFMT            TypedWhichId<SwDrawFrameFormat>(157)
+#define     RES_CONDTXTFMTCOLL        TypedWhichId<SwConditionTextFormatColl>(158)
+#define RES_FMT_END 159
 
 // ID's for Messages in the Formats
 #define RES_MSG_BEGIN RES_FMT_END
-#define     RES_OBJECTDYING           TypedWhichId<SwPtrMsgPoolItem>(RES_MSG_BEGIN)                // 158
-#define     RES_FMT_CHG               TypedWhichId<SwFormatChg>(159)
-#define     RES_ATTRSET_CHG           TypedWhichId<SwAttrSetChg>(160)
-#define     RES_INS_TXT               TypedWhichId<SwInsText>(161)
-#define     RES_DEL_CHR               TypedWhichId<SwDelChr>(162)
-#define     RES_DEL_TXT               TypedWhichId<SwDelText>(163)
-#define     RES_UPDATE_ATTR           TypedWhichId<SwUpdateAttr>(164)
-#define     RES_REFMARKFLD_UPDATE     TypedWhichId<SwRefMarkFieldUpdate>(165)
-#define     RES_DOCPOS_UPDATE         TypedWhichId<SwDocPosUpdate>(166)
-#define     RES_TABLEFML_UPDATE       TypedWhichId<SwTableFormulaUpdate>(167)
-#define     RES_UPDATEDDETBL          TypedWhichId<SwMsgPoolItem>(168)
-#define     RES_TBLHEADLINECHG        TypedWhichId<SwMsgPoolItem>(169)
-#define     RES_AUTOFMT_DOCNODE       TypedWhichId<SwAutoFormatGetDocNode>(170)
-#define     RES_SECTION_HIDDEN        TypedWhichId<SwMsgPoolItem>(171)
-#define     RES_SECTION_NOT_HIDDEN    TypedWhichId<SwMsgPoolItem>(172)
-#define     RES_GRAPHIC_ARRIVED       TypedWhichId<SwMsgPoolItem>(173)
-#define     RES_GRAPHIC_PIECE_ARRIVED TypedWhichId<SwMsgPoolItem>(174)
-#define     RES_HIDDENPARA_PRINT      TypedWhichId<SwMsgPoolItem>(175)
-#define     RES_CONDCOLL_CONDCHG      TypedWhichId<SwCondCollCondChg>(176)
-#define     RES_VIRTPAGENUM_INFO      TypedWhichId<SwVirtPageNumInfo>(177)
-// empty
+#define     RES_OBJECTDYING           TypedWhichId<SwPtrMsgPoolItem>(RES_MSG_BEGIN)                // 159
+#define     RES_FMT_CHG               TypedWhichId<SwFormatChg>(160)
+#define     RES_ATTRSET_CHG           TypedWhichId<SwAttrSetChg>(161)
+#define     RES_INS_TXT               TypedWhichId<SwInsText>(162)
+#define     RES_DEL_CHR               TypedWhichId<SwDelChr>(163)
+#define     RES_DEL_TXT               TypedWhichId<SwDelText>(164)
+#define     RES_UPDATE_ATTR           TypedWhichId<SwUpdateAttr>(165)
+#define     RES_REFMARKFLD_UPDATE     TypedWhichId<SwRefMarkFieldUpdate>(166)
+#define     RES_DOCPOS_UPDATE         TypedWhichId<SwDocPosUpdate>(167)
+#define     RES_TABLEFML_UPDATE       TypedWhichId<SwTableFormulaUpdate>(168)
+#define     RES_UPDATEDDETBL          TypedWhichId<SwMsgPoolItem>(169)
+#define     RES_TBLHEADLINECHG        TypedWhichId<SwMsgPoolItem>(170)
+#define     RES_AUTOFMT_DOCNODE       TypedWhichId<SwAutoFormatGetDocNode>(171)
+#define     RES_SECTION_HIDDEN        TypedWhichId<SwMsgPoolItem>(172)
+#define     RES_SECTION_NOT_HIDDEN    TypedWhichId<SwMsgPoolItem>(173)
+#define     RES_GRAPHIC_ARRIVED       TypedWhichId<SwMsgPoolItem>(174)
+#define     RES_GRAPHIC_PIECE_ARRIVED TypedWhichId<SwMsgPoolItem>(175)
+#define     RES_HIDDENPARA_PRINT      TypedWhichId<SwMsgPoolItem>(176)
+#define     RES_CONDCOLL_CONDCHG      TypedWhichId<SwCondCollCondChg>(177)
+#define     RES_VIRTPAGENUM_INFO      TypedWhichId<SwVirtPageNumInfo>(178)
 #define     RES_REMOVE_UNO_OBJECT     TypedWhichId<SwPtrMsgPoolItem>(179)
 #define     RES_GRF_REREAD_AND_INCACHE   TypedWhichId<SwMsgPoolItem>(180)
 // empty