Extended loplugin:ostr: Rewrite some O[U]StringLiteral -> O[U]String

...in include files.  This is a mix of automatic rewriting in include files and
manual fixups (mostly addressing loplugin:redundantfcast) in source files that
include those.

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

12 files changed, 346 insertions, 350 deletions

diff --git a/sd/inc/bitmaps.hlst b/sd/inc/bitmaps.hlst
index b508112e4881..87dbab4e4a7c 100644
--- a/sd/inc/bitmaps.hlst
+++ b/sd/inc/bitmaps.hlst
@@ -12,206 +12,206 @@
 #include <rtl/ustring.hxx>
 
 // preview bitmaps for layouts
-inline constexpr OUStringLiteral BMP_LAYOUT_EMPTY = u"sd/res/layout_empty.png";
-inline constexpr OUStringLiteral BMP_LAYOUT_HEAD01 = u"sd/res/layout_head01.png";
-inline constexpr OUStringLiteral BMP_LAYOUT_HEAD02 = u"sd/res/layout_head02.png";
-inline constexpr OUStringLiteral BMP_LAYOUT_HEAD02A = u"sd/res/layout_head02a.png";
-inline constexpr OUStringLiteral BMP_LAYOUT_HEAD02B = u"sd/res/layout_head02b.png";
-inline constexpr OUStringLiteral BMP_LAYOUT_HEAD03 = u"sd/res/layout_head03.png";
-inline constexpr OUStringLiteral BMP_LAYOUT_HEAD03A = u"sd/res/layout_head03a.png";
-inline constexpr OUStringLiteral BMP_LAYOUT_HEAD03B = u"sd/res/layout_head03b.png";
-inline constexpr OUStringLiteral BMP_LAYOUT_HEAD03C = u"sd/res/layout_head03c.png";
-inline constexpr OUStringLiteral BMP_LAYOUT_HEAD04 = u"sd/res/layout_head04.png";
-inline constexpr OUStringLiteral BMP_LAYOUT_HEAD06 = u"sd/res/layout_head06.png";
-inline constexpr OUStringLiteral BMP_LAYOUT_TEXTONLY = u"sd/res/layout_textonly.png";
-inline constexpr OUStringLiteral BMP_LAYOUT_VERTICAL01 = u"sd/res/layout_vertical01.png";
-inline constexpr OUStringLiteral BMP_LAYOUT_VERTICAL02 = u"sd/res/layout_vertical02.png";
-inline constexpr OUStringLiteral BMP_SLIDE_NONE = u"sd/res/foilnone.png";
-inline constexpr OUStringLiteral BMP_SLIDEH_01 = u"sd/res/foilh01.png";
-inline constexpr OUStringLiteral BMP_SLIDEH_02 = u"sd/res/foilh02.png";
-inline constexpr OUStringLiteral BMP_SLIDEH_03 = u"sd/res/foilh03.png";
-inline constexpr OUStringLiteral BMP_SLIDEH_04 = u"sd/res/foilh04.png";
-inline constexpr OUStringLiteral BMP_SLIDEH_06 = u"sd/res/foilh06.png";
-inline constexpr OUStringLiteral BMP_SLIDEH_09 = u"sd/res/foilh09.png";
-inline constexpr OUStringLiteral BMP_DISPLAYMODE_SLIDE = u"sd/res/displaymode_slide.png";
-inline constexpr OUStringLiteral BMP_DISPLAYMODE_OUTLINE = u"sd/res/displaymode_outline.png";
-inline constexpr OUStringLiteral BMP_DISPLAYMODE_NOTES = u"sd/res/displaymode_notes.png";
-inline constexpr OUStringLiteral BMP_DISPLAYMODE_SLIDE_SORTER = u"sd/res/displaymode_slidesorter.png";
-inline constexpr OUStringLiteral BMP_DISPLAYMODE_SLIDE_MASTER = u"sd/res/displaymode_slidemaster.png";
-inline constexpr OUStringLiteral BMP_DISPLAYMODE_NOTES_MASTER = u"sd/res/displaymode_notesmaster.png";
-inline constexpr OUStringLiteral BMP_DISPLAYMODE_HANDOUT_MASTER = u"sd/res/displaymode_handoutmaster.png";
-inline constexpr OUStringLiteral BMP_PLACEHOLDER_CHART_SMALL = u"sd/res/placeholder_chart_small.png";
-inline constexpr OUStringLiteral BMP_PLACEHOLDER_CHART_SMALL_HOVER = u"sd/res/placeholder_chart_small_hover.png";
-inline constexpr OUStringLiteral BMP_PLACEHOLDER_IMAGE_SMALL = u"sd/res/placeholder_image_small.png";
-inline constexpr OUStringLiteral BMP_PLACEHOLDER_IMAGE_SMALL_HOVER = u"sd/res/placeholder_image_small_hover.png";
-inline constexpr OUStringLiteral BMP_PLACEHOLDER_MOVIE_SMALL = u"sd/res/placeholder_movie_small.png";
-inline constexpr OUStringLiteral BMP_PLACEHOLDER_MOVIE_SMALL_HOVER = u"sd/res/placeholder_movie_small_hover.png";
-inline constexpr OUStringLiteral BMP_PLACEHOLDER_TABLE_SMALL = u"sd/res/placeholder_table_small.png";
-inline constexpr OUStringLiteral BMP_PLACEHOLDER_TABLE_SMALL_HOVER = u"sd/res/placeholder_table_small_hover.png";
-inline constexpr OUStringLiteral BMP_PLACEHOLDER_CHART_LARGE = u"sd/res/placeholder_chart_large.png";
-inline constexpr OUStringLiteral BMP_PLACEHOLDER_CHART_LARGE_HOVER = u"sd/res/placeholder_chart_large_hover.png";
-inline constexpr OUStringLiteral BMP_PLACEHOLDER_IMAGE_LARGE = u"sd/res/placeholder_image_large.png";
-inline constexpr OUStringLiteral BMP_PLACEHOLDER_IMAGE_LARGE_HOVER = u"sd/res/placeholder_image_large_hover.png";
-inline constexpr OUStringLiteral BMP_PLACEHOLDER_MOVIE_LARGE = u"sd/res/placeholder_movie_large.png";
-inline constexpr OUStringLiteral BMP_PLACEHOLDER_MOVIE_LARGE_HOVER = u"sd/res/placeholder_movie_large_hover.png";
-inline constexpr OUStringLiteral BMP_PLACEHOLDER_TABLE_LARGE = u"sd/res/placeholder_table_large.png";
-inline constexpr OUStringLiteral BMP_PLACEHOLDER_TABLE_LARGE_HOVER = u"sd/res/placeholder_table_large_hover.png";
-inline constexpr OUStringLiteral BMP_SLIDEN_01 = u"sd/res/foiln01.png";
-inline constexpr OUStringLiteral BMP_PAGE = u"sd/res/page.png"; 
-inline constexpr OUStringLiteral BMP_PAGE_EXCLUDED = u"sd/res/pageexcl.png"; 
-inline constexpr OUStringLiteral BMP_PAGEOBJS_EXCLUDED = u"sd/res/pagobjex.png"; 
-inline constexpr OUStringLiteral BMP_PAGEOBJS = u"sd/res/pageobjs.png"; 
-inline constexpr OUStringLiteral BMP_OBJECTS = u"sd/res/objects.png"; 
-inline constexpr OUStringLiteral BMP_OLE = u"sd/res/ole.png"; 
-inline constexpr OUStringLiteral BMP_GROUP = u"sd/res/group.png"; 
-inline constexpr OUStringLiteral BMP_DOC_OPEN = u"sd/res/docopen.png"; 
-inline constexpr OUStringLiteral BMP_DOC_TEXT = u"sd/res/doctext.png" ;
-inline constexpr OUStringLiteral BMP_GRAPHIC = u"sd/res/graphic.png"; 
-inline constexpr OUStringLiteral BMP_STYLES_FAMILY_GRAPHICS = u"sd/res/sf01.png"; 
-inline constexpr OUStringLiteral BMP_STYLES_FAMILY_PRESENTATIONS = u"sd/res/sf02.png"; 
-inline constexpr OUStringLiteral BMP_PRESOBJ_GRAPHIC = u"sd/res/image.png";
-inline constexpr OUStringLiteral BMP_PRESOBJ_OBJECT = u"sd/res/object.png";
-inline constexpr OUStringLiteral BMP_PRESOBJ_CHART = u"sd/res/chart.png";
-inline constexpr OUStringLiteral BMP_PRESOBJ_ORGCHART = u"sd/res/orgchart.png";
-inline constexpr OUStringLiteral BMP_PRESOBJ_TABLE = u"sd/res/table.png";
-inline constexpr OUStringLiteral BMP_POINTER_ICON = u"sd/res/pointericon.png";
-inline constexpr OUStringLiteral BMP_WAIT_ICON = u"sd/res/waiticon.png";
-inline constexpr OUStringLiteral BMP_FADE_EFFECT_INDICATOR = u"sd/res/fade_effect_indicator.png";
-inline constexpr OUStringLiteral BMP_CUSTOM_ANIMATION_INDICATOR = u"sd/res/click_16.png";
-inline constexpr OUStringLiteral BMP_INSERT_TABLESTYLE = u"sd/res/addtablestyle.png";
+inline constexpr OUString BMP_LAYOUT_EMPTY = u"sd/res/layout_empty.png"_ustr;
+inline constexpr OUString BMP_LAYOUT_HEAD01 = u"sd/res/layout_head01.png"_ustr;
+inline constexpr OUString BMP_LAYOUT_HEAD02 = u"sd/res/layout_head02.png"_ustr;
+inline constexpr OUString BMP_LAYOUT_HEAD02A = u"sd/res/layout_head02a.png"_ustr;
+inline constexpr OUString BMP_LAYOUT_HEAD02B = u"sd/res/layout_head02b.png"_ustr;
+inline constexpr OUString BMP_LAYOUT_HEAD03 = u"sd/res/layout_head03.png"_ustr;
+inline constexpr OUString BMP_LAYOUT_HEAD03A = u"sd/res/layout_head03a.png"_ustr;
+inline constexpr OUString BMP_LAYOUT_HEAD03B = u"sd/res/layout_head03b.png"_ustr;
+inline constexpr OUString BMP_LAYOUT_HEAD03C = u"sd/res/layout_head03c.png"_ustr;
+inline constexpr OUString BMP_LAYOUT_HEAD04 = u"sd/res/layout_head04.png"_ustr;
+inline constexpr OUString BMP_LAYOUT_HEAD06 = u"sd/res/layout_head06.png"_ustr;
+inline constexpr OUString BMP_LAYOUT_TEXTONLY = u"sd/res/layout_textonly.png"_ustr;
+inline constexpr OUString BMP_LAYOUT_VERTICAL01 = u"sd/res/layout_vertical01.png"_ustr;
+inline constexpr OUString BMP_LAYOUT_VERTICAL02 = u"sd/res/layout_vertical02.png"_ustr;
+inline constexpr OUString BMP_SLIDE_NONE = u"sd/res/foilnone.png"_ustr;
+inline constexpr OUString BMP_SLIDEH_01 = u"sd/res/foilh01.png"_ustr;
+inline constexpr OUString BMP_SLIDEH_02 = u"sd/res/foilh02.png"_ustr;
+inline constexpr OUString BMP_SLIDEH_03 = u"sd/res/foilh03.png"_ustr;
+inline constexpr OUString BMP_SLIDEH_04 = u"sd/res/foilh04.png"_ustr;
+inline constexpr OUString BMP_SLIDEH_06 = u"sd/res/foilh06.png"_ustr;
+inline constexpr OUString BMP_SLIDEH_09 = u"sd/res/foilh09.png"_ustr;
+inline constexpr OUString BMP_DISPLAYMODE_SLIDE = u"sd/res/displaymode_slide.png"_ustr;
+inline constexpr OUString BMP_DISPLAYMODE_OUTLINE = u"sd/res/displaymode_outline.png"_ustr;
+inline constexpr OUString BMP_DISPLAYMODE_NOTES = u"sd/res/displaymode_notes.png"_ustr;
+inline constexpr OUString BMP_DISPLAYMODE_SLIDE_SORTER = u"sd/res/displaymode_slidesorter.png"_ustr;
+inline constexpr OUString BMP_DISPLAYMODE_SLIDE_MASTER = u"sd/res/displaymode_slidemaster.png"_ustr;
+inline constexpr OUString BMP_DISPLAYMODE_NOTES_MASTER = u"sd/res/displaymode_notesmaster.png"_ustr;
+inline constexpr OUString BMP_DISPLAYMODE_HANDOUT_MASTER = u"sd/res/displaymode_handoutmaster.png"_ustr;
+inline constexpr OUString BMP_PLACEHOLDER_CHART_SMALL = u"sd/res/placeholder_chart_small.png"_ustr;
+inline constexpr OUString BMP_PLACEHOLDER_CHART_SMALL_HOVER = u"sd/res/placeholder_chart_small_hover.png"_ustr;
+inline constexpr OUString BMP_PLACEHOLDER_IMAGE_SMALL = u"sd/res/placeholder_image_small.png"_ustr;
+inline constexpr OUString BMP_PLACEHOLDER_IMAGE_SMALL_HOVER = u"sd/res/placeholder_image_small_hover.png"_ustr;
+inline constexpr OUString BMP_PLACEHOLDER_MOVIE_SMALL = u"sd/res/placeholder_movie_small.png"_ustr;
+inline constexpr OUString BMP_PLACEHOLDER_MOVIE_SMALL_HOVER = u"sd/res/placeholder_movie_small_hover.png"_ustr;
+inline constexpr OUString BMP_PLACEHOLDER_TABLE_SMALL = u"sd/res/placeholder_table_small.png"_ustr;
+inline constexpr OUString BMP_PLACEHOLDER_TABLE_SMALL_HOVER = u"sd/res/placeholder_table_small_hover.png"_ustr;
+inline constexpr OUString BMP_PLACEHOLDER_CHART_LARGE = u"sd/res/placeholder_chart_large.png"_ustr;
+inline constexpr OUString BMP_PLACEHOLDER_CHART_LARGE_HOVER = u"sd/res/placeholder_chart_large_hover.png"_ustr;
+inline constexpr OUString BMP_PLACEHOLDER_IMAGE_LARGE = u"sd/res/placeholder_image_large.png"_ustr;
+inline constexpr OUString BMP_PLACEHOLDER_IMAGE_LARGE_HOVER = u"sd/res/placeholder_image_large_hover.png"_ustr;
+inline constexpr OUString BMP_PLACEHOLDER_MOVIE_LARGE = u"sd/res/placeholder_movie_large.png"_ustr;
+inline constexpr OUString BMP_PLACEHOLDER_MOVIE_LARGE_HOVER = u"sd/res/placeholder_movie_large_hover.png"_ustr;
+inline constexpr OUString BMP_PLACEHOLDER_TABLE_LARGE = u"sd/res/placeholder_table_large.png"_ustr;
+inline constexpr OUString BMP_PLACEHOLDER_TABLE_LARGE_HOVER = u"sd/res/placeholder_table_large_hover.png"_ustr;
+inline constexpr OUString BMP_SLIDEN_01 = u"sd/res/foiln01.png"_ustr;
+inline constexpr OUString BMP_PAGE = u"sd/res/page.png"_ustr; 
+inline constexpr OUString BMP_PAGE_EXCLUDED = u"sd/res/pageexcl.png"_ustr; 
+inline constexpr OUString BMP_PAGEOBJS_EXCLUDED = u"sd/res/pagobjex.png"_ustr; 
+inline constexpr OUString BMP_PAGEOBJS = u"sd/res/pageobjs.png"_ustr; 
+inline constexpr OUString BMP_OBJECTS = u"sd/res/objects.png"_ustr; 
+inline constexpr OUString BMP_OLE = u"sd/res/ole.png"_ustr; 
+inline constexpr OUString BMP_GROUP = u"sd/res/group.png"_ustr; 
+inline constexpr OUString BMP_DOC_OPEN = u"sd/res/docopen.png"_ustr; 
+inline constexpr OUString BMP_DOC_TEXT = u"sd/res/doctext.png"_ustr ;
+inline constexpr OUString BMP_GRAPHIC = u"sd/res/graphic.png"_ustr; 
+inline constexpr OUString BMP_STYLES_FAMILY_GRAPHICS = u"sd/res/sf01.png"_ustr; 
+inline constexpr OUString BMP_STYLES_FAMILY_PRESENTATIONS = u"sd/res/sf02.png"_ustr; 
+inline constexpr OUString BMP_PRESOBJ_GRAPHIC = u"sd/res/image.png"_ustr;
+inline constexpr OUString BMP_PRESOBJ_OBJECT = u"sd/res/object.png"_ustr;
+inline constexpr OUString BMP_PRESOBJ_CHART = u"sd/res/chart.png"_ustr;
+inline constexpr OUString BMP_PRESOBJ_ORGCHART = u"sd/res/orgchart.png"_ustr;
+inline constexpr OUString BMP_PRESOBJ_TABLE = u"sd/res/table.png"_ustr;
+inline constexpr OUString BMP_POINTER_ICON = u"sd/res/pointericon.png"_ustr;
+inline constexpr OUString BMP_WAIT_ICON = u"sd/res/waiticon.png"_ustr;
+inline constexpr OUString BMP_FADE_EFFECT_INDICATOR = u"sd/res/fade_effect_indicator.png"_ustr;
+inline constexpr OUString BMP_CUSTOM_ANIMATION_INDICATOR = u"sd/res/click_16.png"_ustr;
+inline constexpr OUString BMP_INSERT_TABLESTYLE = u"sd/res/addtablestyle.png"_ustr;
 // Presenter Screen bitmaps:
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_LEFT = u"sd/res/presenterscreen-BorderLeft.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_DISABLED = u"sd/res/presenterscreen-ButtonSlideNextDisabled.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_SELECTED = u"sd/res/presenterscreen-ButtonSlidePreviousSelected.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP = u"sd/res/presenterscreen-BorderCurrentSlideTop.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_NOTES_SELECTED = u"sd/res/presenterscreen-ButtonNotesSelected.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_SELECTED = u"sd/res/presenterscreen-ScrollbarArrowDownSelected.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BACKGROUND = u"sd/res/presenterscreen-Background.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_ANIMATION = u"sd/res/presenterscreen-Animation.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_TRANSITION = u"sd/res/presenterscreen-Transition.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_RIGHT = u"sd/res/presenterscreen-BorderRight.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP = u"sd/res/presenterscreen-BorderActiveTop.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_HELP_DISABLED = u"sd/res/presenterscreen-ButtonHelpDisabled.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_RIGHT = u"sd/res/presenterscreen-BorderActiveRight.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_NORMAL = u"sd/res/presenterscreen-ButtonFrameCenterNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarThumbMiddleMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_RIGHT = u"sd/res/presenterscreen-BorderCurrentSlideBottomRight.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOP_LEFT = u"sd/res/presenterscreen-BorderTopLeft.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM = u"sd/res/presenterscreen-BorderActiveBottom.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_BOTTOM_LEFT = u"sd/res/presenterscreen-BorderBottomLeft.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP = u"sd/res/presenterscreen-BorderToolbarTop.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT = u"sd/res/presenterscreen-BorderActiveLeft.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL = u"sd/res/presenterscreen-ButtonHelpNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_EXIT_PRESENTER_NORMAL = u"sd/res/presenterscreen-ButtonExitPresenterNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SEPARATOR = u"sd/res/presenterscreen-Separator.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_CALLOUT = u"sd/res/presenterscreen-BorderActiveBottomCallout.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOOLBAR_LEFT = u"sd/res/presenterscreen-BorderToolbarLeft.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_NORMAL = u"sd/res/presenterscreen-ButtonSlideSorterNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_NORMAL = u"sd/res/presenterscreen-ScrollbarPagerMiddleNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_NORMAL = u"sd/res/presenterscreen-ButtonFrameRightNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_MOUSE_OVER = u"sd/res/presenterscreen-ButtonEffectNextMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarThumbTopMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_DISABLED = u"sd/res/presenterscreen-ButtonEffectNextDisabled.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonFrameCenterMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_LEFT = u"sd/res/presenterscreen-BorderCurrentSlideLeft.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_MOUSE_OVER = u"sd/res/presenterscreen-ButtonFrameLeftMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_HELP_SELECTED = u"sd/res/presenterscreen-ButtonHelpSelected.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_VIEW_BACKGROUND = u"sd/res/presenterscreen-ViewBackground.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_NOTES_MOUSE_OVER = u"sd/res/presenterscreen-ButtonNotesMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_PLUS_MOUSE_OVER = u"sd/res/presenterscreen-ButtonPlusMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_SELECTED = u"sd/res/presenterscreen-ButtonSlideSorterSelected.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_RIGHT = u"sd/res/presenterscreen-LabelMouseOverRight.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_NORMAL = u"sd/res/presenterscreen-ButtonSwitchMonitorNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_NORMAL = u"sd/res/presenterscreen-ButtonRestartTimerNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_PAUSE_TIMER_NORMAL = u"sd/res/presenterscreen-ButtonPauseTimerNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_RESUME_TIMER_NORMAL = u"sd/res/presenterscreen-ButtonResumeTimerNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOOLBAR_RIGHT = u"sd/res/presenterscreen-BorderToolbarRight.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_NORMAL = u"sd/res/presenterscreen-ScrollbarThumbMiddleNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_SELECTED = u"sd/res/presenterscreen-ButtonEffectNextSelected.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_NORMAL = u"sd/res/presenterscreen-ScrollbarArrowDownNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_RIGHT = u"sd/res/presenterscreen-BorderCurrentSlideTopRight.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_PLUS_NORMAL = u"sd/res/presenterscreen-ButtonPlusNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_RIGHT = u"sd/res/presenterscreen-BorderToolbarTopRight.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_MINUS_DISABLED = u"sd/res/presenterscreen-ButtonMinusDisabled.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_DISABLED = u"sd/res/presenterscreen-ScrollbarArrowDownDisabled.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_MOUSE_OVER = u"sd/res/presenterscreen-ButtonFrameRightMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_MOUSE_OVER = u"sd/res/presenterscreen-ButtonSwitchMonitorMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonRestartTimerMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_PAUSE_TIMER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonPauseTimerMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_RESUME_TIMER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonResumeTimerMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_DISABLED = u"sd/res/presenterscreen-ButtonSlidePreviousDisabled.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_MINUS_SELECTED = u"sd/res/presenterscreen-ButtonMinusSelected.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_CENTER = u"sd/res/presenterscreen-LabelMouseOverCenter.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_MOUSE_OVER = u"sd/res/presenterscreen-ButtonSlideNextMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_NORMAL = u"sd/res/presenterscreen-ButtonSlideNextNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_MOUSE_OVER = u"sd/res/presenterscreen-ButtonSlidePreviousMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOP = u"sd/res/presenterscreen-BorderTop.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_NORMAL = u"sd/res/presenterscreen-ButtonFrameLeftNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarArrowUpMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_NOTES_NORMAL = u"sd/res/presenterscreen-ButtonNotesNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_DISABLED = u"sd/res/presenterscreen-ButtonSlideSorterDisabled.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_NORMAL = u"sd/res/presenterscreen-ButtonEffectNextNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_LEFT = u"sd/res/presenterscreen-BorderToolbarTopLeft.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_RIGHT = u"sd/res/presenterscreen-BorderActiveBottomRight.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_BOTTOM = u"sd/res/presenterscreen-BorderBottom.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_LEFT = u"sd/res/presenterscreen-BorderActiveBottomLeft.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarArrowDownMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_PLUS_SELECTED = u"sd/res/presenterscreen-ButtonPlusSelected.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_RIGHT = u"sd/res/presenterscreen-BorderActiveTopRight.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_NORMAL = u"sd/res/presenterscreen-ButtonSlidePreviousNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonSlideSorterMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_MINUS_MOUSE_OVER = u"sd/res/presenterscreen-ButtonMinusMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_NOTES_DISABLED = u"sd/res/presenterscreen-ButtonNotesDisabled.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_LEFT = u"sd/res/presenterscreen-BorderCurrentSlideBottomLeft.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOP_RIGHT = u"sd/res/presenterscreen-BorderTopRight.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_HELP_MOUSE_OVER = u"sd/res/presenterscreen-ButtonHelpMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_EXIT_PRESENTER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonExitPresenterMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL = u"sd/res/presenterscreen-ScrollbarThumbTopNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_SELECTED = u"sd/res/presenterscreen-ScrollbarArrowUpSelected.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_DISABLED = u"sd/res/presenterscreen-ScrollbarArrowUpDisabled.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_NORMAL = u"sd/res/presenterscreen-ScrollbarArrowUpNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOOLBAR_BOTTOM = u"sd/res/presenterscreen-BorderToolbarBottom.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_LEFT = u"sd/res/presenterscreen-BorderCurrentSlideTopLeft.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_MINUS_NORMAL = u"sd/res/presenterscreen-ButtonMinusNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarThumbBottomMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_LEFT = u"sd/res/presenterscreen-BorderActiveTopLeft.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM = u"sd/res/presenterscreen-BorderCurrentSlideBottom.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarPagerMiddleMouseOver.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_LEFT = u"sd/res/presenterscreen-LabelMouseOverLeft.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_RIGHT = u"sd/res/presenterscreen-BorderCurrentSlideRight.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_BOTTOM_RIGHT = u"sd/res/presenterscreen-BorderBottomRight.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL = u"sd/res/presenterscreen-ScrollbarThumbBottomNormal.png";
-inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED = u"sd/res/presenterscreen-ButtonPlusDisabled.png";
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_LEFT = u"sd/res/presenterscreen-BorderLeft.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_DISABLED = u"sd/res/presenterscreen-ButtonSlideNextDisabled.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_SELECTED = u"sd/res/presenterscreen-ButtonSlidePreviousSelected.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP = u"sd/res/presenterscreen-BorderCurrentSlideTop.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_NOTES_SELECTED = u"sd/res/presenterscreen-ButtonNotesSelected.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_SELECTED = u"sd/res/presenterscreen-ScrollbarArrowDownSelected.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BACKGROUND = u"sd/res/presenterscreen-Background.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_ANIMATION = u"sd/res/presenterscreen-Animation.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_TRANSITION = u"sd/res/presenterscreen-Transition.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_RIGHT = u"sd/res/presenterscreen-BorderRight.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP = u"sd/res/presenterscreen-BorderActiveTop.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_HELP_DISABLED = u"sd/res/presenterscreen-ButtonHelpDisabled.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_ACTIVE_RIGHT = u"sd/res/presenterscreen-BorderActiveRight.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_NORMAL = u"sd/res/presenterscreen-ButtonFrameCenterNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarThumbMiddleMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_RIGHT = u"sd/res/presenterscreen-BorderCurrentSlideBottomRight.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_TOP_LEFT = u"sd/res/presenterscreen-BorderTopLeft.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM = u"sd/res/presenterscreen-BorderActiveBottom.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_BOTTOM_LEFT = u"sd/res/presenterscreen-BorderBottomLeft.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP = u"sd/res/presenterscreen-BorderToolbarTop.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT = u"sd/res/presenterscreen-BorderActiveLeft.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL = u"sd/res/presenterscreen-ButtonHelpNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_EXIT_PRESENTER_NORMAL = u"sd/res/presenterscreen-ButtonExitPresenterNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_SEPARATOR = u"sd/res/presenterscreen-Separator.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_CALLOUT = u"sd/res/presenterscreen-BorderActiveBottomCallout.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_TOOLBAR_LEFT = u"sd/res/presenterscreen-BorderToolbarLeft.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_NORMAL = u"sd/res/presenterscreen-ButtonSlideSorterNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_NORMAL = u"sd/res/presenterscreen-ScrollbarPagerMiddleNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_NORMAL = u"sd/res/presenterscreen-ButtonFrameRightNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_MOUSE_OVER = u"sd/res/presenterscreen-ButtonEffectNextMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarThumbTopMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_DISABLED = u"sd/res/presenterscreen-ButtonEffectNextDisabled.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonFrameCenterMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_LEFT = u"sd/res/presenterscreen-BorderCurrentSlideLeft.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_MOUSE_OVER = u"sd/res/presenterscreen-ButtonFrameLeftMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_HELP_SELECTED = u"sd/res/presenterscreen-ButtonHelpSelected.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_VIEW_BACKGROUND = u"sd/res/presenterscreen-ViewBackground.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_NOTES_MOUSE_OVER = u"sd/res/presenterscreen-ButtonNotesMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_PLUS_MOUSE_OVER = u"sd/res/presenterscreen-ButtonPlusMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_SELECTED = u"sd/res/presenterscreen-ButtonSlideSorterSelected.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_RIGHT = u"sd/res/presenterscreen-LabelMouseOverRight.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_NORMAL = u"sd/res/presenterscreen-ButtonSwitchMonitorNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_NORMAL = u"sd/res/presenterscreen-ButtonRestartTimerNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_PAUSE_TIMER_NORMAL = u"sd/res/presenterscreen-ButtonPauseTimerNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_RESUME_TIMER_NORMAL = u"sd/res/presenterscreen-ButtonResumeTimerNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_TOOLBAR_RIGHT = u"sd/res/presenterscreen-BorderToolbarRight.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_NORMAL = u"sd/res/presenterscreen-ScrollbarThumbMiddleNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_SELECTED = u"sd/res/presenterscreen-ButtonEffectNextSelected.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_NORMAL = u"sd/res/presenterscreen-ScrollbarArrowDownNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_RIGHT = u"sd/res/presenterscreen-BorderCurrentSlideTopRight.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_PLUS_NORMAL = u"sd/res/presenterscreen-ButtonPlusNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_RIGHT = u"sd/res/presenterscreen-BorderToolbarTopRight.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_MINUS_DISABLED = u"sd/res/presenterscreen-ButtonMinusDisabled.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_DISABLED = u"sd/res/presenterscreen-ScrollbarArrowDownDisabled.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_MOUSE_OVER = u"sd/res/presenterscreen-ButtonFrameRightMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_MOUSE_OVER = u"sd/res/presenterscreen-ButtonSwitchMonitorMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonRestartTimerMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_PAUSE_TIMER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonPauseTimerMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_RESUME_TIMER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonResumeTimerMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_DISABLED = u"sd/res/presenterscreen-ButtonSlidePreviousDisabled.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_MINUS_SELECTED = u"sd/res/presenterscreen-ButtonMinusSelected.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_CENTER = u"sd/res/presenterscreen-LabelMouseOverCenter.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_MOUSE_OVER = u"sd/res/presenterscreen-ButtonSlideNextMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_NORMAL = u"sd/res/presenterscreen-ButtonSlideNextNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_MOUSE_OVER = u"sd/res/presenterscreen-ButtonSlidePreviousMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_TOP = u"sd/res/presenterscreen-BorderTop.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_NORMAL = u"sd/res/presenterscreen-ButtonFrameLeftNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarArrowUpMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_NOTES_NORMAL = u"sd/res/presenterscreen-ButtonNotesNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_DISABLED = u"sd/res/presenterscreen-ButtonSlideSorterDisabled.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_NORMAL = u"sd/res/presenterscreen-ButtonEffectNextNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_LEFT = u"sd/res/presenterscreen-BorderToolbarTopLeft.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_RIGHT = u"sd/res/presenterscreen-BorderActiveBottomRight.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_BOTTOM = u"sd/res/presenterscreen-BorderBottom.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_LEFT = u"sd/res/presenterscreen-BorderActiveBottomLeft.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarArrowDownMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_PLUS_SELECTED = u"sd/res/presenterscreen-ButtonPlusSelected.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_RIGHT = u"sd/res/presenterscreen-BorderActiveTopRight.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_NORMAL = u"sd/res/presenterscreen-ButtonSlidePreviousNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonSlideSorterMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_MINUS_MOUSE_OVER = u"sd/res/presenterscreen-ButtonMinusMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_NOTES_DISABLED = u"sd/res/presenterscreen-ButtonNotesDisabled.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_LEFT = u"sd/res/presenterscreen-BorderCurrentSlideBottomLeft.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_TOP_RIGHT = u"sd/res/presenterscreen-BorderTopRight.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_HELP_MOUSE_OVER = u"sd/res/presenterscreen-ButtonHelpMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_EXIT_PRESENTER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonExitPresenterMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL = u"sd/res/presenterscreen-ScrollbarThumbTopNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_SELECTED = u"sd/res/presenterscreen-ScrollbarArrowUpSelected.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_DISABLED = u"sd/res/presenterscreen-ScrollbarArrowUpDisabled.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_NORMAL = u"sd/res/presenterscreen-ScrollbarArrowUpNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_TOOLBAR_BOTTOM = u"sd/res/presenterscreen-BorderToolbarBottom.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_LEFT = u"sd/res/presenterscreen-BorderCurrentSlideTopLeft.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_MINUS_NORMAL = u"sd/res/presenterscreen-ButtonMinusNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarThumbBottomMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_LEFT = u"sd/res/presenterscreen-BorderActiveTopLeft.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM = u"sd/res/presenterscreen-BorderCurrentSlideBottom.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarPagerMiddleMouseOver.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_LEFT = u"sd/res/presenterscreen-LabelMouseOverLeft.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_RIGHT = u"sd/res/presenterscreen-BorderCurrentSlideRight.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_BOTTOM_RIGHT = u"sd/res/presenterscreen-BorderBottomRight.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL = u"sd/res/presenterscreen-ScrollbarThumbBottomNormal.png"_ustr;
+inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED = u"sd/res/presenterscreen-ButtonPlusDisabled.png"_ustr;
 
