Clean up the remaining uses of OUStringConstExpr, and drop it

Change-Id: I30b2ac77b58e2ae1d1e997a0c830c513542b973d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158101
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

3 files changed, 11 insertions, 11 deletions

diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 251548a22353..e0953de3b0e2 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -78,7 +78,7 @@ private:
 
 struct snew_slide_value_info_layout
 {
-    rtl::OUStringConstExpr msBmpResId;
+    OUString msBmpResId;
     TranslateId mpStrResId;
     AutoLayout maAutoLayout;
 };
@@ -87,13 +87,13 @@ struct snew_slide_value_info_layout
 
 constexpr OUStringLiteral EMPTY = u"";
 
-const snew_slide_value_info_layout notes[] =
+constexpr snew_slide_value_info_layout notes[] =
 {
     {BMP_SLIDEN_01, STR_AUTOLAYOUT_NOTES, AUTOLAYOUT_NOTES},
     {EMPTY, {}, AUTOLAYOUT_NONE},
 };
 
-const snew_slide_value_info_layout handout[] =
+constexpr snew_slide_value_info_layout handout[] =
 {
     {BMP_SLIDEH_01, STR_AUTOLAYOUT_HANDOUT1, AUTOLAYOUT_HANDOUT1},
     {BMP_SLIDEH_02, STR_AUTOLAYOUT_HANDOUT2, AUTOLAYOUT_HANDOUT2},
@@ -104,7 +104,7 @@ const snew_slide_value_info_layout handout[] =
     {EMPTY, {}, AUTOLAYOUT_NONE},
 };
 
-const snew_slide_value_info_layout standard[] =
+constexpr snew_slide_value_info_layout standard[] =
 {
     {BMP_LAYOUT_EMPTY,    STR_AUTOLAYOUT_NONE,                 AUTOLAYOUT_NONE         },
     {BMP_LAYOUT_HEAD03,   STR_AUTOLAYOUT_TITLE,                AUTOLAYOUT_TITLE        },
@@ -121,7 +121,7 @@ const snew_slide_value_info_layout standard[] =
     {EMPTY, {}, AUTOLAYOUT_NONE}
 };
 
-const snew_slide_value_info_layout v_standard[] =
+constexpr snew_slide_value_info_layout v_standard[] =
 {
     // vertical
     {BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART,      AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT   },
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index 197afd5f404f..ec22beeedc37 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -185,7 +185,7 @@ namespace {
 
 struct IdMapEntry {
     char const * sid;
-    rtl::OUStringConstExpr bmpid;
+    OUString bmpid;
 };
 
 }
@@ -197,7 +197,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap (
     if ( ! rxCanvas.is())
         return nullptr;
 
-    static IdMapEntry const map[] = {
+    static IdMapEntry constexpr map[] = {
         { "bitmaps/Background.png", BMP_PRESENTERSCREEN_BACKGROUND },
         { "bitmaps/Animation.png",
           BMP_PRESENTERSCREEN_ANIMATION },
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 7826f079b699..6cc93b71c781 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -62,7 +62,7 @@ class ImageButtonHdl;
 const sal_uInt16 gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA };
 const TranslateId gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE };
 
-constexpr rtl::OUStringConstExpr aSmallPlaceHolders[] =
+constexpr OUString aSmallPlaceHolders[] =
 {
     BMP_PLACEHOLDER_TABLE_SMALL,
     BMP_PLACEHOLDER_CHART_SMALL,
@@ -74,7 +74,7 @@ constexpr rtl::OUStringConstExpr aSmallPlaceHolders[] =
     BMP_PLACEHOLDER_MOVIE_SMALL_HOVER
 };
 
-constexpr rtl::OUStringConstExpr aBigPlaceHolders[] =
+constexpr OUString aBigPlaceHolders[] =
 {
     BMP_PLACEHOLDER_TABLE_LARGE,
     BMP_PLACEHOLDER_CHART_LARGE,
@@ -97,8 +97,8 @@ static BitmapEx* getButtonImage( int index, bool large )
     {
         for (size_t i = 0; i < SAL_N_ELEMENTS(aSmallPlaceHolders); i++ )
         {
-            gSmallButtonImages[i].set(OUString(aSmallPlaceHolders[i]));
-            gLargeButtonImages[i].set(OUString(aBigPlaceHolders[i]));
+            gSmallButtonImages[i].set(aSmallPlaceHolders[i]);
+            gLargeButtonImages[i].set(aBigPlaceHolders[i]);
         }
     }