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/objface.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/objface.hxx')
| -rw-r--r-- | include/sfx2/objface.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index aa0056332916..e8b12ec54cec 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -25,6 +25,7 @@ #include <sal/types.h> #include <sfx2/dllapi.h> #include <sfx2/msg.hxx> +#include <sfx2/toolbarids.hxx> #include <tools/resid.hxx> struct SfxInterface_Impl; @@ -65,12 +66,12 @@ public: const SfxInterface* GetGenoType() const { return pGenoType; } - void RegisterObjectBar(sal_uInt16, SfxVisibilityFlags nFlags, sal_uInt32 nResId); - void RegisterObjectBar(sal_uInt16, SfxVisibilityFlags nFlags, sal_uInt32 nResId, SfxShellFeature nFeature); + void RegisterObjectBar(sal_uInt16, SfxVisibilityFlags nFlags, ToolbarId eId); + void RegisterObjectBar(sal_uInt16, SfxVisibilityFlags nFlags, ToolbarId eId, SfxShellFeature nFeature); void RegisterChildWindow(sal_uInt16, bool bContext = false); void RegisterChildWindow(sal_uInt16, bool bContext, SfxShellFeature nFeature); void RegisterStatusBar(sal_uInt32 nResId); - sal_uInt32 GetObjectBarId(sal_uInt16 nNo) const; + ToolbarId GetObjectBarId(sal_uInt16 nNo) const; sal_uInt16 GetObjectBarPos( sal_uInt16 nNo ) const; SfxVisibilityFlags GetObjectBarFlags( sal_uInt16 nNo ) const; SfxShellFeature GetObjectBarFeature(sal_uInt16 nNo) const; |