-inline constexpr OUStringLiteral BMP_EMBEDDED = u"sd/res/nv08.png"; 
-inline constexpr OUStringLiteral BMP_LINK = u"sd/res/nv09.png"; 
-inline constexpr OUStringLiteral BMP_HYPERLINK = u"sd/res/nv010.png"; 
+inline constexpr OUString BMP_EMBEDDED = u"sd/res/nv08.png"_ustr; 
+inline constexpr OUString BMP_LINK = u"sd/res/nv09.png"_ustr; 
+inline constexpr OUString BMP_HYPERLINK = u"sd/res/nv010.png"_ustr; 
 
-inline constexpr OUStringLiteral IMAGE_SHADOW = u"sd/res/slide_sorter_shadow.png";
-inline constexpr OUStringLiteral IMAGE_INSERT_SHADOW = u"sd/res/slide_sorter_insert_shadow.png";
-inline constexpr OUStringLiteral IMAGE_HIDE_SLIDE_OVERLAY = u"sd/res/slide_sorter_hide_slide_overlay.png";
-inline constexpr OUStringLiteral IMAGE_FOCUS_BORDER = u"sd/res/slide_sorter_focus_border.png";
+inline constexpr OUString IMAGE_SHADOW = u"sd/res/slide_sorter_shadow.png"_ustr;
+inline constexpr OUString IMAGE_INSERT_SHADOW = u"sd/res/slide_sorter_insert_shadow.png"_ustr;
+inline constexpr OUString IMAGE_HIDE_SLIDE_OVERLAY = u"sd/res/slide_sorter_hide_slide_overlay.png"_ustr;
+inline constexpr OUString IMAGE_FOCUS_BORDER = u"sd/res/slide_sorter_focus_border.png"_ustr;
 
-inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_ON_CLICK = u"sd/res/click_16.png";
-inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_AFTER_PREVIOUS = u"sd/res/time_16.png";
-inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_ENTRANCE_EFFECT = u"sd/res/effect_16.png";
-inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_EMPHASIS_EFFECT = u"sd/res/effectshape_16.png";
-inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_EXIT_EFFECT = u"sd/res/effectfade_16.png";
-inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_MOTION_PATH = u"sd/res/effectpath_16.png";
-inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_OLE = u"sd/res/effectole_16.png";
-inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_MEDIA_PLAY = u"sd/res/playblue_16.png";
-inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_MEDIA_PAUSE = u"sd/res/breakplayingblue_16.png";
-inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_MEDIA_STOP = u"sd/res/stopplayingblue_16.png";
+inline constexpr OUString BMP_CUSTOMANIMATION_ON_CLICK = u"sd/res/click_16.png"_ustr;
+inline constexpr OUString BMP_CUSTOMANIMATION_AFTER_PREVIOUS = u"sd/res/time_16.png"_ustr;
+inline constexpr OUString BMP_CUSTOMANIMATION_ENTRANCE_EFFECT = u"sd/res/effect_16.png"_ustr;
+inline constexpr OUString BMP_CUSTOMANIMATION_EMPHASIS_EFFECT = u"sd/res/effectshape_16.png"_ustr;
+inline constexpr OUString BMP_CUSTOMANIMATION_EXIT_EFFECT = u"sd/res/effectfade_16.png"_ustr;
+inline constexpr OUString BMP_CUSTOMANIMATION_MOTION_PATH = u"sd/res/effectpath_16.png"_ustr;
+inline constexpr OUString BMP_CUSTOMANIMATION_OLE = u"sd/res/effectole_16.png"_ustr;
+inline constexpr OUString BMP_CUSTOMANIMATION_MEDIA_PLAY = u"sd/res/playblue_16.png"_ustr;
+inline constexpr OUString BMP_CUSTOMANIMATION_MEDIA_PAUSE = u"sd/res/breakplayingblue_16.png"_ustr;
+inline constexpr OUString BMP_CUSTOMANIMATION_MEDIA_STOP = u"sd/res/stopplayingblue_16.png"_ustr;
 
