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>

26 files changed, 71 insertions, 69 deletions

diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx
index 9b8b11049539..caf0c4551567 100644
--- a/include/svx/SmartTagItem.hxx
+++ b/include/svx/SmartTagItem.hxx
@@ -50,7 +50,7 @@ class SVX_DLLPUBLIC SvxSmartTagItem final : public SfxPoolItem
 public:
     static SfxPoolItem* CreateDefault();
 
-    SvxSmartTagItem( const sal_uInt16 nId,
+    SvxSmartTagItem( const TypedWhichId<SvxSmartTagItem> nId,
                      const css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > >& rActionComponentsSequence,
                      const css::uno::Sequence < css::uno::Sequence< sal_Int32 > >& rActionIndicesSequence,
                      const css::uno::Sequence< css::uno::Reference< css::container::XStringKeyMap > >& rStringKeyMaps,
diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index c778735436ee..d0245403360d 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -35,11 +35,11 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxOrientationItem final : public SfxEnumIte
 public:
     SvxOrientationItem(
         const SvxCellOrientation eOrientation,
-        const sal_uInt16 nId );
+        const TypedWhichId<SvxOrientationItem> nId );
 
     SvxOrientationItem(
         Degree100 nRotation, bool bStacked,
-        const sal_uInt16 nId );
+        const TypedWhichId<SvxOrientationItem> nId );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
                                   MapUnit eCoreMetric,
@@ -67,10 +67,10 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxMarginItem final : public SfxPoolItem
     sal_Int16       nBottomMargin;
 public:
     static SfxPoolItem* CreateDefault();
-    SvxMarginItem( const sal_uInt16 nId  );
+    SvxMarginItem( const TypedWhichId<SvxMarginItem> nId  );
     SvxMarginItem( sal_Int16 nLeft, sal_Int16 nTop /*= 0*/,
                    sal_Int16 nRight /*= 0*/, sal_Int16 nBottom /*= 0*/,
-                   const sal_uInt16 nId  );
+                   const TypedWhichId<SvxMarginItem> nId  );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
                                   MapUnit eCoreMetric,
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index cb18efa0ad33..a8910845d4a9 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -81,7 +81,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxChartRegressItem final : public SfxEn
 {
 public:
     SvxChartRegressItem(SvxChartRegress eRegress /*= SvxChartRegress::Linear*/,
-                        sal_uInt16 nId );
+                        TypedWhichId<SvxChartRegressItem> nId );
 
     virtual SvxChartRegressItem* Clone(SfxItemPool* pPool = nullptr) const override;
 
@@ -92,7 +92,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxChartTextOrderItem final : public Sfx
 {
 public:
     SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= SvxChartTextOrder::SideBySide*/,
-                          sal_uInt16 nId );
+                          TypedWhichId<SvxChartTextOrderItem> nId );
 
     virtual SvxChartTextOrderItem* Clone(SfxItemPool* pPool = nullptr) const override;
 
@@ -106,7 +106,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxChartKindErrorItem final : public Sfx
 {
 public:
     SvxChartKindErrorItem(SvxChartKindError /*eOrient = SvxChartKindError::NONE*/,
-                           sal_uInt16 nId );
+                           TypedWhichId<SvxChartKindErrorItem> nId );
 
     virtual SvxChartKindErrorItem* Clone(SfxItemPool* pPool = nullptr) const override;
 
@@ -117,7 +117,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxChartIndicateItem final : public SfxE
 {
 public:
     SvxChartIndicateItem(SvxChartIndicate eOrient /*= SvxChartIndicate::NONE*/,
-                           sal_uInt16 nId );
+                           TypedWhichId<SvxChartIndicateItem> nId );
 
     virtual SvxChartIndicateItem* Clone(SfxItemPool* pPool = nullptr) const override;
 
@@ -130,7 +130,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxDoubleItem final : public SfxPoolItem
 
 public:
     static SfxPoolItem* CreateDefault();
-    SvxDoubleItem(double fValue /*= 0.0*/, sal_uInt16 nId );
+    SvxDoubleItem(double fValue /*= 0.0*/, TypedWhichId<SvxDoubleItem> nId );
     SvxDoubleItem(const SvxDoubleItem& rItem);
 
     virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx
