diff options
author | Michael Stahl <michael.stahl@allotropia.de> | 2021-03-16 20:10:18 +0100 |
---|---|---|
committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-03-25 09:49:33 +0100 |
commit | 56d8007a197b095b09423c691a51515567648e80 (patch) | |
tree | 63ce068e98e368587e57e5e686dc09a27bd9ec74 /sw/inc | |
parent | 473f2dec087288309cb169bf84c12124e1d7d7d1 (diff) |
* add BackgroundFullSize property to PageProperties
* add a checkbox on the SvxPageDescPage
* marshal the item via SfxGrabBagItem to avoid changing svxids.hrc
* add RES_BACKGROUND_FULL_SIZE item, pool default is "true" which is
appropriate for Word import filters
* ODF export: remove hard-coded export in
XMLPageMasterExportPropMapper::ContextFilter()
* use it in SwFrame::PaintSwFrameBackground()
* fix painting of bitmaps by also using the page frame area in
SwFrame::GetBackgroundBrush(), which was the reason why
f006b6339e20af6a3fbd60d97d21590d4ebf5021 painted things inconsistently
* force repaint in lcl_DescSetAttr()/SwFrame::UpdateAttrFrame()
Change-Id: I4cb64f87c01d17c051936e9b8128395fbb8b4fe5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112594
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/hintids.hxx | 139 |
1 files changed, 70 insertions, 69 deletions
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx index 3971619e27e1..cc6b1916a08b 100644 --- a/sw/inc/hintids.hxx +++ b/sw/inc/hintids.hxx @@ -361,84 +361,85 @@ constexpr TypedWhichId<SfxStringItem> RES_FRMATR_STYLE_NAME(127); constexpr TypedWhichId<SfxStringItem> RES_FRMATR_CONDITIONAL_STYLE_NAME(128); constexpr TypedWhichId<SfxGrabBagItem> RES_FRMATR_GRABBAG(129); constexpr TypedWhichId<SdrTextVertAdjustItem> RES_TEXT_VERT_ADJUST(130); -constexpr sal_uInt16 RES_FRMATR_END(131); +constexpr TypedWhichId<SfxBoolItem> RES_BACKGROUND_FULL_SIZE(131); +constexpr sal_uInt16 RES_FRMATR_END(132); constexpr sal_uInt16 RES_GRFATR_BEGIN(RES_FRMATR_END); -constexpr TypedWhichId<SwMirrorGrf> RES_GRFATR_MIRRORGRF(RES_GRFATR_BEGIN); // 131 -constexpr TypedWhichId<SwCropGrf> RES_GRFATR_CROPGRF(132); - -constexpr TypedWhichId<SwRotationGrf> RES_GRFATR_ROTATION(133); -constexpr TypedWhichId<SwLuminanceGrf> RES_GRFATR_LUMINANCE(134); -constexpr TypedWhichId<SwContrastGrf> RES_GRFATR_CONTRAST(135); -constexpr TypedWhichId<SwChannelRGrf> RES_GRFATR_CHANNELR(136); -constexpr TypedWhichId<SwChannelGGrf> RES_GRFATR_CHANNELG(137); -constexpr TypedWhichId<SwChannelBGrf> RES_GRFATR_CHANNELB(138); -constexpr TypedWhichId<SwGammaGrf> RES_GRFATR_GAMMA(139); -constexpr TypedWhichId<SwInvertGrf> RES_GRFATR_INVERT(140); -constexpr TypedWhichId<SwTransparencyGrf> RES_GRFATR_TRANSPARENCY(141); -constexpr TypedWhichId<SwDrawModeGrf> RES_GRFATR_DRAWMODE(142); - -constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY1(143); -constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY2(144); -constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY3(145); -constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY4(146); -constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY5(147); -constexpr sal_uInt16 RES_GRFATR_END(148); +constexpr TypedWhichId<SwMirrorGrf> RES_GRFATR_MIRRORGRF(RES_GRFATR_BEGIN); // 132 +constexpr TypedWhichId<SwCropGrf> RES_GRFATR_CROPGRF(133); + +constexpr TypedWhichId<SwRotationGrf> RES_GRFATR_ROTATION(134); +constexpr TypedWhichId<SwLuminanceGrf> RES_GRFATR_LUMINANCE(135); +constexpr TypedWhichId<SwContrastGrf> RES_GRFATR_CONTRAST(136); +constexpr TypedWhichId<SwChannelRGrf> RES_GRFATR_CHANNELR(137); +constexpr TypedWhichId<SwChannelGGrf> RES_GRFATR_CHANNELG(138); +constexpr TypedWhichId<SwChannelBGrf> RES_GRFATR_CHANNELB(139); +constexpr TypedWhichId<SwGammaGrf> RES_GRFATR_GAMMA(140); +constexpr TypedWhichId<SwInvertGrf> RES_GRFATR_INVERT(141); +constexpr TypedWhichId<SwTransparencyGrf> RES_GRFATR_TRANSPARENCY(142); +constexpr TypedWhichId<SwDrawModeGrf> RES_GRFATR_DRAWMODE(143); + +constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY1(144); +constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY2(145); +constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY3(146); +constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY4(147); +constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY5(148); +constexpr sal_uInt16 RES_GRFATR_END(149); constexpr sal_uInt16 RES_BOXATR_BEGIN(RES_GRFATR_END); -constexpr TypedWhichId<SwTableBoxNumFormat> RES_BOXATR_FORMAT(RES_BOXATR_BEGIN); // 148 -constexpr TypedWhichId<SwTableBoxFormula> RES_BOXATR_FORMULA(149); -constexpr TypedWhichId<SwTableBoxValue> RES_BOXATR_VALUE(150); -constexpr sal_uInt16 RES_BOXATR_END(151); +constexpr TypedWhichId<SwTableBoxNumFormat> RES_BOXATR_FORMAT(RES_BOXATR_BEGIN); // 149 +constexpr TypedWhichId<SwTableBoxFormula> RES_BOXATR_FORMULA(150); +constexpr TypedWhichId<SwTableBoxValue> RES_BOXATR_VALUE(151); +constexpr sal_uInt16 RES_BOXATR_END(152); constexpr sal_uInt16 RES_UNKNOWNATR_BEGIN(RES_BOXATR_END); constexpr TypedWhichId<SvXMLAttrContainerItem> - RES_UNKNOWNATR_CONTAINER(RES_UNKNOWNATR_BEGIN); // 151 -constexpr sal_uInt16 RES_UNKNOWNATR_END(152); + RES_UNKNOWNATR_CONTAINER(RES_UNKNOWNATR_BEGIN); // 152 +constexpr sal_uInt16 RES_UNKNOWNATR_END(153); constexpr sal_uInt16 POOLATTR_END(RES_UNKNOWNATR_END); // Format IDs constexpr sal_uInt16 RES_FMT_BEGIN(RES_UNKNOWNATR_END); -constexpr TypedWhichId<SwCharFormat> RES_CHRFMT(RES_FMT_BEGIN); // 152 -constexpr TypedWhichId<SwFrameFormat> RES_FRMFMT(153); -constexpr TypedWhichId<SwFlyFrameFormat> RES_FLYFRMFMT(154); -constexpr TypedWhichId<SwTextFormatColl> RES_TXTFMTCOLL(155); -constexpr TypedWhichId<SwGrfFormatColl> RES_GRFFMTCOLL(156); -constexpr TypedWhichId<SwDrawFrameFormat> RES_DRAWFRMFMT(157); -constexpr TypedWhichId<SwConditionTextFormatColl> RES_CONDTXTFMTCOLL(158); -constexpr sal_uInt16 RES_FMT_END(159); +constexpr TypedWhichId<SwCharFormat> RES_CHRFMT(RES_FMT_BEGIN); // 153 +constexpr TypedWhichId<SwFrameFormat> RES_FRMFMT(154); +constexpr TypedWhichId<SwFlyFrameFormat> RES_FLYFRMFMT(155); +constexpr TypedWhichId<SwTextFormatColl> RES_TXTFMTCOLL(156); +constexpr TypedWhichId<SwGrfFormatColl> RES_GRFFMTCOLL(157); +constexpr TypedWhichId<SwDrawFrameFormat> RES_DRAWFRMFMT(158); +constexpr TypedWhichId<SwConditionTextFormatColl> RES_CONDTXTFMTCOLL(159); +constexpr sal_uInt16 RES_FMT_END(160); // ID's for Messages in the Formats constexpr sal_uInt16 RES_MSG_BEGIN(RES_FMT_END); -constexpr TypedWhichId<SwPtrMsgPoolItem> RES_OBJECTDYING(RES_MSG_BEGIN); // 159 -constexpr TypedWhichId<SwFormatChg> RES_FMT_CHG(160); -constexpr TypedWhichId<SwAttrSetChg> RES_ATTRSET_CHG(161); -constexpr TypedWhichId<SwInsText> RES_INS_TXT(162); -constexpr TypedWhichId<SwDelChr> RES_DEL_CHR(163); -constexpr TypedWhichId<SwDelText> RES_DEL_TXT(164); -constexpr TypedWhichId<SwUpdateAttr> RES_UPDATE_ATTR(165); -constexpr TypedWhichId<SwRefMarkFieldUpdate> RES_REFMARKFLD_UPDATE(166); -constexpr TypedWhichId<SwDocPosUpdate> RES_DOCPOS_UPDATE(167); -constexpr TypedWhichId<SwTableFormulaUpdate> RES_TABLEFML_UPDATE(168); -constexpr TypedWhichId<SwMsgPoolItem> RES_UPDATEDDETBL(169); -constexpr TypedWhichId<SwMsgPoolItem> RES_TBLHEADLINECHG(170); -constexpr TypedWhichId<SwAutoFormatGetDocNode> RES_AUTOFMT_DOCNODE(171); -constexpr TypedWhichId<SwMsgPoolItem> RES_SECTION_HIDDEN(172); -constexpr TypedWhichId<SwMsgPoolItem> RES_SECTION_NOT_HIDDEN(173); -constexpr TypedWhichId<SwMsgPoolItem> RES_GRAPHIC_PIECE_ARRIVED(175); -constexpr TypedWhichId<SwMsgPoolItem> RES_HIDDENPARA_PRINT(176); -constexpr TypedWhichId<SwVirtPageNumInfo> RES_VIRTPAGENUM_INFO(178); -constexpr TypedWhichId<SwPtrMsgPoolItem> RES_REMOVE_UNO_OBJECT(179); +constexpr TypedWhichId<SwPtrMsgPoolItem> RES_OBJECTDYING(RES_MSG_BEGIN); // 160 +constexpr TypedWhichId<SwFormatChg> RES_FMT_CHG(161); +constexpr TypedWhichId<SwAttrSetChg> RES_ATTRSET_CHG(162); +constexpr TypedWhichId<SwInsText> RES_INS_TXT(163); +constexpr TypedWhichId<SwDelChr> RES_DEL_CHR(164); +constexpr TypedWhichId<SwDelText> RES_DEL_TXT(165); +constexpr TypedWhichId<SwUpdateAttr> RES_UPDATE_ATTR(166); +constexpr TypedWhichId<SwRefMarkFieldUpdate> RES_REFMARKFLD_UPDATE(167); +constexpr TypedWhichId<SwDocPosUpdate> RES_DOCPOS_UPDATE(168); +constexpr TypedWhichId<SwTableFormulaUpdate> RES_TABLEFML_UPDATE(169); +constexpr TypedWhichId<SwMsgPoolItem> RES_UPDATEDDETBL(170); +constexpr TypedWhichId<SwMsgPoolItem> RES_TBLHEADLINECHG(171); +constexpr TypedWhichId<SwAutoFormatGetDocNode> RES_AUTOFMT_DOCNODE(172); +constexpr TypedWhichId<SwMsgPoolItem> RES_SECTION_HIDDEN(173); +constexpr TypedWhichId<SwMsgPoolItem> RES_SECTION_NOT_HIDDEN(174); +constexpr TypedWhichId<SwMsgPoolItem> RES_GRAPHIC_PIECE_ARRIVED(176); +constexpr TypedWhichId<SwMsgPoolItem> RES_HIDDENPARA_PRINT(177); +constexpr TypedWhichId<SwVirtPageNumInfo> RES_VIRTPAGENUM_INFO(179); +constexpr TypedWhichId<SwPtrMsgPoolItem> RES_REMOVE_UNO_OBJECT(180); // empty -constexpr TypedWhichId<SwFindNearestNode> RES_FINDNEARESTNODE(182); -constexpr TypedWhichId<SwPtrMsgPoolItem> RES_CONTENT_VISIBLE(183); -constexpr TypedWhichId<SwMsgPoolItem> RES_GRAPHIC_SWAPIN(184); -constexpr TypedWhichId<SwStringMsgPoolItem> RES_NAME_CHANGED(185); -constexpr TypedWhichId<SwStringMsgPoolItem> RES_TITLE_CHANGED(186); -constexpr TypedWhichId<SwStringMsgPoolItem> RES_DESCRIPTION_CHANGED(187); -constexpr TypedWhichId<SwMsgPoolItem> RES_LINKED_GRAPHIC_STREAM_ARRIVED(187); -constexpr sal_uInt16 RES_MSG_END(188); +constexpr TypedWhichId<SwFindNearestNode> RES_FINDNEARESTNODE(183); +constexpr TypedWhichId<SwPtrMsgPoolItem> RES_CONTENT_VISIBLE(184); +constexpr TypedWhichId<SwMsgPoolItem> RES_GRAPHIC_SWAPIN(185); +constexpr TypedWhichId<SwStringMsgPoolItem> RES_NAME_CHANGED(186); +constexpr TypedWhichId<SwStringMsgPoolItem> RES_TITLE_CHANGED(187); +constexpr TypedWhichId<SwStringMsgPoolItem> RES_DESCRIPTION_CHANGED(188); +constexpr TypedWhichId<SwMsgPoolItem> RES_LINKED_GRAPHIC_STREAM_ARRIVED(188); +constexpr sal_uInt16 RES_MSG_END(189); // An ID for the RTF-reader. The stylesheets are treated like attributes, // i.e. there is a StyleSheet-attribute. To avoid collision with other @@ -446,13 +447,13 @@ constexpr sal_uInt16 RES_MSG_END(188); // new attributes!) constexpr sal_uInt16 RES_FLTRATTR_BEGIN(RES_MSG_END); constexpr TypedWhichId<SfxStringItem> RES_FLTR_BOOKMARK(RES_FLTRATTR_BEGIN); -constexpr TypedWhichId<SwFltAnchor> RES_FLTR_ANCHOR(189); -constexpr TypedWhichId<SfxStringItem> RES_FLTR_NUMRULE(190); -constexpr TypedWhichId<SwFltTOX> RES_FLTR_TOX(191); -constexpr TypedWhichId<SwFltRedline> RES_FLTR_REDLINE(192); -constexpr TypedWhichId<CntUInt16Item> RES_FLTR_ANNOTATIONMARK(193); -constexpr TypedWhichId<SwFltRDFMark> RES_FLTR_RDFMARK(194); -constexpr sal_uInt16 RES_FLTRATTR_END(195); +constexpr TypedWhichId<SwFltAnchor> RES_FLTR_ANCHOR(190); +constexpr TypedWhichId<SfxStringItem> RES_FLTR_NUMRULE(191); +constexpr TypedWhichId<SwFltTOX> RES_FLTR_TOX(192); +constexpr TypedWhichId<SwFltRedline> RES_FLTR_REDLINE(193); +constexpr TypedWhichId<CntUInt16Item> RES_FLTR_ANNOTATIONMARK(194); +constexpr TypedWhichId<SwFltRDFMark> RES_FLTR_RDFMARK(195); +constexpr sal_uInt16 RES_FLTRATTR_END(196); constexpr sal_uInt16 RES_TBX_DUMMY(RES_FLTRATTR_END + 1); |