-inline constexpr OUStringLiteral BMP_MENU_NEXT = u"cmd/sc_nextrecord.png";
-inline constexpr OUStringLiteral BMP_MENU_PREV = u"cmd/sc_prevrecord.png";
-inline constexpr OUStringLiteral BMP_MENU_FIRST = u"cmd/sc_firstrecord.png";
-inline constexpr OUStringLiteral BMP_MENU_LAST = u"cmd/sc_lastrecord.png";
+inline constexpr OUString BMP_MENU_NEXT = u"cmd/sc_nextrecord.png"_ustr;
+inline constexpr OUString BMP_MENU_PREV = u"cmd/sc_prevrecord.png"_ustr;
+inline constexpr OUString BMP_MENU_FIRST = u"cmd/sc_firstrecord.png"_ustr;
+inline constexpr OUString BMP_MENU_LAST = u"cmd/sc_lastrecord.png"_ustr;
 
-inline constexpr OUStringLiteral BMP_PREV_SLIDE = u"sd/res/prevslide.png";
-inline constexpr OUStringLiteral BMP_NEXT_SLIDE = u"sd/res/nextslide.png";
-inline constexpr OUStringLiteral BMP_MENU_SLIDE = u"sd/res/slideshowmenu.png";
+inline constexpr OUString BMP_PREV_SLIDE = u"sd/res/prevslide.png"_ustr;
+inline constexpr OUString BMP_NEXT_SLIDE = u"sd/res/nextslide.png"_ustr;
+inline constexpr OUString BMP_MENU_SLIDE = u"sd/res/slideshowmenu.png"_ustr;
 
