diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-01-28 15:17:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-01-29 18:59:53 +0100 |
| commit | c3d5c9a08df77f9c0d0fd2493cf299dbad1a9dff (patch) | |
| tree | f448517b6031741ab182685f3cf8ee332deac2f4 /reportdesign | |
| parent | 58c849a94234f18eac020be66117aa2378487e2f (diff) | |
used TypedWhichId in the constructor of various svx *Item classes
to act as an extra check that we have the association of Item and
TypedWhichId annotations correct.
(*) requires that I add an upcasting constructor to TypedWhichId
(*) Make the field dialog stuff in writer use a new item id
FN_FIELD_DIALOG_DOC_PROPS instead of abusing the
existing SID_DOCINFO
Change-Id: Ica4aea930c80124609a063768c9af5a189df1c27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129098
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/misc/UITools.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 243474ac39de..6440b37878ce 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -139,7 +139,7 @@ #define ITEMID_ESCAPEMENT XATTR_FILL_LAST + 14 #define ITEMID_FONTLIST XATTR_FILL_LAST + 15 #define ITEMID_AUTOKERN XATTR_FILL_LAST + 16 -#define ITEMID_COLOR_TABLE XATTR_FILL_LAST + 17 +#define ITEMID_COLOR_TABLE TypedWhichId<SvxColorListItem>(XATTR_FILL_LAST + 17) #define ITEMID_BLINK XATTR_FILL_LAST + 18 #define ITEMID_EMPHASISMARK XATTR_FILL_LAST + 19 #define ITEMID_TWOLINES XATTR_FILL_LAST + 20 diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 9e1df7251c9d..b845623ed0fa 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -144,7 +144,7 @@ #define RPTUI_ID_LRSPACE XATTR_FILL_FIRST - 8 #define RPTUI_ID_ULSPACE XATTR_FILL_FIRST - 7 -#define RPTUI_ID_PAGE XATTR_FILL_FIRST - 6 +#define RPTUI_ID_PAGE TypedWhichId<SvxPageItem>(XATTR_FILL_FIRST - 6) #define RPTUI_ID_SIZE XATTR_FILL_FIRST - 5 #define RPTUI_ID_PAGE_MODE XATTR_FILL_FIRST - 4 #define RPTUI_ID_START XATTR_FILL_FIRST - 3 |