diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-30 16:50:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-31 15:07:00 +0200 |
| commit | 490e9dbade4f9d69cab4b1ec435944c9b4d2f6c2 (patch) | |
| tree | 9ee234da59e1ae7528efd45bb53d48d051697071 /include/sfx2/dispatch.hxx | |
| parent | e0e12738449063abd9aad34ef78d26183ff11d6a (diff) | |
disambiguate dual use of toolbar ids
for toolbar title string resource and identifier (for config)
Change-Id: I2657c3cbb586a62d8075db7cb43cc064b2030f28
Reviewed-on: https://gerrit.libreoffice.org/38274
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/sfx2/dispatch.hxx')
| -rw-r--r-- | include/sfx2/dispatch.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index cde10c2929fb..b089764713e9 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -22,6 +22,7 @@ #include <memory> #include <sal/config.h> #include <sfx2/dllapi.h> +#include <sfx2/toolbarids.hxx> #include <sal/types.h> #include <sfx2/bindings.hxx> @@ -161,7 +162,7 @@ public: sal_uInt16 nCount = 0, const sal_uInt16 *pSIDs = nullptr ); void HideUI( bool bHide = true ); - sal_uInt32 GetObjectBarId( sal_uInt16 nPos ) const; + ToolbarId GetObjectBarId( sal_uInt16 nPos ) const; SfxItemState QueryState( sal_uInt16 nSID, const SfxPoolItem* &rpState ); SfxItemState QueryState( sal_uInt16 nSID, css::uno::Any& rAny ); |