-inline constexpr OUStringLiteral SFX_BMP_CLOSE_DOC = u"sfx2/res/closedoc.png";
+inline constexpr OUString SFX_BMP_CLOSE_DOC = u"sfx2/res/closedoc.png"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx
index 6ecfc3fd39ce..a6ddf50705e5 100644
--- a/sd/inc/glob.hxx
+++ b/sd/inc/glob.hxx
@@ -46,7 +46,7 @@
 // SVX_IMAPINFO_ID = 2
 
 // Separator between layout name and template name of presentation templates
-inline constexpr OUStringLiteral SD_LT_SEPARATOR = u"~LT~";
+inline constexpr OUString SD_LT_SEPARATOR = u"~LT~"_ustr;
 
 // option-stream identifier
 #define SD_OPTION_MORPHING  u"Morph"
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index 6579bd43ff79..bcd28e15f1c1 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -21,35 +21,35 @@
 
 #include <rtl/ustring.hxx>
 
-inline constexpr OUStringLiteral HID_SDDRAWVIEWSHELL = u"SD_HID_SDDRAWVIEWSHELL";
-inline constexpr OUStringLiteral HID_SDGRAPHICVIEWSHELL = u"SD_HID_SDGRAPHICVIEWSHELL";
-inline constexpr OUStringLiteral HID_SDOUTLINEVIEWSHELL = u"SD_HID_SDOUTLINEVIEWSHELL";
+inline constexpr OUString HID_SDDRAWVIEWSHELL = u"SD_HID_SDDRAWVIEWSHELL"_ustr;
+inline constexpr OUString HID_SDGRAPHICVIEWSHELL = u"SD_HID_SDGRAPHICVIEWSHELL"_ustr;
+inline constexpr OUString HID_SDOUTLINEVIEWSHELL = u"SD_HID_SDOUTLINEVIEWSHELL"_ustr;
 
-inline constexpr OUStringLiteral HID_SD_WIN_PRESENTATION = u"SD_HID_SD_WIN_PRESENTATION";
+inline constexpr OUString HID_SD_WIN_PRESENTATION = u"SD_HID_SD_WIN_PRESENTATION"_ustr;
 
-inline constexpr OUStringLiteral HID_SD_TABBAR_PAGES = u"SD_HID_SD_TABBAR_PAGES";
-inline constexpr OUStringLiteral HID_SD_TABBAR_LAYERS = u"SD_HID_SD_TABBAR_LAYERS";
+inline constexpr OUString HID_SD_TABBAR_PAGES = u"SD_HID_SD_TABBAR_PAGES"_ustr;
+inline constexpr OUString HID_SD_TABBAR_LAYERS = u"SD_HID_SD_TABBAR_LAYERS"_ustr;
 
-inline constexpr OUStringLiteral HID_SD_NAMEDIALOG_OBJECT = u"SD_HID_SD_NAMEDIALOG_OBJECT";
-inline constexpr OUStringLiteral HID_SD_NAMEDIALOG_PAGE = u"SD_HID_SD_NAMEDIALOG_PAGE";
-inline constexpr OUStringLiteral HID_SD_NAMEDIALOG_LINEEND = u"SD_HID_SD_NAMEDIALOG_LINEEND";
+inline constexpr OUString HID_SD_NAMEDIALOG_OBJECT = u"SD_HID_SD_NAMEDIALOG_OBJECT"_ustr;
+inline constexpr OUString HID_SD_NAMEDIALOG_PAGE = u"SD_HID_SD_NAMEDIALOG_PAGE"_ustr;
+inline constexpr OUString HID_SD_NAMEDIALOG_LINEEND = u"SD_HID_SD_NAMEDIALOG_LINEEND"_ustr;
 
-inline constexpr OUStringLiteral HID_SD_TASK_PANE_PREVIEW_CURRENT = u"SD_HID_SD_TASK_PANE_PREVIEW_CURRENT";
-inline constexpr OUStringLiteral HID_SD_TASK_PANE_PREVIEW_RECENT = u"SD_HID_SD_TASK_PANE_PREVIEW_RECENT";
-inline constexpr OUStringLiteral HID_SD_TASK_PANE_PREVIEW_ALL = u"SD_HID_SD_TASK_PANE_PREVIEW_ALL";
-inline constexpr OUStringLiteral HID_SD_TASK_PANE_PREVIEW_LAYOUTS = u"SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS";
+inline constexpr OUString HID_SD_TASK_PANE_PREVIEW_CURRENT = u"SD_HID_SD_TASK_PANE_PREVIEW_CURRENT"_ustr;
+inline constexpr OUString HID_SD_TASK_PANE_PREVIEW_RECENT = u"SD_HID_SD_TASK_PANE_PREVIEW_RECENT"_ustr;
+inline constexpr OUString HID_SD_TASK_PANE_PREVIEW_ALL = u"SD_HID_SD_TASK_PANE_PREVIEW_ALL"_ustr;
+inline constexpr OUString HID_SD_TASK_PANE_PREVIEW_LAYOUTS = u"SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS"_ustr;
 
-inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX";
-inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX";
-inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX";
-inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX";
-inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX";
-inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX";
-inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX";
-inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX";
+inline constexpr OUString HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX"_ustr;
+inline constexpr OUString HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX"_ustr;
+inline constexpr OUString HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX"_ustr;
+inline constexpr OUString HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX"_ustr;
+inline constexpr OUString HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX"_ustr;
+inline constexpr OUString HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX"_ustr;
+inline constexpr OUString HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX"_ustr;
+inline constexpr OUString HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX"_ustr;
 
 
-inline constexpr OUStringLiteral HID_SD_RULER_HORIZONTAL = u"SD_HID_SD_RULER_HORIZONTAL";
-inline constexpr OUStringLiteral HID_SD_RULER_VERTICAL = u"SD_HID_SD_RULER_VERTICAL";
+inline constexpr OUString HID_SD_RULER_HORIZONTAL = u"SD_HID_SD_RULER_HORIZONTAL"_ustr;
+inline constexpr OUString HID_SD_RULER_VERTICAL = u"SD_HID_SD_RULER_VERTICAL"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index 6c79485bb31a..6100f99e4c17 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -20,7 +20,7 @@
 
 #include <rtl/ustring.hxx>
 
-inline constexpr OUStringLiteral CMD_SID_HANDOUT_MASTER_MODE = u".uno:HandoutMode";
-inline constexpr OUStringLiteral CMD_SID_NOTES_MODE = u".uno:NotesMode";
+inline constexpr OUString CMD_SID_HANDOUT_MASTER_MODE = u".uno:HandoutMode"_ustr;
+inline constexpr OUString CMD_SID_NOTES_MODE = u".uno:NotesMode"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/strings.hxx b/sd/inc/strings.hxx
index ed8fb7dd3738..6fe0ea594c3f 100644
--- a/sd/inc/strings.hxx
+++ b/sd/inc/strings.hxx
@@ -12,12 +12,12 @@
 #include <rtl/ustring.hxx>
 
 /* do not translate */
-inline constexpr OUStringLiteral STR_LAYOUT_TITLE = u"Titel";
-inline constexpr OUStringLiteral STR_LAYOUT_OUTLINE = u"Gliederung";
-inline constexpr OUStringLiteral STR_LAYOUT_BACKGROUND = u"Hintergrund";
-inline constexpr OUStringLiteral STR_LAYOUT_BACKGROUNDOBJECTS = u"Hintergrundobjekte";
-inline constexpr OUStringLiteral STR_LAYOUT_NOTES = u"Notizen";
-inline constexpr OUStringLiteral STR_LAYOUT_SUBTITLE = u"Untertitel";
+inline constexpr OUString STR_LAYOUT_TITLE = u"Titel"_ustr;
+inline constexpr OUString STR_LAYOUT_OUTLINE = u"Gliederung"_ustr;
+inline constexpr OUString STR_LAYOUT_BACKGROUND = u"Hintergrund"_ustr;
+inline constexpr OUString STR_LAYOUT_BACKGROUNDOBJECTS = u"Hintergrundobjekte"_ustr;
+inline constexpr OUString STR_LAYOUT_NOTES = u"Notizen"_ustr;
+inline constexpr OUString STR_LAYOUT_SUBTITLE = u"Untertitel"_ustr;
 #define STR_HTMLEXP_DEFAULT_EXTENSION   ".html"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sd/source/console/PresenterConfigurationAccess.hxx b/sd/source/console/PresenterConfigurationAccess.hxx