index f2fe10aceb59..eb87aecbbb60 100644
--- a/include/svx/clipfmtitem.hxx
+++ b/include/svx/clipfmtitem.hxx
@@ -38,7 +38,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxClipboardFormatItem final : public Sf
 
 public:
     static SfxPoolItem* CreateDefault();
-    SvxClipboardFormatItem(sal_uInt16 nId);
+    SvxClipboardFormatItem(TypedWhichId<SvxClipboardFormatItem> nId);
     SvxClipboardFormatItem(const SvxClipboardFormatItem&);
     virtual ~SvxClipboardFormatItem() override;
 
diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx
index 21a7d334fc66..d40848c53c36 100644
--- a/include/svx/drawitem.hxx
+++ b/include/svx/drawitem.hxx
@@ -32,7 +32,7 @@ public:
 
                             SvxColorListItem();
                             SvxColorListItem( XColorListRef const & pTable,
-                                    sal_uInt16 nWhich  );
+                                    TypedWhichId<SvxColorListItem> nWhich  );
                             SvxColorListItem( const SvxColorListItem& );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
@@ -57,7 +57,7 @@ public:
 
                             SvxGradientListItem();
                             SvxGradientListItem( XGradientListRef const & pList,
-                                    sal_uInt16 nWhich  );
+                                    TypedWhichId<SvxGradientListItem> nWhich  );
                             SvxGradientListItem( const SvxGradientListItem& );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
@@ -81,7 +81,7 @@ public:
                             static SfxPoolItem* CreateDefault();
                             SvxHatchListItem();
                             SvxHatchListItem( XHatchListRef const & pList,
-                                    sal_uInt16 nWhich  );
+                                    TypedWhichId<SvxHatchListItem> nWhich  );
                             SvxHatchListItem( const SvxHatchListItem& );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
@@ -106,7 +106,7 @@ public:
 
                             SvxBitmapListItem();
                             SvxBitmapListItem( XBitmapListRef const & pBL,
-                                    sal_uInt16 nWhich  );
+                                    TypedWhichId<SvxBitmapListItem> nWhich  );
                             SvxBitmapListItem( const SvxBitmapListItem& );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
@@ -131,7 +131,7 @@ public:
 
                             SvxPatternListItem();
                             SvxPatternListItem( XPatternListRef const & pBL,
-                                   sal_uInt16 nWhich   );
+                                   TypedWhichId<SvxPatternListItem> nWhich   );
                             SvxPatternListItem( const SvxPatternListItem& );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
@@ -155,7 +155,7 @@ public:
 
                             SvxDashListItem();
                             SvxDashListItem( XDashListRef const & pList,
-                                    sal_uInt16 nWhich  );
+                                    TypedWhichId<SvxDashListItem> nWhich  );
                             SvxDashListItem( const SvxDashListItem& );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
@@ -180,7 +180,7 @@ public:
 
                             SvxLineEndListItem();
                             SvxLineEndListItem( XLineEndListRef const & pList,
-                                    sal_uInt16 nWhich  );
+                                    TypedWhichId<SvxLineEndListItem> nWhich  );
                             SvxLineEndListItem( const SvxLineEndListItem& );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx
index 29e7636e64da..3a8ad16902fd 100644
--- a/include/svx/e3ditem.hxx
+++ b/include/svx/e3ditem.hxx
@@ -29,7 +29,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxB3DVectorItem final : public SfxPoolI
     basegfx::B3DVector  aVal;
 
 public:
-                            SvxB3DVectorItem( sal_uInt16 nWhich, const basegfx::B3DVector& rVal );
+                            SvxB3DVectorItem( TypedWhichId<SvxB3DVectorItem> nWhich, const basegfx::B3DVector& rVal );
                             SvxB3DVectorItem( const SvxB3DVectorItem& );
                             virtual ~SvxB3DVectorItem() override;
 
diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx
index b24aa9c0a19b..de0cfef5b976 100644
--- a/include/svx/grfcrop.hxx
+++ b/include/svx/grfcrop.hxx
@@ -30,10 +30,10 @@ class SVXCORE_DLLPUBLIC SvxGrfCrop : public SfxPoolItem
 {
     sal_Int32   nLeft, nRight, nTop, nBottom;
 public:
-    SvxGrfCrop( sal_uInt16  );
+    SvxGrfCrop( TypedWhichId<SvxGrfCrop>  );
     SvxGrfCrop( sal_Int32 nLeft,    sal_Int32 nRight,
                 sal_Int32 nTop,     sal_Int32 nBottom,
-                sal_uInt16  );
+                TypedWhichId<SvxGrfCrop>  );
     virtual ~SvxGrfCrop() override;
 
     SvxGrfCrop(SvxGrfCrop const &) = default;
diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index 5d6ac5689401..a129cc720ed1 100644
--- a/include/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
@@ -60,10 +60,10 @@ class SVX_DLLPUBLIC SvxHyperlinkItem final : public SfxPoolItem
 public:
     static SfxPoolItem* CreateDefault();
 
-    SvxHyperlinkItem( sal_uInt16 _nWhich = SID_HYPERLINK_GETLINK ):
+    SvxHyperlinkItem( TypedWhichId<SvxHyperlinkItem> _nWhich = SID_HYPERLINK_GETLINK ):
                 SfxPoolItem(_nWhich) { eType = HLINK_DEFAULT; nMacroEvents=HyperDialogEvent::NONE; };
     SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem );
-    SvxHyperlinkItem( sal_uInt16 nWhich, const OUString& rName, const OUString& rURL,
+    SvxHyperlinkItem( TypedWhichId<SvxHyperlinkItem> nWhich, const OUString& rName, const OUString& rURL,
                                     const OUString& rTarget, const OUString& rIntName,
                                     SvxLinkInsertMode eTyp,
                                     HyperDialogEvent nEvents,
diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx
index ef1219988e04..4d4b07478a41 100644
--- a/include/svx/numinf.hxx
+++ b/include/svx/numinf.hxx
@@ -30,16 +30,16 @@ class SVX_DLLPUBLIC SvxNumberInfoItem final : public SfxPoolItem
 {
 public:
 
-    SvxNumberInfoItem( const sal_uInt16 nId  );
+    SvxNumberInfoItem( const TypedWhichId<SvxNumberInfoItem> nId  );
     SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
-                       const sal_uInt16 nId  );
+                       const TypedWhichId<SvxNumberInfoItem> nId  );
     SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const OUString& rVal,
-                       const sal_uInt16 nId  );
+                       const TypedWhichId<SvxNumberInfoItem> nId  );
     SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal,
-                       const sal_uInt16 nId  );
+                       const TypedWhichId<SvxNumberInfoItem> nId  );
     // if both double and String are supplied, String is used for text formats
     SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal,
-                       const OUString& rValueStr, const sal_uInt16 nId );
+                       const OUString& rValueStr, const TypedWhichId<SvxNumberInfoItem> nId );
     SvxNumberInfoItem( const SvxNumberInfoItem& );
     virtual ~SvxNumberInfoItem() override;
 
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 1b86834ee8c8..97ec7a228e54 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -74,7 +74,7 @@ class SVX_DLLPUBLIC SvxGridItem : public SvxOptionsGrid, public SfxPoolItem
     friend class SvxGridTabPage;
 
 public:
-    SvxGridItem( sal_uInt16 _nWhich) : SfxPoolItem(_nWhich){};
+    SvxGridItem( TypedWhichId<SvxGridItem> _nWhich) : SfxPoolItem(_nWhich){};
 
     virtual SvxGridItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool            operator==( const SfxPoolItem& ) const override;
diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx
index 9b3fadc6146c..32702fe8089f 100644
--- a/include/svx/pageitem.hxx
+++ b/include/svx/pageitem.hxx
@@ -58,7 +58,7 @@ private:
 public:
 
     static SfxPoolItem* CreateDefault();
-    SvxPageItem( const sal_uInt16 nId );
+    SvxPageItem( const TypedWhichId<SvxPageItem> nId );
     SvxPageItem( const SvxPageItem& rItem );
 
     virtual ~SvxPageItem() override;
