diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-18 21:14:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-19 15:40:40 +0200 |
| commit | 2155e04d6343638ca9815d394cbc4f78c2b17c3a (patch) | |
| tree | 0378142f6ce9edb63074291aed45527568e7b254 /sd/source/ui/dlg/navigatr.cxx | |
| parent | cee02e81cd3b55fb46eacf5db5713e8bf4363bcd (diff) | |
make string translation loading more uniform
change various ResId classes that use conversion operator to OUString to
functions that return a OUString
drop various defines
drop unnecessary toString calls
Change-Id: Ibeccdf2b91a46a2ed5b4b74e6024e301a023bc92
Reviewed-on: https://gerrit.libreoffice.org/37817
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/dlg/navigatr.cxx')
| -rw-r--r-- | sd/source/ui/dlg/navigatr.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 76fa5140872b..22157511eb53 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -81,7 +81,7 @@ SdNavigatorWin::SdNavigatorWin(vcl::Window* pParent, SfxBindings* pInBindings) maTlbObjects->SetViewFrame( mpBindings->GetDispatcher()->GetFrame() ); - maTlbObjects->SetAccessibleName(SD_RESSTR(STR_OBJECTS_TREE)); + maTlbObjects->SetAccessibleName(SdResId(STR_OBJECTS_TREE)); maTlbObjects->SetDoubleClickHdl(LINK(this, SdNavigatorWin, ClickObjectHdl)); maTlbObjects->SetSelectionMode(SelectionMode::Single); @@ -271,7 +271,7 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void ) if( nRId > 0 ) { DBG_ASSERT(aHIDs[nID-NAVIGATOR_DRAGTYPE_URL],"HelpId not added!"); - pMenu->InsertItem(nID, SD_RESSTR(nRId), MenuItemBits::RADIOCHECK); + pMenu->InsertItem(nID, SdResId(nRId), MenuItemBits::RADIOCHECK); pMenu->SetHelpId(nID, aHIDs[nID - NAVIGATOR_DRAGTYPE_URL]); } @@ -297,11 +297,11 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void ) pMenu->InsertItem( nShowNamedShapesFilter, - SD_RESSTR(STR_NAVIGATOR_SHOW_NAMED_SHAPES), + SdResId(STR_NAVIGATOR_SHOW_NAMED_SHAPES), MenuItemBits::RADIOCHECK); pMenu->InsertItem( nShowAllShapesFilter, - SD_RESSTR(STR_NAVIGATOR_SHOW_ALL_SHAPES), + SdResId(STR_NAVIGATOR_SHOW_ALL_SHAPES), MenuItemBits::RADIOCHECK); if (maTlbObjects->GetShowAllShapes()) |