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 /sd/source/ui/view/viewshel.cxx | |
| 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 'sd/source/ui/view/viewshel.cxx')
| -rw-r--r-- | sd/source/ui/view/viewshel.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index b741231d7986..61dd557f5d07 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -1639,33 +1639,33 @@ SfxShell* ViewShellObjectBarFactory::CreateShell( ::sd::ShellId nId ) ::sd::View* pView = mrViewShell.GetView(); switch (nId) { - case RID_BEZIER_TOOLBOX: + case ToolbarId::Bezier_Toolbox_Sd: pShell = new ::sd::BezierObjectBar(&mrViewShell, pView); break; - case RID_DRAW_TEXT_TOOLBOX: + case ToolbarId::Draw_Text_Toolbox_Sd: pShell = new ::sd::TextObjectBar( &mrViewShell, mrViewShell.GetDoc()->GetPool(), pView); break; - case RID_DRAW_GRAF_TOOLBOX: + case ToolbarId::Draw_Graf_Toolbox: pShell = new ::sd::GraphicObjectBar(&mrViewShell, pView); break; - case RID_DRAW_MEDIA_TOOLBOX: + case ToolbarId::Draw_Media_Toolbox: pShell = new ::sd::MediaObjectBar(&mrViewShell, pView); break; - case RID_DRAW_TABLE_TOOLBOX: + case ToolbarId::Draw_Table_Toolbox: pShell = ::sd::ui::table::CreateTableObjectBar( mrViewShell, pView ); break; - case RID_SVX_EXTRUSION_BAR: + case ToolbarId::Svx_Extrusion_Bar: pShell = new svx::ExtrusionBar( &mrViewShell.GetViewShellBase()); break; - case RID_SVX_FONTWORK_BAR: + case ToolbarId::Svx_Fontwork_Bar: pShell = new svx::FontworkBar( &mrViewShell.GetViewShellBase()); break; |