diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-05 12:58:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-02-05 16:43:15 +0100 |
| commit | 96335019cdd7f7e611c29206eb9706556dd53c78 (patch) | |
| tree | 342d28a9097df2dad924395d0c3f81dcc7f440f3 /include | |
| parent | 5090d575117fbe6ced75dc45c514f8d990523251 (diff) | |
fix ubsan after "TypedWhichId in svx part 1"
<sberg> noelgrandin, SID_ATTR_PAGE_EXT1 is used both as an SfxBoolItem
(e.g., sd/source/ui/func/fupage.cxx) and as an SfxStringItem (e.g.,
sw/source/uibase/utlui/uitool.cxx)
commit 24158311c115c2db6dd05a751f75a5c084e2c0d1
Author: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Wed Dec 20 13:30:21 2017 +0200
TypedWhichId in svx part 1
Change-Id: If4e75470449d8f967f5f6818067edd7c24bc19a1
Reviewed-on: https://gerrit.libreoffice.org/49230
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svxids.hrc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 93946c20a892..1d455dcef735 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -207,7 +207,8 @@ class SvxLineItem; #define SID_ATTR_PAGE_MAXSIZE TypedWhichId<SvxSizeItem>( SID_SVX_START + 52 ) #define SID_ATTR_PAGE_ORIENTATION TypedWhichId<SvxPageItem>( SID_SVX_START + 53 ) #define SID_ATTR_PAGE_PAPERBIN TypedWhichId<SvxPaperBinItem>( SID_SVX_START + 54 ) -#define SID_ATTR_PAGE_EXT1 TypedWhichId<SfxBoolItem>( SID_SVX_START + 55 ) +// this is used both as a SfxBoolItem(sd/source/ui/func/fupage.cxx) and as a SfxStringItem(sw/source/uibase/utlui/uitool.cxx) +#define SID_ATTR_PAGE_EXT1 ( SID_SVX_START + 55 ) #define SID_ATTR_PAGE_EXT2 TypedWhichId<SfxBoolItem>( SID_SVX_START + 56 ) #define SID_ATTR_PAGE_HEADERSET TypedWhichId<SvxSetItem>( SID_SVX_START + 57 ) #define SID_ATTR_PAGE_FOOTERSET TypedWhichId<SvxSetItem>( SID_SVX_START + 58 ) |