index afd1b9aa4e87..68e03f8fe51d 100644
--- a/sd/source/console/PresenterConfigurationAccess.hxx
+++ b/sd/source/console/PresenterConfigurationAccess.hxx
@@ -52,8 +52,8 @@ public:
     typedef ::std::function<bool (
         const OUString&,
         const css::uno::Reference<css::beans::XPropertySet>&)> Predicate;
-    static constexpr OUStringLiteral msPresenterScreenRootName =
-        u"/org.openoffice.Office.PresenterScreen/";
+    static constexpr OUString msPresenterScreenRootName =
+        u"/org.openoffice.Office.PresenterScreen/"_ustr;
 
     /** Create a new object to access the configuration entries below the
         given root.
diff --git a/sd/source/console/PresenterPaneFactory.hxx b/sd/source/console/PresenterPaneFactory.hxx
index 5685dca06826..1145cd5327af 100644
--- a/sd/source/console/PresenterPaneFactory.hxx
+++ b/sd/source/console/PresenterPaneFactory.hxx
@@ -51,14 +51,14 @@ class PresenterPaneFactory
       public PresenterPaneFactoryInterfaceBase
 {
 public:
-    static constexpr OUStringLiteral msCurrentSlidePreviewPaneURL
-        = u"private:resource/pane/Presenter/Pane1";
-    static constexpr OUStringLiteral msNextSlidePreviewPaneURL
-        = u"private:resource/pane/Presenter/Pane2";
-    static constexpr OUStringLiteral msNotesPaneURL = u"private:resource/pane/Presenter/Pane3";
-    static constexpr OUStringLiteral msToolBarPaneURL = u"private:resource/pane/Presenter/Pane4";
-    static constexpr OUStringLiteral msSlideSorterPaneURL
-        = u"private:resource/pane/Presenter/Pane5";
+    static constexpr OUString msCurrentSlidePreviewPaneURL
+        = u"private:resource/pane/Presenter/Pane1"_ustr;
+    static constexpr OUString msNextSlidePreviewPaneURL
+        = u"private:resource/pane/Presenter/Pane2"_ustr;
+    static constexpr OUString msNotesPaneURL = u"private:resource/pane/Presenter/Pane3"_ustr;
+    static constexpr OUString msToolBarPaneURL = u"private:resource/pane/Presenter/Pane4"_ustr;
+    static constexpr OUString msSlideSorterPaneURL
+        = u"private:resource/pane/Presenter/Pane5"_ustr;
 
     /** Create a new instance of this class and register it as resource
         factory in the drawing framework of the given controller.
diff --git a/sd/source/console/PresenterViewFactory.hxx b/sd/source/console/PresenterViewFactory.hxx
index 3f31342f2ce1..cf2a66a5553c 100644
--- a/sd/source/console/PresenterViewFactory.hxx
+++ b/sd/source/console/PresenterViewFactory.hxx
@@ -78,15 +78,15 @@ class PresenterViewFactory
       public PresenterViewFactoryInterfaceBase
 {
 public:
-    static constexpr OUStringLiteral msCurrentSlidePreviewViewURL
-        = u"private:resource/view/Presenter/CurrentSlidePreview";
-    static constexpr OUStringLiteral msNextSlidePreviewViewURL
-        = u"private:resource/view/Presenter/NextSlidePreview";
-    static constexpr OUStringLiteral msNotesViewURL = u"private:resource/view/Presenter/Notes";
-    static constexpr OUStringLiteral msToolBarViewURL = u"private:resource/view/Presenter/ToolBar";
-    static constexpr OUStringLiteral msSlideSorterURL
-        = u"private:resource/view/Presenter/SlideSorter";
-    static constexpr OUStringLiteral msHelpViewURL = u"private:resource/view/Presenter/Help";
+    static constexpr OUString msCurrentSlidePreviewViewURL
+        = u"private:resource/view/Presenter/CurrentSlidePreview"_ustr;
+    static constexpr OUString msNextSlidePreviewViewURL
+        = u"private:resource/view/Presenter/NextSlidePreview"_ustr;
+    static constexpr OUString msNotesViewURL = u"private:resource/view/Presenter/Notes"_ustr;
+    static constexpr OUString msToolBarViewURL = u"private:resource/view/Presenter/ToolBar"_ustr;
+    static constexpr OUString msSlideSorterURL
+        = u"private:resource/view/Presenter/SlideSorter"_ustr;
+    static constexpr OUString msHelpViewURL = u"private:resource/view/Presenter/Help"_ustr;
 
     /** Create a new instance of this class and register it as resource
         factory in the drawing framework of the given controller.
diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx
index e641149b430b..da5325cf693c 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -97,32 +97,32 @@ public:
 
     /** The set of tool bars that are handled by this manager class.
     */
-    constexpr static OUStringLiteral msToolBar = u"toolbar"; // Draw_Toolbox_Sd, 23011
-    constexpr static OUStringLiteral msOptionsToolBar = u"optionsbar";
+    constexpr static OUString msToolBar = u"toolbar"_ustr; // Draw_Toolbox_Sd, 23011
+    constexpr static OUString msOptionsToolBar = u"optionsbar"_ustr;
         // Draw_Options_Toolbox, 23020
-    constexpr static OUStringLiteral msCommonTaskToolBar = u"commontaskbar";
+    constexpr static OUString msCommonTaskToolBar = u"commontaskbar"_ustr;
         // Draw_CommonTask_Toolbox, 23021
-    constexpr static OUStringLiteral msViewerToolBar = u"viewerbar"; // Draw_Viewer_Toolbox, 23023
-    constexpr static OUStringLiteral msSlideSorterToolBar = u"slideviewtoolbar";
+    constexpr static OUString msViewerToolBar = u"viewerbar"_ustr; // Draw_Viewer_Toolbox, 23023
+    constexpr static OUString msSlideSorterToolBar = u"slideviewtoolbar"_ustr;
         // Slide_Toolbox, 23012
-    constexpr static OUStringLiteral msSlideSorterObjectBar = u"slideviewobjectbar";
+    constexpr static OUString msSlideSorterObjectBar = u"slideviewobjectbar"_ustr;
         // Slide_Obj_Toolbox, 23014
-    constexpr static OUStringLiteral msOutlineToolBar = u"outlinetoolbar"; // Outline_Toolbox, 23017
-    constexpr static OUStringLiteral msMasterViewToolBar = u"masterviewtoolbar";
+    constexpr static OUString msOutlineToolBar = u"outlinetoolbar"_ustr; // Outline_Toolbox, 23017
+    constexpr static OUString msMasterViewToolBar = u"masterviewtoolbar"_ustr;
         // SID_MASTERPAGE, 27053
-    constexpr static OUStringLiteral msDrawingObjectToolBar = u"drawingobjectbar";
+    constexpr static OUString msDrawingObjectToolBar = u"drawingobjectbar"_ustr;
         // Draw_Obj_Toolbox, 23013
-    constexpr static OUStringLiteral msGluePointsToolBar = u"gluepointsobjectbar";
+    constexpr static OUString msGluePointsToolBar = u"gluepointsobjectbar"_ustr;
         // Gluepoints_Toolbox, 23019
-    constexpr static OUStringLiteral msTextObjectBar = u"textobjectbar";
+    constexpr static OUString msTextObjectBar = u"textobjectbar"_ustr;
         // Draw_Text_Toolbox_Sd, 23016
-    constexpr static OUStringLiteral msBezierObjectBar = u"bezierobjectbar";
+    constexpr static OUString msBezierObjectBar = u"bezierobjectbar"_ustr;
         // Bezier_Toolbox_Sd, 23015
-    constexpr static OUStringLiteral msGraphicObjectBar = u"graphicobjectbar";
+    constexpr static OUString msGraphicObjectBar = u"graphicobjectbar"_ustr;
         // Draw_Graf_Toolbox, 23030
-    constexpr static OUStringLiteral msMediaObjectBar = u"mediaobjectbar";
+    constexpr static OUString msMediaObjectBar = u"mediaobjectbar"_ustr;
         // Draw_Media_Toolbox, 23031
