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 /starmath | |
| 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 'starmath')
| -rw-r--r-- | starmath/inc/starmath.hrc | 2 | ||||
| -rw-r--r-- | starmath/source/view.cxx | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 5ec6852f5ef8..7775cb9fab64 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -82,8 +82,6 @@ #define RID_PRINTUIOPT_FITTOPAGE (RID_APP_START + 18) #define RID_PRINTUIOPT_SCALING (RID_APP_START + 19) -#define RID_MATH_TOOLBOX (RID_APP_START + 50) - #define RID_FONTREGULAR (RID_APP_START + 804) #define RID_FONTITALIC (RID_APP_START + 805) #define RID_FONTBOLD (RID_APP_START + 806) diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index af8ffbe9bf7a..c1dfacf8570f 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -869,7 +869,7 @@ void SmViewShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS, SfxVisibilityFlags::Standard | SfxVisibilityFlags::FullScreen | SfxVisibilityFlags::Server, - RID_MATH_TOOLBOX); + ToolbarId::Math_Toolbox); //Dummy-Objectbar, to avoid quiver while activating GetStaticInterface()->RegisterChildWindow(SmCmdBoxWrapper::GetChildWindowId()); |