use implict conversion operator in TypedWhichId

instead of spreading calls to Which() everywhere.

Change-Id: Ie32d106e44f5cb583908eeebe254ab8b8168ae61
Reviewed-on: https://gerrit.libreoffice.org/44760
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 24 insertions, 42 deletions

diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 4f0be32b9dee..b426c4cdae0b 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -323,7 +323,7 @@ public:
     template<class T>
     const T&            GetParaAttrib( sal_Int32 nPara, TypedWhichId<T> nWhich )
     {
-        return static_cast<const T&>(GetParaAttrib(nPara, nWhich.Which()));
+        return static_cast<const T&>(GetParaAttrib(nPara, sal_uInt16(nWhich)));
     }
 
     vcl::Font       GetStandardFont( sal_Int32 nPara );
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index d55a5da31123..321fa2ad5826 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -70,8 +70,8 @@ class SvxItemPropertySet;
 #define WID_PARAISNUMBERINGRESTART  OWN_ATTR_VALUE_START+4
 
 #define SVX_UNOEDIT_NUMBERING_PROPERTIE \
-    {OUString(UNO_NAME_NUMBERING_RULES),        EE_PARA_NUMBULLET.Which(),  cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 }, \
-    {OUString(UNO_NAME_NUMBERING),              EE_PARA_BULLETSTATE.Which(),cppu::UnoType<bool>::get(), 0, 0 }
+    {OUString(UNO_NAME_NUMBERING_RULES),        EE_PARA_NUMBULLET,  cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 }, \
+    {OUString(UNO_NAME_NUMBERING),              EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 }
 
 #define SVX_UNOEDIT_OUTLINER_PROPERTIES \
     SVX_UNOEDIT_NUMBERING_PROPERTIE, \
@@ -138,18 +138,18 @@ class SvxItemPropertySet;
 #define SVX_UNOEDIT_PARA_PROPERTIES \
     {OUString(UNO_NAME_EDIT_PARA_ADJUST),       EE_PARA_JUST,               ::cppu::UnoType<sal_Int16>::get(),            0, MID_PARA_ADJUST }, \
     {OUString(UNO_NAME_EDIT_PARA_BMARGIN),      EE_PARA_ULSPACE,            ::cppu::UnoType<sal_Int32>::get(),            0, MID_LO_MARGIN|SFX_METRIC_ITEM }, \
-    {OUString(UNO_NAME_EDIT_PARA_IS_HYPHEN),    EE_PARA_HYPHENATE.Which(),  ::cppu::UnoType<bool>::get(),                0, 0 }, \
+    {OUString(UNO_NAME_EDIT_PARA_IS_HYPHEN),    EE_PARA_HYPHENATE,  ::cppu::UnoType<bool>::get(),                0, 0 }, \
     {OUString(UNO_NAME_EDIT_PARA_LASTLINEADJ),  EE_PARA_JUST,               ::cppu::UnoType<sal_Int16>::get(),            0, MID_LAST_LINE_ADJUST }, \
-    {OUString(UNO_NAME_EDIT_PARA_LMARGIN),      EE_PARA_LRSPACE.Which(),    ::cppu::UnoType<sal_Int32>::get(),            0, MID_TXT_LMARGIN|SFX_METRIC_ITEM }, \
+    {OUString(UNO_NAME_EDIT_PARA_LMARGIN),      EE_PARA_LRSPACE,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_TXT_LMARGIN|SFX_METRIC_ITEM }, \
     {OUString(UNO_NAME_EDIT_PARA_LINESPACING),  EE_PARA_SBL,                cppu::UnoType<css::style::LineSpacing>::get(),     0, CONVERT_TWIPS}, \
-    {OUString(UNO_NAME_EDIT_PARA_RMARGIN),      EE_PARA_LRSPACE.Which(),    ::cppu::UnoType<sal_Int32>::get(),            0, MID_R_MARGIN|SFX_METRIC_ITEM }, \
+    {OUString(UNO_NAME_EDIT_PARA_RMARGIN),      EE_PARA_LRSPACE,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_R_MARGIN|SFX_METRIC_ITEM }, \
     {OUString(UNO_NAME_EDIT_PARA_TAPSTOPS),     EE_PARA_TABS,               cppu::UnoType<css::uno::Sequence< css::style::TabStop >>::get(), 0, 0 }, \
     {OUString(UNO_NAME_EDIT_PARA_TMARGIN),      EE_PARA_ULSPACE,            ::cppu::UnoType<sal_Int32>::get(),            0, MID_UP_MARGIN|SFX_METRIC_ITEM },\