-    constexpr static OUStringLiteral msTableObjectBar = u"tableobjectbar";
+    constexpr static OUString msTableObjectBar = u"tableobjectbar"_ustr;
         // Draw_Table_Toolbox, 23018
 
     /** The set of tool bar groups.
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index 927b206b9edf..e5fe6f78cdc0 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -56,14 +56,14 @@ class FrameworkHelper final
 {
 public:
     // URLs of frequently used panes.
-    static constexpr OUStringLiteral msPaneURLPrefix = u"private:resource/pane/";
+    static constexpr OUString msPaneURLPrefix = u"private:resource/pane/"_ustr;
     static const OUString msCenterPaneURL;
     static const OUString msFullScreenPaneURL;
     static const OUString msLeftImpressPaneURL;
     static const OUString msLeftDrawPaneURL;
 
     // URLs of frequently used views.
-    static constexpr OUStringLiteral msViewURLPrefix = u"private:resource/view/";
+    static constexpr OUString msViewURLPrefix = u"private:resource/view/"_ustr;
     static const OUString msImpressViewURL;
     static const OUString msDrawViewURL;
     static const OUString msOutlineViewURL;
@@ -74,19 +74,19 @@ public:
     static const OUString msSidebarViewURL;
 
     // URLs of frequently used tool bars.
-    static constexpr OUStringLiteral msToolBarURLPrefix = u"private:resource/toolbar/";
+    static constexpr OUString msToolBarURLPrefix = u"private:resource/toolbar/"_ustr;
     static const OUString msViewTabBarURL;
 
     // Names of frequently used events.
-    static constexpr OUStringLiteral msResourceActivationRequestEvent
-        = u"ResourceActivationRequested";
-    static constexpr OUStringLiteral msResourceDeactivationRequestEvent
-        = u"ResourceDeactivationRequest";
-    static constexpr OUStringLiteral msResourceActivationEvent = u"ResourceActivation";
-    static constexpr OUStringLiteral msResourceDeactivationEvent = u"ResourceDeactivation";
-    static constexpr OUStringLiteral msResourceDeactivationEndEvent = u"ResourceDeactivationEnd";
-    static constexpr OUStringLiteral msConfigurationUpdateStartEvent = u"ConfigurationUpdateStart";
-    static constexpr OUStringLiteral msConfigurationUpdateEndEvent = u"ConfigurationUpdateEnd";
+    static constexpr OUString msResourceActivationRequestEvent
+        = u"ResourceActivationRequested"_ustr;
+    static constexpr OUString msResourceDeactivationRequestEvent
+        = u"ResourceDeactivationRequest"_ustr;
+    static constexpr OUString msResourceActivationEvent = u"ResourceActivation"_ustr;
+    static constexpr OUString msResourceDeactivationEvent = u"ResourceDeactivation"_ustr;
+    static constexpr OUString msResourceDeactivationEndEvent = u"ResourceDeactivationEnd"_ustr;
+    static constexpr OUString msConfigurationUpdateStartEvent = u"ConfigurationUpdateStart"_ustr;
+    static constexpr OUString msConfigurationUpdateEndEvent = u"ConfigurationUpdateEnd"_ustr;
 
     /** Return the FrameworkHelper object that is associated with the given
         ViewShellBase.  If such an object does not yet exist, a new one is
diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx
index 37a03d3d6b31..a298e93b7c1b 100644
--- a/sd/source/ui/inc/unokywds.hxx
+++ b/sd/source/ui/inc/unokywds.hxx
@@ -23,97 +23,93 @@
 #include <rtl/ustring.hxx>
 
 // SdUnoPseudoStyleFamily
-inline constexpr OUStringLiteral sUNO_PseudoSheet_Background = u"background";
+inline constexpr OUString sUNO_PseudoSheet_Background = u"background"_ustr;
 
 // SdLayer
-inline constexpr OUStringLiteral sUNO_LayerName_background = u"background";
-inline constexpr OUStringLiteral sUNO_LayerName_background_objects = u"backgroundobjects";
-inline constexpr OUStringLiteral sUNO_LayerName_layout = u"layout";
-inline constexpr OUStringLiteral sUNO_LayerName_controls = u"controls";
-inline constexpr OUStringLiteral sUNO_LayerName_measurelines = u"measurelines";
+inline constexpr OUString sUNO_LayerName_background = u"background"_ustr;
+inline constexpr OUString sUNO_LayerName_background_objects = u"backgroundobjects"_ustr;
+inline constexpr OUString sUNO_LayerName_layout = u"layout"_ustr;
+inline constexpr OUString sUNO_LayerName_controls = u"controls"_ustr;
+inline constexpr OUString sUNO_LayerName_measurelines = u"measurelines"_ustr;
 
 // services
-inline constexpr OUStringLiteral sUNO_Service_FillProperties
-    = u"com.sun.star.drawing.FillProperties";
-inline constexpr OUStringLiteral sUNO_Service_PageBackground
-    = u"com.sun.star.drawing.PageBackground";
-inline constexpr OUStringLiteral sUNO_Service_ImageMapRectangleObject
-    = u"com.sun.star.image.ImageMapRectangleObject";
-inline constexpr OUStringLiteral sUNO_Service_ImageMapCircleObject
-    = u"com.sun.star.image.ImageMapCircleObject";
-inline constexpr OUStringLiteral sUNO_Service_ImageMapPolygonObject
-    = u"com.sun.star.image.ImageMapPolygonObject";
+inline constexpr OUString sUNO_Service_FillProperties = u"com.sun.star.drawing.FillProperties"_ustr;
+inline constexpr OUString sUNO_Service_PageBackground = u"com.sun.star.drawing.PageBackground"_ustr;
+inline constexpr OUString sUNO_Service_ImageMapRectangleObject
+    = u"com.sun.star.image.ImageMapRectangleObject"_ustr;
+inline constexpr OUString sUNO_Service_ImageMapCircleObject
+    = u"com.sun.star.image.ImageMapCircleObject"_ustr;
+inline constexpr OUString sUNO_Service_ImageMapPolygonObject
+    = u"com.sun.star.image.ImageMapPolygonObject"_ustr;
 
 // properties
-inline constexpr OUStringLiteral sUNO_Prop_ForbiddenCharacters = u"ForbiddenCharacters";
-inline constexpr OUStringLiteral sUNO_Prop_MapUnit = u"MapUnit";
-inline constexpr OUStringLiteral sUNO_Prop_VisibleArea = u"VisibleArea";
-inline constexpr OUStringLiteral sUNO_Prop_TabStop = u"TabStop";
-inline constexpr OUStringLiteral sUNO_Prop_CharLocale = u"CharLocale";
-inline constexpr OUStringLiteral sUNO_Prop_AutomContFocus = u"AutomaticControlFocus";
-inline constexpr OUStringLiteral sUNO_Prop_ApplyFrmDsgnMode = u"ApplyFormDesignMode";
-inline constexpr OUStringLiteral sUNO_Prop_IsBackgroundVisible = u"IsBackgroundVisible";
-inline constexpr OUStringLiteral sUNO_Prop_IsBackgroundObjectsVisible
-    = u"IsBackgroundObjectsVisible";
-inline constexpr OUStringLiteral sUNO_Prop_UserDefinedAttributes = u"UserDefinedAttributes";
-inline constexpr OUStringLiteral sUNO_Prop_BookmarkURL = u"BookmarkURL";
-inline constexpr OUStringLiteral sUNO_Prop_RuntimeUID = u"RuntimeUID";
-inline constexpr OUStringLiteral sUNO_Prop_HasValidSignatures = u"HasValidSignatures";
-inline constexpr OUStringLiteral sUNO_Prop_InteropGrabBag = u"InteropGrabBag";
-inline constexpr OUStringLiteral sUNO_Prop_Theme = u"Theme";
+inline constexpr OUString sUNO_Prop_ForbiddenCharacters = u"ForbiddenCharacters"_ustr;
+inline constexpr OUString sUNO_Prop_MapUnit = u"MapUnit"_ustr;
+inline constexpr OUString sUNO_Prop_VisibleArea = u"VisibleArea"_ustr;
+inline constexpr OUString sUNO_Prop_TabStop = u"TabStop"_ustr;
+inline constexpr OUString sUNO_Prop_CharLocale = u"CharLocale"_ustr;
+inline constexpr OUString sUNO_Prop_AutomContFocus = u"AutomaticControlFocus"_ustr;
+inline constexpr OUString sUNO_Prop_ApplyFrmDsgnMode = u"ApplyFormDesignMode"_ustr;
+inline constexpr OUString sUNO_Prop_IsBackgroundVisible = u"IsBackgroundVisible"_ustr;
+inline constexpr OUString sUNO_Prop_IsBackgroundObjectsVisible = u"IsBackgroundObjectsVisible"_ustr;
+inline constexpr OUString sUNO_Prop_UserDefinedAttributes = u"UserDefinedAttributes"_ustr;
+inline constexpr OUString sUNO_Prop_BookmarkURL = u"BookmarkURL"_ustr;
+inline constexpr OUString sUNO_Prop_RuntimeUID = u"RuntimeUID"_ustr;
+inline constexpr OUString sUNO_Prop_HasValidSignatures = u"HasValidSignatures"_ustr;
+inline constexpr OUString sUNO_Prop_InteropGrabBag = u"InteropGrabBag"_ustr;
+inline constexpr OUString sUNO_Prop_Theme = u"Theme"_ustr;
 
 // view settings
-inline constexpr OUStringLiteral sUNO_View_ViewId = u"ViewId";
-inline constexpr OUStringLiteral sUNO_View_SnapLinesDrawing = u"SnapLinesDrawing";
-inline constexpr OUStringLiteral sUNO_View_SnapLinesNotes = u"SnapLinesNotes";
-inline constexpr OUStringLiteral sUNO_View_SnapLinesHandout = u"SnapLinesHandout";
-inline constexpr OUStringLiteral sUNO_View_RulerIsVisible = u"RulerIsVisible";
-inline constexpr OUStringLiteral sUNO_View_PageKind = u"PageKind";
-inline constexpr OUStringLiteral sUNO_View_SelectedPage = u"SelectedPage";
-inline constexpr OUStringLiteral sUNO_View_IsLayerMode = u"IsLayerMode";
-inline constexpr OUStringLiteral sUNO_View_IsDoubleClickTextEdit = u"IsDoubleClickTextEdit";
-inline constexpr OUStringLiteral sUNO_View_IsClickChangeRotation = u"IsClickChangeRotation";
-inline constexpr OUStringLiteral sUNO_View_SlidesPerRow = u"SlidesPerRow";
-inline constexpr OUStringLiteral sUNO_View_EditMode = u"EditMode";
+inline constexpr OUString sUNO_View_ViewId = u"ViewId"_ustr;
+inline constexpr OUString sUNO_View_SnapLinesDrawing = u"SnapLinesDrawing"_ustr;
+inline constexpr OUString sUNO_View_SnapLinesNotes = u"SnapLinesNotes"_ustr;
+inline constexpr OUString sUNO_View_SnapLinesHandout = u"SnapLinesHandout"_ustr;
+inline constexpr OUString sUNO_View_RulerIsVisible = u"RulerIsVisible"_ustr;
+inline constexpr OUString sUNO_View_PageKind = u"PageKind"_ustr;
+inline constexpr OUString sUNO_View_SelectedPage = u"SelectedPage"_ustr;
+inline constexpr OUString sUNO_View_IsLayerMode = u"IsLayerMode"_ustr;
+inline constexpr OUString sUNO_View_IsDoubleClickTextEdit = u"IsDoubleClickTextEdit"_ustr;
+inline constexpr OUString sUNO_View_IsClickChangeRotation = u"IsClickChangeRotation"_ustr;
+inline constexpr OUString sUNO_View_SlidesPerRow = u"SlidesPerRow"_ustr;
+inline constexpr OUString sUNO_View_EditMode = u"EditMode"_ustr;
 inline const char sUNO_View_EditModeStandard[] = "EditModeStandard"; // To be deprecated
 // inline const char sUNO_View_EditModeNotes[] = "EditModeNotes";
 // inline const char sUNO_View_EditModeHandout[] = "EditModeHandout";
 
-inline constexpr OUStringLiteral sUNO_View_GridIsVisible = u"GridIsVisible";
-inline constexpr OUStringLiteral sUNO_View_GridIsFront = u"GridIsFront";
-inline constexpr OUStringLiteral sUNO_View_IsSnapToGrid = u"IsSnapToGrid";
-inline constexpr OUStringLiteral sUNO_View_IsSnapToPageMargins = u"IsSnapToPageMargins";
-inline constexpr OUStringLiteral sUNO_View_IsSnapToSnapLines = u"IsSnapToSnapLines";
-inline constexpr OUStringLiteral sUNO_View_IsSnapToObjectFrame = u"IsSnapToObjectFrame";
-inline constexpr OUStringLiteral sUNO_View_IsSnapToObjectPoints = u"IsSnapToObjectPoints";
-inline constexpr OUStringLiteral sUNO_View_IsPlusHandlesAlwaysVisible
-    = u"IsPlusHandlesAlwaysVisible";
-inline constexpr OUStringLiteral sUNO_View_IsFrameDragSingles = u"IsFrameDragSingles";
-inline constexpr OUStringLiteral sUNO_View_EliminatePolyPointLimitAngle
-    = u"EliminatePolyPointLimitAngle";
-inline constexpr OUStringLiteral sUNO_View_IsEliminatePolyPoints = u"IsEliminatePolyPoints";
+inline constexpr OUString sUNO_View_GridIsVisible = u"GridIsVisible"_ustr;
+inline constexpr OUString sUNO_View_GridIsFront = u"GridIsFront"_ustr;
+inline constexpr OUString sUNO_View_IsSnapToGrid = u"IsSnapToGrid"_ustr;
+inline constexpr OUString sUNO_View_IsSnapToPageMargins = u"IsSnapToPageMargins"_ustr;
+inline constexpr OUString sUNO_View_IsSnapToSnapLines = u"IsSnapToSnapLines"_ustr;
+inline constexpr OUString sUNO_View_IsSnapToObjectFrame = u"IsSnapToObjectFrame"_ustr;
+inline constexpr OUString sUNO_View_IsSnapToObjectPoints = u"IsSnapToObjectPoints"_ustr;
+inline constexpr OUString sUNO_View_IsPlusHandlesAlwaysVisible = u"IsPlusHandlesAlwaysVisible"_ustr;
+inline constexpr OUString sUNO_View_IsFrameDragSingles = u"IsFrameDragSingles"_ustr;
+inline constexpr OUString sUNO_View_EliminatePolyPointLimitAngle
+    = u"EliminatePolyPointLimitAngle"_ustr;
+inline constexpr OUString sUNO_View_IsEliminatePolyPoints = u"IsEliminatePolyPoints"_ustr;
 inline const char sUNO_View_ActiveLayer[] = "ActiveLayer";
-inline constexpr OUStringLiteral sUNO_View_NoAttribs = u"NoAttribs";
-inline constexpr OUStringLiteral sUNO_View_NoColors = u"NoColors";
-inline constexpr OUStringLiteral sUNO_View_GridCoarseWidth = u"GridCoarseWidth";
-inline constexpr OUStringLiteral sUNO_View_GridCoarseHeight = u"GridCoarseHeight";
-inline constexpr OUStringLiteral sUNO_View_GridFineWidth = u"GridFineWidth";
-inline constexpr OUStringLiteral sUNO_View_GridFineHeight = u"GridFineHeight";
-inline constexpr OUStringLiteral sUNO_View_IsAngleSnapEnabled = u"IsAngleSnapEnabled";
-inline constexpr OUStringLiteral sUNO_View_SnapAngle = u"SnapAngle";
-inline constexpr OUStringLiteral sUNO_View_GridSnapWidthXNumerator = u"GridSnapWidthXNumerator";
-inline constexpr OUStringLiteral sUNO_View_GridSnapWidthXDenominator = u"GridSnapWidthXDenominator";
-inline constexpr OUStringLiteral sUNO_View_GridSnapWidthYNumerator = u"GridSnapWidthYNumerator";
-inline constexpr OUStringLiteral sUNO_View_GridSnapWidthYDenominator = u"GridSnapWidthYDenominator";
-inline constexpr OUStringLiteral sUNO_View_VisibleLayers = u"VisibleLayers";
-inline constexpr OUStringLiteral sUNO_View_PrintableLayers = u"PrintableLayers";
-inline constexpr OUStringLiteral sUNO_View_LockedLayers = u"LockedLayers";
+inline constexpr OUString sUNO_View_NoAttribs = u"NoAttribs"_ustr;
+inline constexpr OUString sUNO_View_NoColors = u"NoColors"_ustr;
+inline constexpr OUString sUNO_View_GridCoarseWidth = u"GridCoarseWidth"_ustr;
+inline constexpr OUString sUNO_View_GridCoarseHeight = u"GridCoarseHeight"_ustr;
+inline constexpr OUString sUNO_View_GridFineWidth = u"GridFineWidth"_ustr;
+inline constexpr OUString sUNO_View_GridFineHeight = u"GridFineHeight"_ustr;
+inline constexpr OUString sUNO_View_IsAngleSnapEnabled = u"IsAngleSnapEnabled"_ustr;
+inline constexpr OUString sUNO_View_SnapAngle = u"SnapAngle"_ustr;
+inline constexpr OUString sUNO_View_GridSnapWidthXNumerator = u"GridSnapWidthXNumerator"_ustr;
+inline constexpr OUString sUNO_View_GridSnapWidthXDenominator = u"GridSnapWidthXDenominator"_ustr;
+inline constexpr OUString sUNO_View_GridSnapWidthYNumerator = u"GridSnapWidthYNumerator"_ustr;
+inline constexpr OUString sUNO_View_GridSnapWidthYDenominator = u"GridSnapWidthYDenominator"_ustr;
+inline constexpr OUString sUNO_View_VisibleLayers = u"VisibleLayers"_ustr;
+inline constexpr OUString sUNO_View_PrintableLayers = u"PrintableLayers"_ustr;
+inline constexpr OUString sUNO_View_LockedLayers = u"LockedLayers"_ustr;
 
-inline constexpr OUStringLiteral sUNO_View_VisibleAreaTop = u"VisibleAreaTop";
-inline constexpr OUStringLiteral sUNO_View_VisibleAreaLeft = u"VisibleAreaLeft";
-inline constexpr OUStringLiteral sUNO_View_VisibleAreaWidth = u"VisibleAreaWidth";
-inline constexpr OUStringLiteral sUNO_View_VisibleAreaHeight = u"VisibleAreaHeight";
+inline constexpr OUString sUNO_View_VisibleAreaTop = u"VisibleAreaTop"_ustr;
+inline constexpr OUString sUNO_View_VisibleAreaLeft = u"VisibleAreaLeft"_ustr;
+inline constexpr OUString sUNO_View_VisibleAreaWidth = u"VisibleAreaWidth"_ustr;
+inline constexpr OUString sUNO_View_VisibleAreaHeight = u"VisibleAreaHeight"_ustr;
 
-inline constexpr OUStringLiteral sUNO_View_ZoomOnPage = u"ZoomOnPage";
+inline constexpr OUString sUNO_View_ZoomOnPage = u"ZoomOnPage"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index b32cd8f358d8..8a730bb65a61 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -74,7 +74,7 @@ namespace {
 
 struct snew_slide_value_info
 {
-    std::u16string_view msBmpResId;
+    OUString msBmpResId;
     TranslateId mpStrResId;
     WritingMode meWritingMode;
     AutoLayout maAutoLayout;