@@ -97,9 +97,9 @@ public:
 class SVX_DLLPUBLIC SvxSetItem final : public SfxSetItem
 {
 public:
-    SvxSetItem( const sal_uInt16 nId, const SfxItemSet& rSet );
+    SvxSetItem( const TypedWhichId<SvxSetItem> nId, const SfxItemSet& rSet );
     SvxSetItem( const SvxSetItem& rItem );
-    SvxSetItem( const sal_uInt16 nId, SfxItemSet&& pSet );
+    SvxSetItem( const TypedWhichId<SvxSetItem> nId, SfxItemSet&& pSet );
 
     virtual SvxSetItem* Clone( SfxItemPool *pPool = nullptr ) const override;
 
diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx
index 2ff44c84b344..af980a3e5b9e 100644
--- a/include/svx/postattr.hxx
+++ b/include/svx/postattr.hxx
@@ -30,9 +30,9 @@ class SVX_DLLPUBLIC SvxPostItAuthorItem final : public SfxStringItem
 public:
     static SfxPoolItem* CreateDefault();
 
-    SvxPostItAuthorItem( sal_uInt16 nWhich  );
+    SvxPostItAuthorItem( TypedWhichId<SvxPostItAuthorItem> nWhich  );
 
-    SvxPostItAuthorItem( const OUString& rAuthor, sal_uInt16 nWhich  );
+    SvxPostItAuthorItem( const OUString& rAuthor, TypedWhichId<SvxPostItAuthorItem> nWhich  );
     virtual bool GetPresentation( SfxItemPresentation ePres,
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
@@ -50,9 +50,9 @@ class SVX_DLLPUBLIC SvxPostItDateItem final : public SfxStringItem
 public:
     static SfxPoolItem* CreateDefault();
 
-    SvxPostItDateItem( sal_uInt16 nWhich  );
+    SvxPostItDateItem( TypedWhichId<SvxPostItDateItem> nWhich  );
 
-    SvxPostItDateItem( const OUString& rDate, sal_uInt16 nWhich  );
+    SvxPostItDateItem( const OUString& rDate, TypedWhichId<SvxPostItDateItem> nWhich  );
     virtual bool GetPresentation( SfxItemPresentation ePres,
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
@@ -69,9 +69,9 @@ class SVX_DLLPUBLIC SvxPostItTextItem final : public SfxStringItem
 public:
     static SfxPoolItem* CreateDefault();
 
-    SvxPostItTextItem( sal_uInt16 nWhich  );
+    SvxPostItTextItem( TypedWhichId<SvxPostItTextItem> nWhich  );
 
-    SvxPostItTextItem( const OUString& rText, sal_uInt16 nWhich  );
+    SvxPostItTextItem( const OUString& rText, TypedWhichId<SvxPostItTextItem> nWhich  );
     // "pure virtual methods" from SfxPoolItem
     virtual bool GetPresentation( SfxItemPresentation ePres,
                                   MapUnit eCoreMetric,
@@ -90,7 +90,7 @@ class SVX_DLLPUBLIC SvxPostItIdItem final : public SfxStringItem
 public:
     static SfxPoolItem* CreateDefault();
 
-    SvxPostItIdItem( sal_uInt16 nWhich );
+    SvxPostItIdItem( TypedWhichId<SvxPostItIdItem>  nWhich );
 
     virtual SvxPostItIdItem* Clone( SfxItemPool *pPool = nullptr ) const override;
 };
diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx
index 0c2e6bfb50aa..fa8510e5079f 100644
--- a/include/svx/rotmodit.hxx
+++ b/include/svx/rotmodit.hxx
@@ -39,7 +39,7 @@ class SVX_DLLPUBLIC SvxRotateModeItem final : public SfxEnumItem<SvxRotateMode>
 public:
                 static SfxPoolItem* CreateDefault();
 
-                SvxRotateModeItem( SvxRotateMode eMode, sal_uInt16 nWhich);
+                SvxRotateModeItem( SvxRotateMode eMode, TypedWhichId<SvxRotateModeItem> nWhich);
                 SvxRotateModeItem( const SvxRotateModeItem& rItem );
                 virtual ~SvxRotateModeItem() override;
 
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index 9d24ecd6088d..a5600a6588c4 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -44,7 +44,7 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem final : public SfxPoolItem
 
 public:
     static SfxPoolItem* CreateDefault();
-    SvxLongLRSpaceItem(tools::Long lLeft, tools::Long lRight, sal_uInt16 nId);
+    SvxLongLRSpaceItem(tools::Long lLeft, tools::Long lRight, TypedWhichId<SvxLongLRSpaceItem> nId);
     SvxLongLRSpaceItem();
     SvxLongLRSpaceItem(SvxLongLRSpaceItem const &) = default;
 
@@ -74,7 +74,7 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem final : public SfxPoolItem
 
 public:
     static SfxPoolItem* CreateDefault();
-    SvxLongULSpaceItem(tools::Long lUpper, tools::Long lLower, sal_uInt16 nId);
+    SvxLongULSpaceItem(tools::Long lUpper, tools::Long lLower, TypedWhichId<SvxLongULSpaceItem> nId);
     SvxLongULSpaceItem();
     SvxLongULSpaceItem(SvxLongULSpaceItem const &) = default;
 
diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx
index 61770899b951..ee4af385a171 100644
--- a/include/svx/sdangitm.hxx
+++ b/include/svx/sdangitm.hxx
@@ -27,7 +27,7 @@
 
 class SVXCORE_DLLPUBLIC SdrAngleItem: public SfxInt32Item {
 public:
-    SdrAngleItem(sal_uInt16 nId, Degree100 nAngle): SfxInt32Item(nId,nAngle.get()) {}
+    SdrAngleItem(TypedWhichId<SdrAngleItem> nId, Degree100 nAngle): SfxInt32Item(nId,nAngle.get()) {}
     virtual SdrAngleItem* Clone(SfxItemPool* pPool=nullptr) const override;
 
     virtual bool GetPresentation(SfxItemPresentation ePres,
diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx
index 8819c5e2a2b4..934c24034d94 100644
--- a/include/svx/sdmetitm.hxx
+++ b/include/svx/sdmetitm.hxx
@@ -29,7 +29,7 @@
 
 class SVXCORE_DLLPUBLIC SdrMetricItem: public SfxInt32Item {
 public:
-    SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal):  SfxInt32Item(nId,nVal) {}
+    SdrMetricItem(TypedWhichId<SdrMetricItem> nId, sal_Int32 nVal):  SfxInt32Item(nId,nVal) {}
     virtual SdrMetricItem* Clone(SfxItemPool* pPool=nullptr) const override;
     virtual bool HasMetrics() const override;
     virtual void ScaleMetrics(tools::Long nMul, tools::Long nDiv) override;
diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx
index 2cc2fce42738..befd67f749e0 100644
--- a/include/svx/sdooitm.hxx
+++ b/include/svx/sdooitm.hxx
@@ -29,7 +29,7 @@
 
 class SVXCORE_DLLPUBLIC SdrOnOffItem: public SfxBoolItem {
 public:
-    SdrOnOffItem(sal_uInt16 nId, bool bOn): SfxBoolItem(nId,bOn) {}
+    SdrOnOffItem(TypedWhichId<SdrOnOffItem> nId, bool bOn): SfxBoolItem(nId,bOn) {}
     virtual SdrOnOffItem* Clone(SfxItemPool* pPool=nullptr) const override;
 
     virtual OUString GetValueTextByVal(bool bVal) const override;
diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx
index 0316c4d0e452..f00c8d514edb 100644
--- a/include/svx/sdprcitm.hxx
+++ b/include/svx/sdprcitm.hxx
@@ -31,7 +31,7 @@
 class SVXCORE_DLLPUBLIC SdrPercentItem : public SfxUInt16Item
 {
 public:
-    SdrPercentItem(sal_uInt16 nId, sal_uInt16 nVal): SfxUInt16Item(nId,nVal) {}
+    SdrPercentItem(TypedWhichId<SdrPercentItem> nId, sal_uInt16 nVal): SfxUInt16Item(nId,nVal) {}
     virtual SdrPercentItem* Clone(SfxItemPool* pPool=nullptr) const override;
 
     virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx
index 69b909da5bd3..716f703ec4eb 100644
--- a/include/svx/sdtaitm.hxx
+++ b/include/svx/sdtaitm.hxx
@@ -35,7 +35,7 @@ enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP,      // aligned to top (normally
 class SVXCORE_DLLPUBLIC SdrTextVertAdjustItem final : public SfxEnumItem<SdrTextVertAdjust> {
 public:
     SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST, eAdj) {}
-    SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, sal_uInt16 nWhich): SfxEnumItem(nWhich, eAdj) {}
+    SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, TypedWhichId<SdrTextVertAdjustItem> nWhich): SfxEnumItem(nWhich, eAdj) {}
     virtual SdrTextVertAdjustItem* Clone(SfxItemPool* pPool=nullptr) const override;
     virtual sal_uInt16        GetValueCount() const override; // { return 5; }
 
diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx
index a67f3f41fd7e..970956a42cee 100644
--- a/include/svx/sdynitm.hxx
+++ b/include/svx/sdynitm.hxx
@@ -29,7 +29,7 @@
 //-------------------------------------------------- ----------
 class SVXCORE_DLLPUBLIC SdrYesNoItem: public SfxBoolItem {
 public:
-    SdrYesNoItem(sal_uInt16 nId, bool bOn): SfxBoolItem(nId,bOn) {}
+    SdrYesNoItem(TypedWhichId<SdrYesNoItem> nId, bool bOn): SfxBoolItem(nId,bOn) {}
     virtual SdrYesNoItem* Clone(SfxItemPool* pPool=nullptr) const override;
     virtual OUString GetValueTextByVal(bool bVal) const override;
     virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index f4623b6e0e77..a88beea11421 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -24,6 +24,7 @@
 #include <editeng/editids.hrc>
 #include <svl/typedwhich.hxx>
 
+class OfaPtrItem;
 class SdrAngleItem;
 class SfxBoolItem;
 class SfxInt32Item;
@@ -41,6 +42,7 @@ class SvxColorItem;
 class SvxColorListItem;
 class SvxColumnItem;
 class SvxDashListItem;
+class SvxDoubleItem;
 class SvxGradientListItem;
 class SvxGridItem;
 class SvxHatchListItem;
@@ -60,8 +62,10 @@ class SvxPostItTextItem;
 class SvxRulerItem;
 class SvxSetItem;
 class SvxSizeItem;
+class SvxSmartTagItem;
 class SvxViewLayoutItem;
-
+class SvxZoomSliderItem;
+class XFillGradientItem;
 
 // member IDs
 
@@ -393,12 +397,12 @@ class SvxViewLayoutItem;
 #define SID_GALLERY_FORMATS                             ( SID_SVX_START + 280 )
 #define SID_OBJECT_HELL                                 ( SID_SVX_START + 282 )
 #define SID_OBJECT_HEAVEN                               ( SID_SVX_START + 283 )
-#define SID_ATTR_LONG_ULSPACE                           ( SID_SVX_START + 284 )
-#define SID_ATTR_LONG_LRSPACE                           ( SID_SVX_START + 285 )
+#define SID_ATTR_LONG_ULSPACE                           TypedWhichId<SvxLongULSpaceItem>( SID_SVX_START + 284 )
+#define SID_ATTR_LONG_LRSPACE                           TypedWhichId<SvxLongLRSpaceItem>( SID_SVX_START + 285 )
 #define SID_FRAME_TO_TOP                                ( SID_SVX_START + 286 )
 #define SID_FRAME_TO_BOTTOM                             ( SID_SVX_START + 287 )
-#define SID_SEARCH_SEARCHSET                            ( SID_SVX_START + 292 )
-#define SID_SEARCH_REPLACESET                           ( SID_SVX_START + 293 )
+#define SID_SEARCH_SEARCHSET                            TypedWhichId<SvxSetItem>( SID_SVX_START + 292 )
+#define SID_SEARCH_REPLACESET                           TypedWhichId<SvxSetItem>( SID_SVX_START + 293 )
 #define SID_SET_SUPER_SCRIPT                            ( SID_SVX_START + 294 )
 #define SID_SET_SUB_SCRIPT                              ( SID_SVX_START + 295 )
 #define SID_CHAR_DLG                                    ( SID_SVX_START + 296 )
@@ -792,7 +796,7 @@ class SvxViewLayoutItem;
 #define SID_EXTRUSION_LIGHTING_FLOATER                  ( SID_SVX_START + 967 )
 #define SID_EXTRUSION_SURFACE_FLOATER                   ( SID_SVX_START + 968 )
 #define SID_EXTRUSION_3D_COLOR                          ( SID_SVX_START + 969 )
-#define SID_EXTRUSION_DEPTH                             ( SID_SVX_START + 970 )
+#define SID_EXTRUSION_DEPTH                             TypedWhichId<SvxDoubleItem>( SID_SVX_START + 970 )
 #define SID_EXTRUSION_DIRECTION                         ( SID_SVX_START + 971 )
 #define SID_EXTRUSION_PROJECTION                        ( SID_SVX_START + 972 )
 #define SID_EXTRUSION_LIGHTING_DIRECTION                ( SID_SVX_START + 973 )
@@ -843,7 +847,7 @@ class SvxViewLayoutItem;
 #define SID_DLG_TYPE                                    ( SID_SVX_START + 1018 )
 #define SID_TABPAGE_POS                                 ( SID_SVX_START + 1019 )
 #define SID_GRAPHIC                                     ( SID_SVX_START + 1020 )
-#define SID_OBJECT_LIST                                 ( SID_SVX_START + 1021 )
+#define SID_OBJECT_LIST                                 TypedWhichId<OfaPtrItem>( SID_SVX_START + 1021 )
 #define SID_ATTR_SET                                    ( SID_SVX_START + 1022 )
 #define SID_CHAR_FMT_LIST_BOX                           ( SID_SVX_START + 1023 )
 #define SID_METRIC_ITEM                                 TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1024 )
@@ -884,7 +888,7 @@ class SvxViewLayoutItem;
 #define SID_INSERT_ZWSP                                 ( SID_SVX_START + 1058 )   /* insert ZWJ - invisible space, keep words together*/
 #define SID_INSERT_WJ                                   ( SID_SVX_START + 1059 )   /* insert WJ  - Word Joiner */
 #define SID_OPTIONS_DATABASES                           ( SID_SVX_START + 1060 )
-#define SID_OPEN_SMARTTAGMENU                           ( SID_SVX_START + 1061 )
+#define SID_OPEN_SMARTTAGMENU                           TypedWhichId<SvxSmartTagItem>( SID_SVX_START + 1061 )
 
 // CAUTION! Range <1062 .. 1069> used by include/sfx2/sfxsids.hrc
 
@@ -981,7 +985,7 @@ class SvxViewLayoutItem;
 
 #define SID_ATTR_PAGE_COLOR                             ( SID_SVX_START + 1152 )
 // 1153 is used by editeng (SID_ATTR_CHAR_BACK_COLOR)
-#define SID_ATTR_PAGE_GRADIENT                          ( SID_SVX_START + 1154 )
+#define SID_ATTR_PAGE_GRADIENT                          TypedWhichId<XFillGradientItem>( SID_SVX_START + 1154 )
 #define SID_ATTR_PAGE_HATCH                             ( SID_SVX_START + 1155 )
 #define SID_ATTR_PAGE_BITMAP                            ( SID_SVX_START + 1156 )
 #define SID_ATTR_PAGE_FILLSTYLE                         ( SID_SVX_START + 1157 )
@@ -1041,7 +1045,7 @@ class SvxViewLayoutItem;
 
 #define SID_INSERT_TREECONTROL                          ( SID_SVX_START + 1206 )
 #define SID_ATTR_VIEWLAYOUT                             TypedWhichId<SvxViewLayoutItem>( SID_SVX_START + 1207 )
-#define SID_ATTR_ZOOMSLIDER                             ( SID_SVX_START + 1208 )
+#define SID_ATTR_ZOOMSLIDER                             TypedWhichId<SvxZoomSliderItem>( SID_SVX_START + 1208 )
 #define SID_LANGUAGE_STATUS                             ( SID_SVX_START + 1209 )
 #define SID_CHAR_DLG_FOR_PARAGRAPH                      ( SID_SVX_START + 1210 )
 #define SID_SET_DOCUMENT_LANGUAGE                       TypedWhichId<SfxBoolItem>( SID_SVX_START + 1211 )
diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx
index 0a5b3ee434b5..495443c85c10 100644
--- a/include/svx/viewlayoutitem.hxx
+++ b/include/svx/viewlayoutitem.hxx
@@ -31,7 +31,7 @@ class SVX_DLLPUBLIC SvxViewLayoutItem final : public SfxUInt16Item
 public:
     static SfxPoolItem* CreateDefault();
 
-    SvxViewLayoutItem( sal_uInt16 nColumns = 0, bool bBookMode = false, sal_uInt16 nWhich = SID_ATTR_VIEWLAYOUT );
+    SvxViewLayoutItem( sal_uInt16 nColumns = 0, bool bBookMode = false, TypedWhichId<SvxViewLayoutItem> nWhich = SID_ATTR_VIEWLAYOUT );
     SvxViewLayoutItem( const SvxViewLayoutItem& );
     virtual ~SvxViewLayoutItem() override;
 
diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx
index 9f35416b56ae..8760ba88208e 100644
--- a/include/svx/xcolit.hxx
+++ b/include/svx/xcolit.hxx
@@ -36,15 +36,13 @@ class SVXCORE_DLLPUBLIC XColorItem : public NameOrIndex
 public:
             static SfxPoolItem* CreateDefault();
             XColorItem() {}
-            XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor);
+            XColorItem(TypedWhichId<XColorItem> nWhich, sal_Int32 nIndex, const Color& rTheColor);
+            XColorItem(TypedWhichId<XColorItem> nWhich, const Color& rTheColor);
+            XColorItem(TypedWhichId<XColorItem> nWhich, const OUString& rName, const Color& rTheColor);
+            XColorItem(const XColorItem& rItem);
 
     virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
     virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
-
-            XColorItem(sal_uInt16 nWhich, const Color& rTheColor);
-            XColorItem(sal_uInt16 nWhich, const OUString& rName, const Color& rTheColor);
-            XColorItem(const XColorItem& rItem);
-
     virtual bool            operator==(const SfxPoolItem& rItem) const override;
     virtual XColorItem* Clone(SfxItemPool* pPool = nullptr) const override;
 
diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx
index 01268edd04f8..0c02e44a8d09 100644
--- a/include/svx/xflgrit.hxx
+++ b/include/svx/xflgrit.hxx
@@ -37,7 +37,7 @@ public:
             static SfxPoolItem* CreateDefault();
             XFillGradientItem() : NameOrIndex(XATTR_FILLGRADIENT, -1) {}
             XFillGradientItem(sal_Int32 nIndex, const XGradient& rTheGradient);
-            XFillGradientItem(const OUString& rName, const XGradient& rTheGradient, sal_uInt16 nWhich = XATTR_FILLGRADIENT);
+            XFillGradientItem(const OUString& rName, const XGradient& rTheGradient, TypedWhichId<XFillGradientItem> nWhich = XATTR_FILLGRADIENT);
             XFillGradientItem(const XGradient& rTheGradient);
             XFillGradientItem(const XFillGradientItem& rItem);
 
diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx
index db8f666197c5..f6b19595a9f8 100644
--- a/include/svx/xit.hxx
+++ b/include/svx/xit.hxx
@@ -43,8 +43,8 @@ protected:
 
 public:
             NameOrIndex() { nPalIndex = -1; }
-            NameOrIndex(sal_uInt16 nWhich, sal_Int32 nIndex);
-            NameOrIndex(sal_uInt16 nWhich, const OUString& rName);
+            NameOrIndex(TypedWhichId<NameOrIndex> nWhich, sal_Int32 nIndex);
+            NameOrIndex(TypedWhichId<NameOrIndex> nWhich, const OUString& rName);
             NameOrIndex(const NameOrIndex& rNameOrIndex);
 
     virtual bool         operator==(const SfxPoolItem& rItem) const override;
diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx
index f257f19997a9..919d7c026260 100644
--- a/include/svx/zoomslideritem.hxx
+++ b/include/svx/zoomslideritem.hxx
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC SvxZoomSliderItem final : public SfxUInt16Item
 public:
     static SfxPoolItem* CreateDefault();
 
-    SvxZoomSliderItem( sal_uInt16 nCurrentZoom = 100, sal_uInt16 nMinZoom = 20, sal_uInt16 nMaxZoom = 600, sal_uInt16 nWhich = SID_ATTR_ZOOMSLIDER );
+    SvxZoomSliderItem( sal_uInt16 nCurrentZoom = 100, sal_uInt16 nMinZoom = 20, sal_uInt16 nMaxZoom = 600, TypedWhichId<SvxZoomSliderItem> nWhich = SID_ATTR_ZOOMSLIDER );
 
     void AddSnappingPoint( sal_Int32 nNew );
     const css::uno::Sequence < sal_Int32 >& GetSnappingPoints() const { return maValues;}