-    {OUString(UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT),     EE_PARA_LRSPACE.Which(),   ::cppu::UnoType<sal_Int32>::get(),            0, MID_FIRST_LINE_INDENT|SFX_METRIC_ITEM}, \
-    {OUString(UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION),EE_PARA_HANGINGPUNCTUATION.Which(),  cppu::UnoType<bool>::get(),                0 ,0 }, \
-    {OUString(UNO_NAME_EDIT_PARA_IS_CHARACTER_DISTANCE), EE_PARA_ASIANCJKSPACING.Which(),   cppu::UnoType<bool>::get(),                0 ,0 }, \
-    {OUString(UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES),    EE_PARA_FORBIDDENRULES.Which(),     cppu::UnoType<bool>::get(),                0 ,0 },\
-    {OUString("WritingMode"),                   EE_PARA_WRITINGDIR.Which(), ::cppu::UnoType<sal_Int16>::get(),            0, 0 }
+    {OUString(UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT),     EE_PARA_LRSPACE,   ::cppu::UnoType<sal_Int32>::get(),            0, MID_FIRST_LINE_INDENT|SFX_METRIC_ITEM}, \
+    {OUString(UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION),EE_PARA_HANGINGPUNCTUATION,  cppu::UnoType<bool>::get(),                0 ,0 }, \
+    {OUString(UNO_NAME_EDIT_PARA_IS_CHARACTER_DISTANCE), EE_PARA_ASIANCJKSPACING,   cppu::UnoType<bool>::get(),                0 ,0 }, \
+    {OUString(UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES),    EE_PARA_FORBIDDENRULES,     cppu::UnoType<bool>::get(),                0 ,0 },\
+    {OUString("WritingMode"),                   EE_PARA_WRITINGDIR, ::cppu::UnoType<sal_Int16>::get(),            0, 0 }
 
 class SvxEditSource;
 class SvxTextForwarder;
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 22ea12cf4e24..f4f5d86f3a08 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -105,7 +105,7 @@ public:
 
     const SfxPoolItem*              GetPoolDefaultItem( sal_uInt16 nWhich ) const;
     template<class T> const T*      GetPoolDefaultItem( TypedWhichId<T> nWhich ) const
-    { return static_cast<const T*>(GetPoolDefaultItem(nWhich.Which())); }
+    { return static_cast<const T*>(GetPoolDefaultItem(sal_uInt16(nWhich))); }
 
     void                            ResetPoolDefaultItem( sal_uInt16 nWhich );
 
@@ -155,17 +155,17 @@ public:
 
     const SfxPoolItem&              GetDefaultItem( sal_uInt16 nWhich ) const;
     template<class T> const T&      GetDefaultItem( TypedWhichId<T> nWhich ) const
-    { return static_cast<const T&>(GetDefaultItem(nWhich.Which())); }
+    { return static_cast<const T&>(GetDefaultItem(sal_uInt16(nWhich))); }
 
     bool                            CheckItemInPool(const SfxPoolItem *) const;
 
     const SfxPoolItem *             GetItem2(sal_uInt16 nWhich, sal_uInt32 nSurrogate) const;
     template<class T> const T*      GetItem2( TypedWhichId<T> nWhich, sal_uInt32 nSurrogate ) const
-    { return dynamic_cast<const T*>(GetItem2(nWhich.Which(), nSurrogate)); }
+    { return dynamic_cast<const T*>(GetItem2(sal_uInt16(nWhich), nSurrogate)); }
 
     const SfxPoolItem *             GetItem2Default(sal_uInt16 nWhich) const;
     template<class T> const T*      GetItem2Default( TypedWhichId<T> nWhich ) const
-    { return static_cast<const T*>(GetItem2Default(nWhich.Which())); }
+    { return static_cast<const T*>(GetItem2Default(sal_uInt16(nWhich))); }
 
     sal_uInt32                      GetItemCount2(sal_uInt16 nWhich) const;
 
@@ -184,8 +184,6 @@ public:
                                     { return IsItemPoolable( rItem.Which() ); }
     void                            SetItemInfos( const SfxItemInfo *pInfos );
     sal_uInt16                      GetWhich( sal_uInt16 nSlot, bool bDeep = true ) const;
