diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-10 12:48:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-15 08:24:29 +0100 |
| commit | 3588a48a82d37f940595570758bc1d1179d18b84 (patch) | |
| tree | daa314ae437771157a53f8a5d5043a685f399ac3 /include/svx/svdobj.hxx | |
| parent | a8f31d5120c2ae9109d316db73b5adf9cb26c892 (diff) | |
TypedWhichId
use a strong-typedef template to give which IDs a type, which we can
carry around to do a
(a) little bit more convenience when Get()'ing them
and
(b) a little bit of enforcement of which PoolItem subclass each ID uses
Fix a bug in casting EE_PARA_BULLETSTATE to the wrong subclass
in AccessibleEditableTextPara::_correctValues
Change-Id: I015ce8b3b0f6d21308af182afa3caf122c877a5b
Reviewed-on: https://gerrit.libreoffice.org/44587
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svx/svdobj.hxx')
| -rw-r--r-- | include/svx/svdobj.hxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index cd6953312565..af4f7ec72e21 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -27,6 +27,7 @@ #include <vcl/vclptr.hxx> #include <svl/lstner.hxx> #include <svl/poolitem.hxx> +#include <svl/typedwhich.hxx> #include <svx/svdtypes.hxx> #include <svx/xenum.hxx> #include <svx/svxdllapi.h> @@ -581,6 +582,11 @@ public: void ClearMergedItem(const sal_uInt16 nWhich = 0); void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false); const SfxPoolItem& GetMergedItem(const sal_uInt16 nWhich) const; + template<class T> + const T& GetMergedItem( TypedWhichId<T> nWhich ) const + { + return static_cast<const T&>(GetMergedItem(nWhich.Which())); + } // syntactical sugar for ItemSet accesses void SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClearAllItems = false); |