From 5315e6069e425aad88873beb5344bb8ea31e0c55 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 26 May 2023 11:18:17 +0200 Subject: use more TypedWhichId which flushed out an inconsistency in how SID_NUMBER_TYPE_FORMAT was being used Change-Id: Ib59ae4c4950136703d18d7485db432a39e3dc39c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152300 Tested-by: Noel Grandin Reviewed-by: Noel Grandin --- include/editeng/charrotateitem.hxx | 4 ++-- include/editeng/charscaleitem.hxx | 2 +- include/editeng/editids.hrc | 4 ++-- include/editeng/emphasismarkitem.hxx | 2 +- include/editeng/paravertalignitem.hxx | 3 +-- include/editeng/writingmodeitem.hxx | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) (limited to 'include/editeng') diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx index 49fb3f345bb3..d8a773065575 100644 --- a/include/editeng/charrotateitem.hxx +++ b/include/editeng/charrotateitem.hxx @@ -35,7 +35,7 @@ class EDITENG_DLLPUBLIC SvxTextRotateItem : public SfxUInt16Item { public: - SvxTextRotateItem(Degree10 nValue, const sal_uInt16 nId); + SvxTextRotateItem(Degree10 nValue, TypedWhichId nId); virtual SvxTextRotateItem* Clone(SfxItemPool *pPool = nullptr) const override; @@ -81,7 +81,7 @@ public: SvxCharRotateItem( Degree10 nValue /*= 0*/, bool bFitIntoLine /*= false*/, - const sal_uInt16 nId ); + TypedWhichId nId ); virtual SvxCharRotateItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx index fff4fa8efae9..7e5025fb37f7 100644 --- a/include/editeng/charscaleitem.hxx +++ b/include/editeng/charscaleitem.hxx @@ -38,7 +38,7 @@ public: static SfxPoolItem* CreateDefault(); SvxCharScaleWidthItem( sal_uInt16 nValue /*= 100*/, - const sal_uInt16 nId ); + TypedWhichId nId ); virtual SvxCharScaleWidthItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc index f33972743aa0..9ff4884fbcbc 100644 --- a/include/editeng/editids.hrc +++ b/include/editeng/editids.hrc @@ -128,7 +128,7 @@ class SvxWordLineModeItem; #define SID_ATTR_PARA_OUTLLEVEL TypedWhichId( SID_SVX_START + 300 ) #define SID_FIELD ( SID_SVX_START + 363 ) // related to EE_FEATURE_FIELD #define SID_ATTR_PARA_REGISTER ( SID_SVX_START + 413 ) -#define SID_ATTR_PARA_PAGENUM ( SID_SVX_START + 457 ) +#define SID_ATTR_PARA_PAGENUM TypedWhichId( SID_SVX_START + 457 ) #define SID_ATTR_PARA_NUMRULE ( SID_SVX_START + 587 ) #define SID_ATTR_BRUSH_CHAR TypedWhichId( SID_SVX_START + 591 ) #define SID_ATTR_NUMBERING_RULE TypedWhichId( SID_SVX_START + 855 ) @@ -152,7 +152,7 @@ class SvxWordLineModeItem; #define SID_ATTR_CHAR_VERTICAL ( SID_SVX_START + 905 ) #define SID_ATTR_CHAR_ROTATED TypedWhichId( SID_SVX_START + 910 ) #define SID_ATTR_CHAR_SCALEWIDTH TypedWhichId( SID_SVX_START + 911 ) -#define SID_ATTR_CHAR_WIDTH_FIT_TO_LINE ( SID_SVX_START + 919 ) +#define SID_ATTR_CHAR_WIDTH_FIT_TO_LINE TypedWhichId( SID_SVX_START + 919 ) #define SID_ATTR_CHAR_RELIEF TypedWhichId( SID_SVX_START + 920 ) #define SID_PARA_VERTALIGN TypedWhichId( SID_SVX_START + 925 ) #define SID_ATTR_FRAMEDIRECTION TypedWhichId( SID_SVX_START + 944 ) diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx index f54c857353c9..e0fd74cf4400 100644 --- a/include/editeng/emphasismarkitem.hxx +++ b/include/editeng/emphasismarkitem.hxx @@ -36,7 +36,7 @@ public: static SfxPoolItem* CreateDefault(); SvxEmphasisMarkItem( const FontEmphasisMark eVal /*= FontEmphasisMark::NONE*/, - const sal_uInt16 nId ); + TypedWhichId nId ); // "pure virtual Methods" from SfxPoolItem + SfxEnumItem virtual bool GetPresentation( SfxItemPresentation ePres, diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx index 335b15f3769b..c58274b8fe16 100644 --- a/include/editeng/paravertalignitem.hxx +++ b/include/editeng/paravertalignitem.hxx @@ -37,8 +37,7 @@ public: enum class Align { Automatic, Baseline, Top, Center, Bottom }; static SfxPoolItem* CreateDefault(); - SvxParaVertAlignItem( Align nValue /*= 0*/, - const sal_uInt16 nId ); + SvxParaVertAlignItem( Align nValue /*= 0*/, TypedWhichId nId ); virtual SvxParaVertAlignItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx index f9e116d76897..d01be0e41495 100644 --- a/include/editeng/writingmodeitem.hxx +++ b/include/editeng/writingmodeitem.hxx @@ -29,7 +29,7 @@ class EDITENG_DLLPUBLIC SvxWritingModeItem final : public SfxUInt16Item { public: SvxWritingModeItem( css::text::WritingMode eValue /*= css::text::WritingMode_LR_TB*/, - sal_uInt16 nWhich /*= SDRATTR_TEXTDIRECTION*/ ); + TypedWhichId nWhich /*= SDRATTR_TEXTDIRECTION*/ ); virtual ~SvxWritingModeItem() override; SvxWritingModeItem(SvxWritingModeItem const &) = default; -- cgit