-    template<class T> sal_uInt16    GetWhich( TypedWhichId<T> nSlot, bool bDeep = true ) const
-    { return GetWhich(nSlot.Which(), bDeep); }
     sal_uInt16                      GetSlotId( sal_uInt16 nWhich ) const;
     sal_uInt16                      GetTrueWhich( sal_uInt16 nSlot, bool bDeep = true ) const;
     sal_uInt16                      GetTrueSlotId( sal_uInt16 nWhich ) const;
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 3254263c38ab..9291fd430421 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -135,7 +135,7 @@ public:
     template<class T>
     const T&                    Get( TypedWhichId<T> nWhich, bool bSrchInParent = true ) const
     {
-        return static_cast<const T&>(Get(nWhich.Which(), bSrchInParent));
+        return static_cast<const T&>(Get(sal_uInt16(nWhich), bSrchInParent));
     }
 
     /** This method eases accessing single Items in the SfxItemSet.
@@ -157,7 +157,7 @@ public:
     }
     template<class T> const T* GetItem( TypedWhichId<T> nWhich, bool bSearchInParent = true ) const
     {
-        const SfxPoolItem* pItem = GetItem(nWhich.Which(), bSearchInParent);
+        const SfxPoolItem* pItem = GetItem(sal_uInt16(nWhich), bSearchInParent);
         const T* pCastedItem = dynamic_cast<const T*>(pItem);
 
         assert(!pItem || pCastedItem); // if it exists, must have the correct type
@@ -181,23 +181,12 @@ public:
     SfxItemState                GetItemState(   sal_uInt16 nWhich,
                                                 bool bSrchInParent = true,
                                                 const SfxPoolItem **ppItem = nullptr ) const;
-    template<class T>
-    SfxItemState                GetItemState(   TypedWhichId<T> nWhich,
-                                                bool bSrchInParent = true,
-                                                const SfxPoolItem **ppItem = nullptr ) const
-    { return GetItemState(nWhich.Which(), bSrchInParent, ppItem); }
 
     bool                        HasItem(sal_uInt16 nWhich, const SfxPoolItem** ppItem = nullptr) const;
 
     void                        DisableItem(sal_uInt16 nWhich);
-    template<class T> void      DisableItem( TypedWhichId<T> nWhich )
-    { DisableItem(nWhich.Which()); }
     void                        InvalidateItem( sal_uInt16 nWhich );
-    template<class T> void      InvalidateItem( TypedWhichId<T> nWhich )
-    { InvalidateItem(nWhich.Which()); }
     sal_uInt16                  ClearItem( sal_uInt16 nWhich = 0);
-    template<class T> sal_uInt16 ClearItem( TypedWhichId<T> nWhich )
-    { return ClearItem(nWhich.Which()); }
     void                        ClearInvalidItems();
     void                        InvalidateAllItems(); // HACK(via nWhich = 0) ???
 
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 2d5a6f567c0b..1f49b16400a5 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -150,10 +150,6 @@ public:
                                  assert(m_nRefCount==0);
                                  m_nWhich = nId;
                              }
-    template<class T> void   SetWhich( TypedWhichId<T> nId )
-    {
-        SetWhich(nId.Which());
-    }
     sal_uInt16               Which() const { return m_nWhich; }
     virtual bool             operator==( const SfxPoolItem& ) const = 0;
     bool                     operator!=( const SfxPoolItem& rItem ) const
@@ -180,7 +176,7 @@ public:
     SfxPoolItem*             CloneSetWhich( sal_uInt16 nNewWhich ) const;
     template<class T> T*     CloneSetWhich( TypedWhichId<T> nId ) const
     {
-        return static_cast<T*>(CloneSetWhich(nId.Which()));
+        return static_cast<T*>(CloneSetWhich(sal_uInt16(nId)));
     }
 
     sal_uInt32               GetRefCount() const { return m_nRefCount; }
diff --git a/include/svl/typedwhich.hxx b/include/svl/typedwhich.hxx
index c9cb3d8e3667..2c2141250d02 100644
--- a/include/svl/typedwhich.hxx
+++ b/include/svl/typedwhich.hxx
@@ -23,27 +23,26 @@ public:
         : mnWhich(nWhich)
     {
     }
-    constexpr sal_uInt16 Which() const { return mnWhich; }
-    //constexpr operator sal_uInt16() const { return mnWhich; }
+    constexpr operator sal_uInt16() const { return mnWhich; }
 private:
     sal_uInt16 const mnWhich;
 };
 
 template <class T> constexpr bool operator==(sal_uInt16 lhs, TypedWhichId<T> const& rhs)
 {
-    return lhs == rhs.Which();
+    return lhs == sal_uInt16(rhs);
 }
 template <class T> constexpr bool operator!=(sal_uInt16 lhs, TypedWhichId<T> const& rhs)
 {
-    return lhs != rhs.Which();
+    return lhs != sal_uInt16(rhs);
 }
 template <class T> constexpr bool operator==(TypedWhichId<T> const& lhs, sal_uInt16 rhs)
 {
-    return lhs.Which() == rhs;
+    return sal_uInt16(lhs) == rhs;
 }
 template <class T> constexpr bool operator!=(TypedWhichId<T> const& lhs, sal_uInt16 rhs)
 {
-    return lhs.Which() != rhs;
+    return sal_uInt16(lhs) != rhs;
 }
 
 #endif // INCLUDED_SVL_TYPEDWHICH_HXX
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index af4f7ec72e21..2a7c629a05d3 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -585,7 +585,7 @@ public:
     template<class T>
     const T&           GetMergedItem( TypedWhichId<T> nWhich ) const
     {
-        return static_cast<const T&>(GetMergedItem(nWhich.Which()));
+        return static_cast<const T&>(GetMergedItem(sal_uInt16(nWhich)));
     }
 
     // syntactical sugar for ItemSet accesses