From c92c0776829aaa04b924bf970396a312994af8d0 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 8 Dec 2021 15:16:49 +0200 Subject: use more OUStringLiteral in various and remove some unused defines Change-Id: Ie560fccb674568ba88175d2e68ca83b92cfcf312 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126544 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sw/source/uibase/ribbar/workctrl.cxx | 46 ++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'sw/source/uibase/ribbar/workctrl.cxx') diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index ed95ca1cdb1b..08f034bda388 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -184,29 +184,29 @@ static sal_uInt16 aNavigationInsertIds[ NAVI_ENTRIES ] = NID_FIELD_BYTYPE }; -std::u16string_view const aNavigationImgIds[ NAVI_ENTRIES ] = -{ - u"" RID_BMP_RIBBAR_TBL, - u"" RID_BMP_RIBBAR_FRM, - u"" RID_BMP_RIBBAR_GRF, - u"" RID_BMP_RIBBAR_OLE, - u"" RID_BMP_RIBBAR_PGE, - u"" RID_BMP_RIBBAR_OUTL, - u"" RID_BMP_RIBBAR_MARK, - u"" RID_BMP_RIBBAR_DRW, - u"" RID_BMP_RIBBAR_CTRL, - u"" RID_BMP_RIBBAR_REG, - u"" RID_BMP_RIBBAR_BKM, - u"" RID_BMP_RIBBAR_SEL, - u"" RID_BMP_RIBBAR_FTN, - u"" RID_BMP_RIBBAR_POSTIT, - u"" RID_BMP_RIBBAR_REP, - u"" RID_BMP_RIBBAR_ENTRY, - u"" RID_BMP_RIBBAR_FORMULA, - u"" RID_BMP_RIBBAR_ERROR, - u"" RID_BMP_RIBBAR_RECENCY, - u"" RID_BMP_RIBBAR_FIELD, - u"" RID_BMP_RIBBAR_FIELD_BYTYPE +rtl::OUStringConstExpr constexpr aNavigationImgIds[ NAVI_ENTRIES ] = +{ + RID_BMP_RIBBAR_TBL, + RID_BMP_RIBBAR_FRM, + RID_BMP_RIBBAR_GRF, + RID_BMP_RIBBAR_OLE, + RID_BMP_RIBBAR_PGE, + RID_BMP_RIBBAR_OUTL, + RID_BMP_RIBBAR_MARK, + RID_BMP_RIBBAR_DRW, + RID_BMP_RIBBAR_CTRL, + RID_BMP_RIBBAR_REG, + RID_BMP_RIBBAR_BKM, + RID_BMP_RIBBAR_SEL, + RID_BMP_RIBBAR_FTN, + RID_BMP_RIBBAR_POSTIT, + RID_BMP_RIBBAR_REP, + RID_BMP_RIBBAR_ENTRY, + RID_BMP_RIBBAR_FORMULA, + RID_BMP_RIBBAR_ERROR, + RID_BMP_RIBBAR_RECENCY, + RID_BMP_RIBBAR_FIELD, + RID_BMP_RIBBAR_FIELD_BYTYPE }; const TranslateId aNavigationStrIds[ NAVI_ENTRIES ] = -- cgit