more TypedWhichId

Change-Id: I2536f09fc48ff641c0e5c646ca7127f293ae5db4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152259
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

10 files changed, 129 insertions, 128 deletions

diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 63f9d5ce91f7..3030f49c6d9d 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -412,8 +412,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet )
 
     if(eState==SfxItemState::SET)
     {
-        const SfxBoolItem* pBoolItem = static_cast<const SfxBoolItem*>(
-                      GetItem( *rSet, SID_ATTR_NUMBERFORMAT_ONE_AREA));
+        const SfxBoolItem* pBoolItem = GetItem( *rSet, SID_ATTR_NUMBERFORMAT_ONE_AREA);
 
         if(pBoolItem!=nullptr)
         {
diff --git a/dbaccess/source/ui/inc/dsitems.hxx b/dbaccess/source/ui/inc/dsitems.hxx
index 8b7971d80a66..10cf0e711296 100644
--- a/dbaccess/source/ui/inc/dsitems.hxx
+++ b/dbaccess/source/ui/inc/dsitems.hxx
@@ -20,6 +20,10 @@
 #pragma once
 
 #include <sal/types.h>
+#include <svl/typedwhich.hxx>
+
+class SfxBoolItem;
+class OptionalBoolItem;
 
 typedef sal_Int32   ItemID;
 
@@ -30,61 +34,61 @@ typedef sal_Int32   ItemID;
 #define DSID_CONNECTURL             3           // connection URL, SfxStringItem
 #define DSID_TABLEFILTER            4           // table filter, OStringListItem
 #define DSID_TYPECOLLECTION         5           // collection of data source types, ODsnTypeCollection
-#define DSID_INVALID_SELECTION      6           // is the selection (thus the set data) invalid?, SfxBoolItem
-#define DSID_READONLY               7           // is the selection (thus the set data) readonly?, SfxBoolItem
+#define DSID_INVALID_SELECTION      TypedWhichId<SfxBoolItem>(6) // is the selection (thus the set data) invalid?, SfxBoolItem
+#define DSID_READONLY               TypedWhichId<SfxBoolItem>(7) // is the selection (thus the set data) readonly?, SfxBoolItem
 #define DSID_USER                   8           // the user name used for logon, SfxStringItem
 #define DSID_PASSWORD               9           // the password used for logon, SfxStringItem
 #define DSID_ADDITIONALOPTIONS      10          // additional options used for connecting, SfxStringItem
 #define DSID_CHARSET                11          // character set to use, SfxStringItem by now
-#define DSID_PASSWORDREQUIRED       12          // is the password required to connect?, SfxBoolItem
-#define DSID_SHOWDELETEDROWS        13          // show deleted rows?, SfxBoolItem
-#define DSID_ALLOWLONGTABLENAMES    14          // allow tables names longer than 8.3?, SfxBoolItem
+#define DSID_PASSWORDREQUIRED       TypedWhichId<SfxBoolItem>(12) // is the password required to connect?, SfxBoolItem
+#define DSID_SHOWDELETEDROWS        TypedWhichId<SfxBoolItem>(13) // show deleted rows?, SfxBoolItem
+#define DSID_ALLOWLONGTABLENAMES    TypedWhichId<SfxBoolItem>(14) // allow tables names longer than 8.3?, SfxBoolItem
 #define DSID_JDBCDRIVERCLASS        15          // JDBC driver class, SfxStringItem
 #define DSID_FIELDDELIMITER         16          // field delimiter, SfxUInt16Item
 #define DSID_TEXTDELIMITER          17          // text delimiter, SfxUInt16Item
 #define DSID_DECIMALDELIMITER       18          // decimal delimiter, SfxUInt16Item
 #define DSID_THOUSANDSDELIMITER     19          // thousands delimiter, SfxUInt16Item
 #define DSID_TEXTFILEEXTENSION      20          // extension for text files, SfxStringItem
-#define DSID_TEXTFILEHEADER         21          // the text file contains a header?, SfxBoolItem
-#define DSID_PARAMETERNAMESUBST     22
+#define DSID_TEXTFILEHEADER         TypedWhichId<SfxBoolItem>(21) // the text file contains a header?, SfxBoolItem
+#define DSID_PARAMETERNAMESUBST     TypedWhichId<SfxBoolItem>(22)
 #define DSID_CONN_PORTNUMBER        23
-#define DSID_SUPPRESSVERSIONCL      24          // meta data: sal_True if the data source described by the set is to-be-deleted
-#define DSID_CONN_SHUTSERVICE       25
+#define DSID_SUPPRESSVERSIONCL      TypedWhichId<SfxBoolItem>(24) // meta data: sal_True if the data source described by the set is to-be-deleted
+#define DSID_CONN_SHUTSERVICE       TypedWhichId<SfxBoolItem>(25)
 #define DSID_CONN_DATAINC           26
 #define DSID_CONN_CACHESIZE         27
 #define DSID_CONN_CTRLUSER          28
 #define DSID_CONN_CTRLPWD           29
-#define DSID_USECATALOG             30          // should the driver use the catalog name when the database is filebased
+#define DSID_USECATALOG             TypedWhichId<SfxBoolItem>(30) // should the driver use the catalog name when the database is filebased
 #define DSID_CONN_HOSTNAME          31
 #define DSID_CONN_LDAP_BASEDN       32
 #define DSID_CONN_LDAP_PORTNUMBER   33
 #define DSID_CONN_LDAP_ROWCOUNT     34
-#define DSID_SQL92CHECK             35
+#define DSID_SQL92CHECK             TypedWhichId<SfxBoolItem>(35)
 #define DSID_AUTOINCREMENTVALUE     36
 #define DSID_AUTORETRIEVEVALUE      37
-#define DSID_AUTORETRIEVEENABLED    38
-#define DSID_APPEND_TABLE_ALIAS     39
+#define DSID_AUTORETRIEVEENABLED    TypedWhichId<SfxBoolItem>(38)
+#define DSID_APPEND_TABLE_ALIAS     TypedWhichId<SfxBoolItem>(39)
 #define DSID_MYSQL_PORTNUMBER       40
-#define DSID_IGNOREDRIVER_PRIV      41
+#define DSID_IGNOREDRIVER_PRIV      TypedWhichId<SfxBoolItem>(41)
 #define DSID_BOOLEANCOMPARISON      42
 #define DSID_ORACLE_PORTNUMBER      43
-#define DSID_ENABLEOUTERJOIN        44
-#define DSID_CATALOG                45
-#define DSID_SCHEMA                 46
-#define DSID_INDEXAPPENDIX          47
-#define DSID_CONN_LDAP_USESSL       48
+#define DSID_ENABLEOUTERJOIN        TypedWhichId<SfxBoolItem>(44)
+#define DSID_CATALOG                TypedWhichId<SfxBoolItem>(45)
+#define DSID_SCHEMA                 TypedWhichId<SfxBoolItem>(46)
+#define DSID_INDEXAPPENDIX          TypedWhichId<SfxBoolItem>(47)
+#define DSID_CONN_LDAP_USESSL       TypedWhichId<SfxBoolItem>(48)
 #define DSID_DOCUMENT_URL           49
-#define DSID_DOSLINEENDS            50
+#define DSID_DOSLINEENDS            TypedWhichId<SfxBoolItem>(50)
 #define DSID_DATABASENAME           51
-#define DSID_AS_BEFORE_CORRNAME     52
-#define DSID_CHECK_REQUIRED_FIELDS  53
-#define DSID_IGNORECURRENCY         54
+#define DSID_AS_BEFORE_CORRNAME     TypedWhichId<SfxBoolItem>(52)
+#define DSID_CHECK_REQUIRED_FIELDS  TypedWhichId<SfxBoolItem>(53)
+#define DSID_IGNORECURRENCY         TypedWhichId<SfxBoolItem>(54)
 #define DSID_CONN_SOCKET            55
-#define DSID_ESCAPE_DATETIME        56
+#define DSID_ESCAPE_DATETIME        TypedWhichId<SfxBoolItem>(56)
 #define DSID_NAMED_PIPE             57
-#define DSID_PRIMARY_KEY_SUPPORT    58
+#define DSID_PRIMARY_KEY_SUPPORT    TypedWhichId<OptionalBoolItem>(58)
 #define DSID_MAX_ROW_SCAN           59
-#define DSID_RESPECTRESULTSETTYPE   60
+#define DSID_RESPECTRESULTSETTYPE   TypedWhichId<SfxBoolItem>(60)
 #define DSID_POSTGRES_PORTNUMBER    61
     // don't forget to adjust DSID_LAST_ITEM_ID below!
 
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 7abfccbd452b..e7e798df978b 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -573,7 +573,7 @@ SET_FONTALIGNMENT:
                 break;
 
             case RTF_KERNING:
-                if (const sal_uInt16 wid = aPlainMap[SID_ATTR_CHAR_AUTOKERN])
+                if (const TypedWhichId<SvxAutoKernItem> wid = aPlainMap[SID_ATTR_CHAR_AUTOKERN])
                 {
                     if( -1 == nTokenValue )
                         nTokenValue = 0;
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 6abc01866943..40306fa5f6e8 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -66,36 +66,36 @@ namespace pcr
 
     //= OFontPropertyExtractor
 
-    namespace {
-
-    enum FontItemIds: sal_uInt16
+    namespace FontItemIds
     {
-        CFID_FONT =             1,
-        CFID_HEIGHT =           2,
-        CFID_WEIGHT =           3,
-        CFID_POSTURE =          4,
-        CFID_LANGUAGE =         5,
-        CFID_UNDERLINE =        6,
-        CFID_STRIKEOUT =        7,
-        CFID_WORDLINEMODE =     8,
-        CFID_CHARCOLOR =        9,
-        CFID_RELIEF =           10,
-        CFID_EMPHASIS =         11,
-
-        CFID_CJK_FONT =         12,
-        CFID_CJK_HEIGHT =       13,
-        CFID_CJK_WEIGHT =       14,
-        CFID_CJK_POSTURE =      15,
-        CFID_CJK_LANGUAGE =     16,
-        CFID_CASEMAP =          17,
-        CFID_CONTOUR =          18,
-        CFID_SHADOWED =         19,
-
-        CFID_FONTLIST =         20,
-
-        CFID_FIRST_ITEM_ID =    CFID_FONT,
-        CFID_LAST_ITEM_ID =     CFID_FONTLIST
-    };
+        constexpr sal_uInt16 CFID_FONT =             1;
+        constexpr sal_uInt16 CFID_HEIGHT =           2;
+        constexpr sal_uInt16 CFID_WEIGHT =           3;
+        constexpr sal_uInt16 CFID_POSTURE =          4;
+        constexpr sal_uInt16 CFID_LANGUAGE =         5;
+        constexpr sal_uInt16 CFID_UNDERLINE =        6;
+        constexpr sal_uInt16 CFID_STRIKEOUT =        7;
+        constexpr TypedWhichId<SvxWordLineModeItem> CFID_WORDLINEMODE(8);
+        constexpr sal_uInt16 CFID_CHARCOLOR =        9;
+        constexpr sal_uInt16 CFID_RELIEF =           10;
+        constexpr sal_uInt16 CFID_EMPHASIS =         11;
+
+        constexpr sal_uInt16 CFID_CJK_FONT =         12;
+        constexpr sal_uInt16 CFID_CJK_HEIGHT =       13;
+        constexpr sal_uInt16 CFID_CJK_WEIGHT =       14;
+        constexpr sal_uInt16 CFID_CJK_POSTURE =      15;
+        constexpr sal_uInt16 CFID_CJK_LANGUAGE =     16;
+        constexpr sal_uInt16 CFID_CASEMAP =          17;
+        constexpr TypedWhichId<SvxContourItem> CFID_CONTOUR(18);
+        constexpr TypedWhichId<SvxShadowedItem> CFID_SHADOWED(19);
+
+        constexpr sal_uInt16 CFID_FONTLIST =         20;
+
+        constexpr sal_uInt16 CFID_FIRST_ITEM_ID =    CFID_FONT;
+        constexpr sal_uInt16 CFID_LAST_ITEM_ID =     CFID_FONTLIST;
+    }
+
+    namespace {
 
     class OFontPropertyExtractor
     {
@@ -421,7 +421,7 @@ namespace pcr
             if ( eState == SfxItemState::SET )
             {
                 const SvxWordLineModeItem& rWordLineModeItem =
-                    static_cast<const SvxWordLineModeItem&>(_rSet.Get(FontItemIds::CFID_WORDLINEMODE));
+                    _rSet.Get(FontItemIds::CFID_WORDLINEMODE);
 
                 lcl_pushBackPropertyValue( _out_properties, PROPERTY_WORDLINEMODE, css::uno::Any(rWordLineModeItem.GetValue()));
             }
diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc
index df7969ce8dc3..624c78b78a3a 100644
--- a/include/editeng/editids.hrc
+++ b/include/editeng/editids.hrc
@@ -154,7 +154,7 @@ class SvxWordLineModeItem;
 #define SID_ATTR_CHAR_RELIEF                            TypedWhichId<SvxCharReliefItem>( SID_SVX_START + 920 )
 #define SID_PARA_VERTALIGN                              TypedWhichId<SvxParaVertAlignItem>( SID_SVX_START + 925 )
 #define SID_ATTR_FRAMEDIRECTION                         TypedWhichId<SvxFrameDirectionItem>( SID_SVX_START + 944 )
-#define SID_ATTR_PARA_SNAPTOGRID                        ( SID_SVX_START + 945 )
+#define SID_ATTR_PARA_SNAPTOGRID                        TypedWhichId<SvxParaGridItem>( SID_SVX_START + 945 )
 #define SID_ATTR_PARA_LRSPACE_VERTICAL                  ( SID_SVX_START + 947 )
 #define SID_ATTR_PARA_LEFT_TO_RIGHT                     ( SID_SVX_START + 950 )
 #define SID_ATTR_PARA_RIGHT_TO_LEFT                     ( SID_SVX_START + 951 )
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 7500fd9e048a..3265f84131bc 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -131,11 +131,11 @@ class SvxZoomItem;
 #define SID_SAVEASDOC                       (SID_SFX_START + 502)
 #define SID_SAVEASREMOTE                    (SID_SFX_START + 516)
 #define SID_SAVESIMPLE                      (SID_SFX_START + 518)
-#define SID_SIGNPDF                         (SID_SFX_START + 519)
-#define SID_SAVEACOPY                       (SID_SFX_START + 999)
-#define SID_SAVEACOPYITEM                   (SID_SFX_START + 998)
+#define SID_SIGNPDF                         TypedWhichId<SfxBoolItem>(SID_SFX_START + 519)
+#define SID_SAVEACOPY                       TypedWhichId<SfxBoolItem>(SID_SFX_START + 999)
+#define SID_SAVEACOPYITEM                   TypedWhichId<SfxBoolItem>(SID_SFX_START + 998)
 #define SID_CONVERT_IMAGES                  TypedWhichId<SfxStringItem>(SID_SFX_START + 997)
-#define SID_CLOSING                         (SID_SFX_START +1539)
+#define SID_CLOSING                         TypedWhichId<SfxBoolItem>(SID_SFX_START +1539)
 #define SID_CLOSEDOC                        (SID_SFX_START + 503)
 #define SID_CLOSEDOCS                       (SID_SFX_START + 595)
 #define SID_CLOSEDOC_SAVE                   (SID_SFX_START +   1)
@@ -167,9 +167,9 @@ class SvxZoomItem;
 #define SID_CHECKIN                         (SID_SFX_START + 514)
 #define SID_FILTER_PROVIDER                 TypedWhichId<SfxStringItem>(SID_SFX_START + 515)
 
-#define SID_FORCERELOAD                     (SID_SFX_START + 1502)
+#define SID_FORCERELOAD                     TypedWhichId<SfxBoolItem>(SID_SFX_START + 1502)
 #define SID_FILE_DIALOG                     TypedWhichId<SfxBoolItem>(SID_SFX_START + 304)
-#define SID_REMOTE_DIALOG                   (SID_SFX_START + 305)
+#define SID_REMOTE_DIALOG                   TypedWhichId<SfxBoolItem>(SID_SFX_START + 305)
 #define SID_PATH                            TypedWhichId<SfxStringItem>(SID_SFX_START + 308)
 #define SID_SAVEDOCS                        (SID_SFX_START + 309)
 #define SID_STANDARD_DIR                    TypedWhichId<SfxStringItem>(SID_SFX_START + 450)
@@ -181,8 +181,8 @@ class SvxZoomItem;
 #define SID_CREATELINK                      (SID_SFX_START + 1309)
 #define SID_EDITDOC                         TypedWhichId<SfxBoolItem>(SID_SFX_START + 1312)
 #define SID_BROWSER_MODE                    (SID_SFX_START + 1313)
-#define SID_READONLYDOC                     (SID_SFX_START + 1314)
-#define SID_BROWSER                         (SID_SFX_START + 1318)
+#define SID_READONLYDOC                     TypedWhichId<SfxBoolItem>(SID_SFX_START + 1314)
+#define SID_BROWSER                         TypedWhichId<SfxBoolItem>(SID_SFX_START + 1318)
 #define SID_MACROEXECMODE                   TypedWhichId<SfxUInt16Item>(SID_SFX_START + 1319)
 
 #define SID_FILTER_DATA                     TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1375)
@@ -195,7 +195,7 @@ class SvxZoomItem;
 #define SID_EXPLORER_PROPS_START            TypedWhichId<SfxStringItem>(SID_SFX_START + 1410)
 //      SID_EXPLORER_PROPS_END              (SID_SFX_START + 1499)
 
-#define SID_AUTOLOAD                        (SID_SFX_START + 1509)
+#define SID_AUTOLOAD                        TypedWhichId<SfxBoolItem>(SID_SFX_START + 1509)
 #define SID_FILLFRAME                       TypedWhichId<SfxUnoFrameItem>(SID_SFX_START + 1516)
 #define SID_BASEURL                         (SID_SFX_START + 1518)
 #define SID_TEMPLATE                        TypedWhichId<SfxBoolItem>(SID_SFX_START + 1519)
@@ -221,8 +221,8 @@ class SvxZoomItem;
 #define SID_JUMPMARK                        TypedWhichId<SfxStringItem>(SID_SFX_START + 1654)
 #define SID_BROWSE                          (SID_SFX_START + 1658)
     // FREE (was: SID_BACKTOWEBTOP)
-#define SID_VIEW_DATA_SOURCE_BROWSER        (SID_SFX_START + 1660)
-#define SID_UNPACK                          (SID_SFX_START + 1662)
+#define SID_VIEW_DATA_SOURCE_BROWSER        TypedWhichId<SfxBoolItem>(SID_SFX_START + 1660)
+#define SID_UNPACK                          TypedWhichId<SfxBoolItem>(SID_SFX_START + 1662)
 // (SID_SFX_START + 1663) used further down
 #define SID_ATTR_TARGETLANG_STR             (SID_SFX_START + 1664)
     // FREE
@@ -266,13 +266,13 @@ class SvxZoomItem;
 #define SID_FONT_NAME                       (SID_SFX_START + 1716)
 #define SID_DEFAULTFILENAME                 (SID_SFX_START + 1717)
 #define SID_MODIFYPASSWORDINFO              TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1718)
-#define SID_RECOMMENDREADONLY               (SID_SFX_START + 1719)
+#define SID_RECOMMENDREADONLY               TypedWhichId<SfxBoolItem>(SID_SFX_START + 1719)
 #define SID_SUGGESTEDSAVEASDIR              TypedWhichId<SfxStringItem>(SID_SFX_START + 1720)
 #define SID_SUGGESTEDSAVEASNAME             TypedWhichId<SfxStringItem>(SID_SFX_START + 1721)
 #define SID_ENCRYPTIONDATA                  TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1722)
-#define SID_PASSWORDINTERACTION             (SID_SFX_START + 1723)
+#define SID_PASSWORDINTERACTION             TypedWhichId<SfxBoolItem>(SID_SFX_START + 1723)
 #define SID_GOTOLINE                        (SID_SFX_START + 1724)
-#define SID_SHOWLINES                       (SID_SFX_START + 1725)
+#define SID_SHOWLINES                       TypedWhichId<SfxBoolItem>(SID_SFX_START + 1725)
 #define SID_BLUETOOTH_SENDDOC               (SID_SFX_START + 1726)
 #define SID_TEMPLATE_MANAGER                (SID_SFX_START + 1727)
 #define SID_TOOLBAR_MODE                    (SID_SFX_START + 1728)
@@ -293,7 +293,7 @@ class SvxZoomItem;
 #define SID_ADDITIONS_DIALOG                (SID_SFX_START + 1740)
 #define FN_PARAM_ADDITIONS_TAG              TypedWhichId<SfxStringItem>(SID_SFX_START + 1741)
 #define SID_TOOLBAR_MODE_UI                 (SID_SFX_START + 1742)
-#define SID_TOOLBAR_LOCK                    (SID_SFX_START + 1743)
+#define SID_TOOLBAR_LOCK                    TypedWhichId<SfxBoolItem>(SID_SFX_START + 1743)
 #define SID_WIDGET_TEST_DIALOG              (SID_SFX_START + 1744)
 #define FN_CHANGE_THEME                     (SID_SFX_START + 1745)
 #define FN_PARAM_NEW_THEME                  TypedWhichId<SfxStringItem>(SID_SFX_START + 1746)
@@ -313,7 +313,7 @@ class SvxZoomItem;
 #define SID_FOCUSURLBOX                     (SID_SFX_START + 1406)
 
 #define SID_ACTIVATE                        (SID_SFX_START + 525)
-#define SID_PRINTOUT                        (SID_SFX_START + 526)
+#define SID_PRINTOUT                        TypedWhichId<SfxBoolItem>(SID_SFX_START + 526)
 
 #define SID_FILTER_NAME                     TypedWhichId<SfxStringItem>(SID_SFX_START + 530)
 #define SID_DOC_SALVAGE                     TypedWhichId<SfxStringItem>(SID_SFX_START + 531)
@@ -321,10 +321,10 @@ class SvxZoomItem;
 #define SID_TYPE_NAME                       TypedWhichId<SfxStringItem>(SID_SFX_START + 533)
 
 #define SID_DOC_READONLY                    TypedWhichId<SfxBoolItem>(SID_SFX_START + 590)
-#define SID_DOC_MODIFIED                    (SID_SFX_START + 584)
-#define SID_DOC_LOADING                     (SID_SFX_START + 585)
-#define SID_IMG_LOADING                     (SID_SFX_START + 586)
-#define SID_DOC_SAVED                       (SID_SFX_START + 599)
+#define SID_DOC_MODIFIED                    TypedWhichId<SfxBoolItem>(SID_SFX_START + 584)
+#define SID_DOC_LOADING                     TypedWhichId<SfxBoolItem>(SID_SFX_START + 585)
+#define SID_IMG_LOADING                     TypedWhichId<SfxBoolItem>(SID_SFX_START + 586)
+#define SID_DOC_SAVED                       TypedWhichId<SfxBoolItem>(SID_SFX_START + 599)
 #define SID_DOCINFO                         TypedWhichId<SfxDocumentInfoItem>(SID_SFX_START + 535)
 #define SID_DOCINFO_KEYWORDS                (SID_SFX_START + 591)
 #define SID_DOCINFO_COMMENTS                (SID_SFX_START + 592)
@@ -371,7 +371,7 @@ class SvxZoomItem;
 #define SID_STYLE_APPLY                     (SID_SFX_START + 552)
 #define SID_STYLE_FAMILY                    TypedWhichId<SfxUInt16Item>(SID_SFX_START + 553)
 #define SID_STYLE_FAMILYNAME                TypedWhichId<SfxStringItem>(SID_SFX_START + 566)
-#define SID_STYLE_WATERCAN                  (SID_SFX_START + 554)
+#define SID_STYLE_WATERCAN                  TypedWhichId<SfxBoolItem>(SID_SFX_START + 554)
 #define SID_STYLE_NEW_BY_EXAMPLE            (SID_SFX_START + 555)
 #define SID_STYLE_UPDATE_BY_EXAMPLE         (SID_SFX_START + 556)
 #define SID_STYLE_DRAGHIERARCHIE            (SID_SFX_START + 565)
@@ -396,7 +396,7 @@ class SvxZoomItem;
 #define SID_WATERMARK_COLOR                 TypedWhichId<SfxUInt32Item>(SID_SFX_START + 806)
 #define SID_WATERMARK_ANGLE                 TypedWhichId<SfxInt16Item>(SID_SFX_START + 807)
 
-#define SID_HYPERLINK_DIALOG                (SID_SFX_START + 678)
+#define SID_HYPERLINK_DIALOG                TypedWhichId<SfxBoolItem>(SID_SFX_START + 678)
 
 #define SID_DEFAULTFILEPATH                 (SID_SFX_START + 571)
 #define SID_OBJECT                          (SID_SFX_START + 575)
@@ -478,7 +478,7 @@ class SvxZoomItem;
 #define SID_TOOLBOXOPTIONS                  (SID_SFX_START + 907)
 #define SID_TOGGLEFUNCTIONBAR               (SID_SFX_START + 910)
 #define SID_MACROINFO                       TypedWhichId<SfxMacroInfoItem>(SID_SFX_START + 919)
-#define SID_TOGGLESTATUSBAR                 (SID_SFX_START + 920)
+#define SID_TOGGLESTATUSBAR                 TypedWhichId<SfxBoolItem>(SID_SFX_START + 920)
 #define SID_CONFIGSTATUSBAR                 (SID_SFX_START + 921)
 #define SID_CONFIGMENU                      (SID_SFX_START + 924)
 #define SID_CONFIGACCEL                     (SID_SFX_START + 925)
@@ -568,7 +568,7 @@ class SvxZoomItem;
 #define SID_SECURE_URL                  TypedWhichId<SfxStringListItem>(SID_OPTIONS_START + 66)
 
 // configured locale changed
-#define SID_OPT_LOCALE_CHANGED              (SID_OPTIONS_START + 94)
+#define SID_OPT_LOCALE_CHANGED              TypedWhichId<SfxBoolItem>(SID_OPTIONS_START + 94)
 //middle mouse button
 #define SID_ATTR_PRETTYPRINTING             TypedWhichId<SfxBoolItem>(SID_OPTIONS_START + 98)
 #define SID_HELP_STYLESHEET                 TypedWhichId<SfxStringItem>(SID_OPTIONS_START + 99)
@@ -587,9 +587,9 @@ class SvxZoomItem;
 #define SID_GALLERY_BG_BRUSH                (SID_SVX_START + 279)
 #define SID_SEARCH_OPTIONS                  (SID_SVX_START + 281)
 #define SID_SEARCH_ITEM                     TypedWhichId<SvxSearchItem>(SID_SVX_START + 291)
-#define SID_SIDEBAR                         (SID_SVX_START + 336)
+#define SID_SIDEBAR                         TypedWhichId<SfxBoolItem>(SID_SVX_START + 336)
 #define SID_NOTEBOOKBAR                     (SID_SVX_START + 338)
-#define SID_MENUBAR                         (SID_SVX_START + 339)
+#define SID_MENUBAR                         TypedWhichId<SfxBoolItem>(SID_SVX_START + 339)
 #define SID_HYPERLINK_GETLINK               TypedWhichId<SvxHyperlinkItem>(SID_SVX_START + 361)
 #define SID_HYPERLINK_SETLINK               TypedWhichId<SvxHyperlinkItem>(SID_SVX_START + 362)
 #define SID_INFOBAR                         (SID_SVX_START + 365)
@@ -614,7 +614,7 @@ class SvxZoomItem;
 
 #define FID_SVX_START                       (SID_LIB_START + 500)
 #define FID_SEARCH_NOW                      (FID_SVX_START + 2)
-#define SID_BASICIDE_REPEAT_SEARCH          (FID_SVX_START + 3)
+#define SID_BASICIDE_REPEAT_SEARCH          TypedWhichId<SfxBoolItem>(FID_SVX_START + 3)
 
 // SlotIds for Basic -------------------------------------------------------
 #define SID_BASICIDE_TOGGLEBRKPNT           ( SID_BASICIDE_START +  0 )
@@ -623,7 +623,7 @@ class SvxZoomItem;
 #define SID_BASICIDE_EDITMACRO              ( SID_BASICIDE_START +  3 )
 #define SID_BASICIDE_CREATEMACRO            ( SID_BASICIDE_START +  4 )
 #define SID_BASICIDE_MODULEDLG              ( SID_BASICIDE_START +  5 )
-#define SID_BASICIDE_OBJCAT                 ( SID_BASICIDE_START +  6 )
+#define SID_BASICIDE_OBJCAT                 TypedWhichId<SfxBoolItem>( SID_BASICIDE_START +  6 )
 #define SID_BASICIDE_REMOVEWATCH            ( SID_BASICIDE_START +  7 )
 #define SID_BASICIDE_SHOWSBX                ( SID_BASICIDE_START +  9 )
 #define SID_BASICIDE_HIDECURPAGE            ( SID_BASICIDE_START + 10 )
@@ -667,8 +667,8 @@ class SvxZoomItem;
 #define SID_BASICIDE_MANAGE_LANG            ( SID_BASICIDE_START + 52 )
 #define SID_BASICIDE_CURRENT_LANG           ( SID_BASICIDE_START + 53 )
 #define SID_BASICIDE_CURRENT_ZOOM           ( SID_BASICIDE_START + 54 )
-#define SID_BASICIDE_WATCH                  ( SID_BASICIDE_START + 55 )
-#define SID_BASICIDE_STACK                  ( SID_BASICIDE_START + 56 )
+#define SID_BASICIDE_WATCH                  TypedWhichId<SfxBoolItem>( SID_BASICIDE_START + 55 )
+#define SID_BASICIDE_STACK                  TypedWhichId<SfxBoolItem>( SID_BASICIDE_START + 56 )
 #define SID_OPTIONS_TREEDIALOG              ( SID_BASICIDE_START + 862)
 
 // SlotIds for Apps --------------------------------------------------------
@@ -679,7 +679,7 @@ class SvxZoomItem;
 #define FN_PARAM_4                          (FN_PARAM+63)
 #define FN_PARAM_5                          (FN_PARAM+64)
 #define FN_PARAM_6                          (FN_PARAM+65)
-#define FN_NOUPDATE                         (FN_PARAM+66)
+#define FN_NOUPDATE                         TypedWhichId<SfxBoolItem>(FN_PARAM+66)
 #define FN_FAX                              (SID_SW_START + 28)   /* Fax */
 
 #define SID_KEYFUNC_START                   (SID_SC_START + 521)
diff --git a/include/svx/databaseregistrationui.hxx b/include/svx/databaseregistrationui.hxx
index 7cb5f6c559b4..fc8c647bc04a 100644
--- a/include/svx/databaseregistrationui.hxx
+++ b/include/svx/databaseregistrationui.hxx
@@ -25,7 +25,7 @@
 
 namespace weld { class Window; }
 
-#define SID_SB_POOLING_ENABLED          (RID_OFA_START + 247)
+#define SID_SB_POOLING_ENABLED          TypedWhichId<SfxBoolItem>(RID_OFA_START + 247)
 #define SID_SB_DRIVER_TIMEOUTS          (RID_OFA_START + 248)
 #define SID_SB_DB_REGISTER              (RID_OFA_START + 249)
 
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 90aae09d2c69..584f10ec6670 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -165,7 +165,7 @@ class XFillGradientItem;
 #define ID_VAL_INDEX                        (SID_SD_START+246)
 #define SID_BEZIERTO                        (SID_SD_START+252)
 #define SID_DASH                            (SID_SD_START+267)
-#define SID_TEXT_FITTOSIZE_VERTICAL         (SID_SD_START+286)
+#define SID_TEXT_FITTOSIZE_VERTICAL         TypedWhichId<SfxBoolItem>(SID_SD_START+286)
 #define SID_GRID_VISIBLE                    (SID_SD_START+322)
 #define ID_VAL_USEFIRSTROWSTYLE             TypedWhichId<SfxBoolItem>(SID_SD_START+323)
 #define ID_VAL_USELASTROWSTYLE              TypedWhichId<SfxBoolItem>(SID_SD_START+324)
@@ -341,7 +341,7 @@ class XFillGradientItem;
 #define SID_INSERT_HSCROLLBAR                           ( SID_SVX_START + 195 )
 #define SID_INSERT_VSCROLLBAR                           ( SID_SVX_START + 196 )
 #define SID_INSERT_SELECT                               ( SID_SVX_START + 199 )
-#define SID_DIALOG_TESTMODE                             ( SID_SVX_START + 200 )
+#define SID_DIALOG_TESTMODE                             TypedWhichId<SfxBoolItem>( SID_SVX_START + 200 )
 #define SID_FRAME_LINESTYLE                             TypedWhichId<SvxLineItem>( SID_SVX_START + 201 )
 #define SID_FRAME_LINECOLOR                             TypedWhichId<SvxColorItem>( SID_SVX_START + 202 )
 #define SID_ATTR_LINE_WIDTH_ARG                         TypedWhichId<SvxDoubleItem>( SID_SVX_START + 203 )
@@ -442,7 +442,7 @@ class XFillGradientItem;
 #define SID_TWAIN_SELECT                                ( SID_SVX_START + 331 )
 #define SID_TWAIN_TRANSFER                              ( SID_SVX_START + 332 )
 #define SID_CONTOUR_DLG                                 ( SID_SVX_START + 334 )
-#define SID_CONTOUR_EXEC                                ( SID_SVX_START + 335 )
+#define SID_CONTOUR_EXEC                                TypedWhichId<SfxBoolItem>( SID_SVX_START + 335 )
 
 //#define SID_SIDEBAR                                   ( SID_SVX_START + 336 )   -> sfxsids.hrc
 
@@ -457,8 +457,8 @@ class XFillGradientItem;
 #define SID_SB_CONNECTIONPOOLING                        ( SID_SVX_START + 348 )
 #define SID_SB_DBREGISTEROPTIONS                        ( SID_SVX_START + 349 )
 #define SID_BMPMASK                                     ( SID_SVX_START + 350 )
-#define SID_BMPMASK_PIPETTE                             ( SID_SVX_START + 351 )
-#define SID_BMPMASK_EXEC                                ( SID_SVX_START + 353 )
+#define SID_BMPMASK_PIPETTE                             TypedWhichId<SfxBoolItem>( SID_SVX_START + 351 )
+#define SID_BMPMASK_EXEC                                TypedWhichId<SfxBoolItem>( SID_SVX_START + 353 )
 
 // CAUTION! Range <363 .. 363> used by EditEngine (!)
 
@@ -466,7 +466,7 @@ class XFillGradientItem;
 #define SID_ATTR_BRUSH_ROW                              TypedWhichId<SvxBrushItem>( SID_SVX_START + 368 )
 #define SID_OPTFILTER_MSOFFICE                          ( SID_SVX_START + 369 )
 #define SID_IMAP                                        ( SID_SVX_START + 371 )
-#define SID_IMAP_EXEC                                   ( SID_SVX_START + 374 )
+#define SID_IMAP_EXEC                                   TypedWhichId<SfxBoolItem>( SID_SVX_START + 374 )
 #define SID_DRAW_RECT_NOFILL                            ( SID_SVX_START + 378 )
 #define SID_DRAW_RECT_ROUND_NOFILL                      ( SID_SVX_START + 379 )
 #define SID_DRAW_SQUARE                                 ( SID_SVX_START + 380 )
@@ -500,7 +500,7 @@ class XFillGradientItem;
 
 #define SID_ATTR_3D_START                               ( SID_SVX_START + 415 )
 #define SID_RULER_PROTECT                               SID_ATTR_3D_START
-#define SID_COLOR_CONTROL                               ( SID_SVX_START + 417 )
+#define SID_COLOR_CONTROL                               TypedWhichId<SfxBoolItem>( SID_SVX_START + 417 )
 
 #define SID_TABLE_INSERT_COL_BEFORE                     ( SID_SVX_START + 418 )
 #define SID_TABLE_INSERT_COL_AFTER                      ( SID_SVX_START + 419 )
@@ -561,7 +561,7 @@ class XFillGradientItem;
 #define SID_FIELD_GRABFOCUS                             ( SID_SVX_START + 567 )
 #define SID_ATTR_ALIGN_DEGREES                          ( SID_SVX_START + 577 )
 #define SID_ATTR_ALIGN_LOCKPOS                          ( SID_SVX_START + 578 )
-#define SID_ATTR_NUMBERFORMAT_ONE_AREA                  ( SID_SVX_START + 580 )
+#define SID_ATTR_NUMBERFORMAT_ONE_AREA                  TypedWhichId<SfxBoolItem>( SID_SVX_START + 580 )
 #define SID_TABSTOP_ADD_OR_CHANGE                       ( SID_SVX_START + 581 )
 #define SID_TABSTOP_ATTR_INDEX                          ( SID_SVX_START + 582 )
 #define SID_TABSTOP_ATTR_POSITION                       ( SID_SVX_START + 583 )
@@ -596,7 +596,7 @@ class XFillGradientItem;
 //FREE
 //FREE
 #define SID_FM_CTL_PROPERTIES                           TypedWhichId<SfxBoolItem>( SID_SVX_START + 613 )
-#define SID_FM_PROPERTIES                               ( SID_SVX_START + 614 )
+#define SID_FM_PROPERTIES                               TypedWhichId<SfxBoolItem>( SID_SVX_START + 614 )
 #define SID_FM_TAB_DIALOG                               ( SID_SVX_START + 615 )
 #define SID_FM_RECORD_FIRST                             ( SID_SVX_START + 616 )
 #define SID_FM_RECORD_NEXT                              ( SID_SVX_START + 617 )
@@ -611,35 +611,35 @@ class XFillGradientItem;
 #define SID_FM_RECORD_TOTAL                             ( SID_SVX_START + 626 )
 #define SID_FM_RECORD_SAVE                              ( SID_SVX_START + 627 )
 #define SID_FM_CREATE_CONTROL                           ( SID_SVX_START + 628 )
-#define SID_FM_DESIGN_MODE                              ( SID_SVX_START + 629 )
+#define SID_FM_DESIGN_MODE                              TypedWhichId<SfxBoolItem>( SID_SVX_START + 629 )
 #define SID_FM_RECORD_UNDO                              ( SID_SVX_START + 630 )
 #define SID_FM_CONTROL_IDENTIFIER                       ( SID_SVX_START + 631 )
 #define SID_FM_CONTROL_INVENTOR                         ( SID_SVX_START + 632 )
 #define SID_FM_SHOW_FMEXPLORER                          ( SID_SVX_START + 633 )
 #define SID_FM_FIELDS_CONTROL                           ( SID_SVX_START + 634 )
-#define SID_FM_SHOW_PROPERTIES                          ( SID_SVX_START + 635 )
+#define SID_FM_SHOW_PROPERTIES                          TypedWhichId<SfxBoolItem>( SID_SVX_START + 635 )
 #define SID_FM_PROPERTY_CONTROL                         ( SID_SVX_START + 636 )
 #define SID_FM_FMEXPLORER_CONTROL                       ( SID_SVX_START + 637 )
 //FREE
 //FREE
 //FREE
 #define SID_3D_WIN                                      ( SID_SVX_START + 644 )
-#define SID_3D_STATE                                    ( SID_SVX_START + 645 )
-#define SID_3D_INIT                                     ( SID_SVX_START + 646 )
-#define SID_3D_ASSIGN                                   ( SID_SVX_START + 647 )
+#define SID_3D_STATE                                    TypedWhichId<SfxBoolItem>( SID_SVX_START + 645 )
+#define SID_3D_INIT                                     TypedWhichId<SfxBoolItem>( SID_SVX_START + 646 )
+#define SID_3D_ASSIGN                                   TypedWhichId<SfxBoolItem>( SID_SVX_START + 647 )
 #define SID_CONVERT_TO_3D                               ( SID_SVX_START + 648 )
 #define SID_CONVERT_TO_3D_LATHE_FAST                    ( SID_SVX_START + 649 )
 #define SID_ATTR_3D_END                                   SID_CONVERT_TO_3D_LATHE_FAST
 #define SID_ATTR_NUMBERFORMAT_NOLANGUAGE                TypedWhichId<SfxBoolItem>( SID_SVX_START + 700 )
 
 #define SID_MORE_FMSLOTS_START                          ( SID_SVX_START + 702 )
-#define SID_FM_SHOW_PROPERTY_BROWSER                    ( SID_SVX_START + 703 )
+#define SID_FM_SHOW_PROPERTY_BROWSER                    TypedWhichId<SfxBoolItem>( SID_SVX_START + 703 )
 #define SID_FM_DATEFIELD                                ( SID_SVX_START + 704 )
 #define SID_FM_TIMEFIELD                                ( SID_SVX_START + 705 )
 #define SID_FM_NUMERICFIELD                             ( SID_SVX_START + 706 )
 #define SID_FM_CURRENCYFIELD                            ( SID_SVX_START + 707 )
 #define SID_FM_PATTERNFIELD                             ( SID_SVX_START + 708 )
-#define SID_FM_OPEN_READONLY                            ( SID_SVX_START + 709 )
+#define SID_FM_OPEN_READONLY                            TypedWhichId<SfxBoolItem>( SID_SVX_START + 709 )
 #define SID_FM_IMAGECONTROL                             ( SID_SVX_START + 710 )
 #define SID_FM_REMOVE_FILTER_SORT                       ( SID_SVX_START + 711 )
 #define SID_FM_SORTUP                                   ( SID_SVX_START + 712 )
@@ -651,16 +651,16 @@ class XFillGradientItem;
 #define SID_FM_EXECUTE                                  ( SID_SVX_START + 721 )
 #define SID_SBA_QRY_EXECUTE                                 SID_FM_EXECUTE
 #define SID_FM_ADDTABLE                                 ( SID_SVX_START + 722 )
-#define SID_FM_FORM_FILTERED                            ( SID_SVX_START + 723 )
+#define SID_FM_FORM_FILTERED                            TypedWhichId<SfxBoolItem>( SID_SVX_START + 723 )
 #define SID_FM_REFRESH                                  ( SID_SVX_START + 724 )
 #define SID_FM_SEARCH                                   ( SID_SVX_START + 725 )
 #define SID_FM_LEAVE_CREATE                             ( SID_SVX_START + 726 ) // pop Formcontroller Button
-#define SID_FM_USE_WIZARDS                              ( SID_SVX_START + 727 )
+#define SID_FM_USE_WIZARDS                              TypedWhichId<SfxBoolItem>( SID_SVX_START + 727 )
 #define SID_FM_FORMATTEDFIELD                           ( SID_SVX_START + 728 )
 #define SID_FM_FILTER_START                             ( SID_SVX_START + 729 )
 #define SID_FM_FILTER_EXIT                              ( SID_SVX_START + 730 )
 #define SID_FM_FILTER_EXECUTE                           ( SID_SVX_START + 731 )
-#define SID_FM_FILTER_NAVIGATOR                         ( SID_SVX_START + 732 )
+#define SID_FM_FILTER_NAVIGATOR                         TypedWhichId<SfxBoolItem>( SID_SVX_START + 732 )
 #define SID_FM_CHANGECONTROLTYPE                        ( SID_SVX_START + 733 )
 #define SID_FM_CONVERTTO_EDIT                           ( SID_SVX_START + 734 )
 #define SID_FM_CONVERTTO_BUTTON                         ( SID_SVX_START + 735 )
@@ -689,12 +689,12 @@ class XFillGradientItem;
 //FREE
 //FREE
 //FREE
-#define SID_FM_VIEW_AS_GRID                             ( SID_SVX_START + 761 )
-#define SID_FM_AUTOCONTROLFOCUS                         ( SID_SVX_START + 763 )
+#define SID_FM_VIEW_AS_GRID                             TypedWhichId<SfxBoolItem>( SID_SVX_START + 761 )
+#define SID_FM_AUTOCONTROLFOCUS                         TypedWhichId<SfxBoolItem>( SID_SVX_START + 763 )
 #define SID_DSBROWSER_EXPLORER                          ( SID_SVX_START + 764 )
 #define SID_FM_CREATE_FIELDCONTROL                      ( SID_SVX_START + 765 )
 #define SID_FM_DATACCESS_DESCRIPTOR                     ( SID_SVX_START + 766 )
-#define SID_FM_TOGGLECONTROLFOCUS                       ( SID_SVX_START + 767 )
+#define SID_FM_TOGGLECONTROLFOCUS                       TypedWhichId<SfxBoolItem>( SID_SVX_START + 767 )
 #define SID_FM_SCROLLBAR                                ( SID_SVX_START + 768 )
 #define SID_FM_SPINBUTTON                               ( SID_SVX_START + 769 )
 #define SID_FM_CONVERTTO_SCROLLBAR                      ( SID_SVX_START + 770 )
@@ -770,7 +770,7 @@ class XFillGradientItem;
 #define SID_INSERT_FORMATTEDFIELD                       ( SID_SVX_START + 940 )
 #define SID_INSERT_PATTERNFIELD                         ( SID_SVX_START + 941 )
 #define SID_INSERT_FILECONTROL                          ( SID_SVX_START + 942 )
-#define SID_SHOW_PROPERTYBROWSER                        ( SID_SVX_START + 943 )
+#define SID_SHOW_PROPERTYBROWSER                        TypedWhichId<SfxBoolItem>( SID_SVX_START + 943 )
 
 // CAUTION! Range <944 .. 945> used by EditEngine (!)
 
@@ -787,8 +787,8 @@ class XFillGradientItem;
 #define SID_ATTR_HDFT_DYNAMIC_SPACING                   ( SID_SVX_START + 953 )
 #define SID_ATTR_NUMBERFORMAT_ADD_AUTO                  TypedWhichId<SfxBoolItem>( SID_SVX_START + 954 )
 #define SID_OPEN_HYPERLINK                              ( SID_SVX_START + 955 )
-#define SID_CTLFONT_STATE                               ( SID_SVX_START + 956 )
-#define SID_VERTICALTEXT_STATE                          ( SID_SVX_START + 957 )
+#define SID_CTLFONT_STATE                               TypedWhichId<SfxBoolItem>( SID_SVX_START + 956 )
+#define SID_VERTICALTEXT_STATE                          TypedWhichId<SfxBoolItem>( SID_SVX_START + 957 )
 #define SID_OPEN_XML_FILTERSETTINGS                     ( SID_SVX_START + 958 )
 #define SID_HANGUL_HANJA_CONVERSION                     ( SID_SVX_START + 959 )
 #define SID_EXTRUSION_TOGGLE                            ( SID_SVX_START + 960 )
@@ -817,7 +817,7 @@ class XFillGradientItem;
 #define SID_FONTWORK_SHAPE                              ( SID_SVX_START + 983 )
 #define SID_FONTWORK_ALIGNMENT                          ( SID_SVX_START + 984 )
 #define SID_FONTWORK_CHARACTER_SPACING                  ( SID_SVX_START + 985 )
-#define SID_FONTWORK_KERN_CHARACTER_PAIRS               ( SID_SVX_START + 986 )
+#define SID_FONTWORK_KERN_CHARACTER_PAIRS               TypedWhichId<SfxBoolItem>( SID_SVX_START + 986 )
 #define SID_DRAW_FONTWORK                               ( SID_SVX_START + 987 )
 #define SID_DRAW_FONTWORK_VERTICAL                      ( SID_SVX_START + 988 )
 
@@ -876,9 +876,9 @@ class XFillGradientItem;
 #define SID_GROW_FONT_SIZE                              ( SID_SVX_START + 1042 )
 #define SID_SHRINK_FONT_SIZE                            ( SID_SVX_START + 1043 )
 // color subtoolbar on graphictoolbar
-#define SID_COLOR_SETTINGS                              ( SID_SVX_START + 1044 )
+#define SID_COLOR_SETTINGS                              TypedWhichId<SfxBoolItem>( SID_SVX_START + 1044 )
 
-#define SID_FM_FORM_DESIGN_TOOLS                        ( SID_SVX_START + 1046 )
+#define SID_FM_FORM_DESIGN_TOOLS                        TypedWhichId<SfxBoolItem>( SID_SVX_START + 1046 )
 #define SID_DRAWTBX_CS_BASIC                            ( SID_SVX_START + 1047 )
 #define SID_DRAWTBX_CS_SYMBOL                           ( SID_SVX_START + 1048 )
 #define SID_DRAWTBX_CS_ARROW                            ( SID_SVX_START + 1049 )
@@ -900,9 +900,9 @@ class XFillGradientItem;
 #define SID_TABLE_MERGE_CELLS                           ( SID_SVX_START + 1070 )
 #define SID_TABLE_SPLIT_CELLS                           ( SID_SVX_START + 1071 )
 #define SID_OPTIMIZE_TABLE                              ( SID_SVX_START + 1072 )
-#define SID_TABLE_VERT_BOTTOM                           ( SID_SVX_START + 1073 )
-#define SID_TABLE_VERT_CENTER                           ( SID_SVX_START + 1074 )
-#define SID_TABLE_VERT_NONE                             ( SID_SVX_START + 1075 )
+#define SID_TABLE_VERT_BOTTOM                           TypedWhichId<SfxBoolItem>( SID_SVX_START + 1073 )
+#define SID_TABLE_VERT_CENTER                           TypedWhichId<SfxBoolItem>( SID_SVX_START + 1074 )
+#define SID_TABLE_VERT_NONE                             TypedWhichId<SfxBoolItem>( SID_SVX_START + 1075 )
 #define SID_TABLE_INSERT_ROW                            ( SID_SVX_START + 1076 )
 #define SID_TABLE_INSERT_COL                            ( SID_SVX_START + 1077 )
 #define SID_TABLE_DELETE_ROW                            ( SID_SVX_START + 1078 )
@@ -977,7 +977,7 @@ class XFillGradientItem;
 #define SID_ATTR_BORDER_DEFAULT_WIDTH                   TypedWhichId<SfxInt64Item>( SID_SVX_START + 1141 )
 // 1142 is used by editeng (SID_ATTR_CHAR_GRABBAG)
 
-#define SID_OFFER_IMPORT                                ( SID_SVX_START + 1143 )
+#define SID_OFFER_IMPORT                                TypedWhichId<SfxBoolItem>( SID_SVX_START + 1143 )
 #define SID_DRAWINGLAYER_FILLSTYLES                     ( SID_SVX_START + 1144)
 #define SID_PARASPACE_INCREASE                          ( SID_SVX_START + 1145 )
 #define SID_PARASPACE_DECREASE                          ( SID_SVX_START + 1146 )
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 90560323842b..348c4ec1fb9f 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -3283,8 +3283,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
         {
             if ( rReq.GetArgs() )
                 GetViewFrame()->SetChildWindow(SvxColorChildWindow::GetChildWindowId(),
-                                        static_cast<const SfxBoolItem&>(rReq.GetArgs()->
-                                        Get(SID_COLOR_CONTROL)).GetValue());
+                                        rReq.GetArgs()->Get(SID_COLOR_CONTROL).GetValue());
             else
                 GetViewFrame()->ToggleChildWindow(SvxColorChildWindow::GetChildWindowId() );
 
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index bd34aa5a0267..e02b54f48845 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -255,8 +255,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest const & rReq )
     {
         case SID_BMPMASK_PIPETTE :
         {
-            mbPipette = static_cast<const SfxBoolItem&>( rReq.GetArgs()->
-                       Get( SID_BMPMASK_PIPETTE ) ).GetValue();
+            mbPipette = rReq.GetArgs()->Get( SID_BMPMASK_PIPETTE ).GetValue();
         }
         break;