16 files changed, 120 insertions, 120 deletions
diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h
index ee45f8ef55a1..667dc06c07e8 100644
--- a/framework/inc/acceleratorconst.h
+++ b/framework/inc/acceleratorconst.h
@@ -24,8 +24,8 @@
 namespace framework{
 
 // same items with a name space alias
-inline constexpr OUStringLiteral AL_ELEMENT_ACCELERATORLIST = u"accel:acceleratorlist";
-inline constexpr OUStringLiteral AL_ELEMENT_ITEM = u"accel:item";
+inline constexpr OUString AL_ELEMENT_ACCELERATORLIST = u"accel:acceleratorlist"_ustr;
+inline constexpr OUString AL_ELEMENT_ITEM = u"accel:item"_ustr;
 
 } // namespace framework
 
diff --git a/framework/inc/bitmaps.hlst b/framework/inc/bitmaps.hlst
index 78211ef9e8c1..986005bbdc40 100644
--- a/framework/inc/bitmaps.hlst
+++ b/framework/inc/bitmaps.hlst
@@ -11,29 +11,29 @@
 
 #include <rtl/ustring.hxx>
 
-inline constexpr OUStringLiteral BMP_SAVEMODIFIED_SMALL = u"res/savemodified_small.png";
-inline constexpr OUStringLiteral BMP_SAVEMODIFIED_LARGE = u"res/savemodified_large.png";
-inline constexpr OUStringLiteral BMP_SAVEMODIFIED_EXTRALARGE = u"res/savemodified_extralarge.png";
+inline constexpr OUString BMP_SAVEMODIFIED_SMALL = u"res/savemodified_small.png"_ustr;
+inline constexpr OUString BMP_SAVEMODIFIED_LARGE = u"res/savemodified_large.png"_ustr;
+inline constexpr OUString BMP_SAVEMODIFIED_EXTRALARGE = u"res/savemodified_extralarge.png"_ustr;
 
-inline constexpr OUStringLiteral RID_SVXBMP_BUTTON = u"res/sx10594.png";
-inline constexpr OUStringLiteral RID_SVXBMP_RADIOBUTTON = u"res/sx10595.png";
-inline constexpr OUStringLiteral RID_SVXBMP_CHECKBOX = u"res/sx10596.png";
-inline constexpr OUStringLiteral RID_SVXBMP_FIXEDTEXT = u"res/sx10597.png";
-inline constexpr OUStringLiteral RID_SVXBMP_GROUPBOX = u"res/sx10598.png";
-inline constexpr OUStringLiteral RID_SVXBMP_EDITBOX = u"res/sx10599.png";
-inline constexpr OUStringLiteral RID_SVXBMP_LISTBOX = u"res/sx10600.png";
-inline constexpr OUStringLiteral RID_SVXBMP_COMBOBOX = u"res/sx10601.png";
-inline constexpr OUStringLiteral RID_SVXBMP_IMAGEBUTTON = u"res/sx10604.png";
-inline constexpr OUStringLiteral RID_SVXBMP_IMAGECONTROL = u"res/sx10710.png";
-inline constexpr OUStringLiteral RID_SVXBMP_FILECONTROL = u"res/sx10605.png";
-inline constexpr OUStringLiteral RID_SVXBMP_DATEFIELD = u"res/sx10704.png";
-inline constexpr OUStringLiteral RID_SVXBMP_TIMEFIELD = u"res/sx10705.png";
-inline constexpr OUStringLiteral RID_SVXBMP_NUMERICFIELD = u"res/sx10706.png";
-inline constexpr OUStringLiteral RID_SVXBMP_CURRENCYFIELD = u"res/sx10707.png";
-inline constexpr OUStringLiteral RID_SVXBMP_PATTERNFIELD = u"res/sx10708.png";
-inline constexpr OUStringLiteral RID_SVXBMP_FORMATTEDFIELD = u"res/sx10728.png";
-inline constexpr OUStringLiteral RID_SVXBMP_SCROLLBAR = u"res/sx10768.png";
-inline constexpr OUStringLiteral RID_SVXBMP_SPINBUTTON = u"res/sx10769.png";
-inline constexpr OUStringLiteral RID_SVXBMP_NAVIGATIONBAR = u"res/sx10607.png";
+inline constexpr OUString RID_SVXBMP_BUTTON = u"res/sx10594.png"_ustr;
+inline constexpr OUString RID_SVXBMP_RADIOBUTTON = u"res/sx10595.png"_ustr;
+inline constexpr OUString RID_SVXBMP_CHECKBOX = u"res/sx10596.png"_ustr;
+inline constexpr OUString RID_SVXBMP_FIXEDTEXT = u"res/sx10597.png"_ustr;
+inline constexpr OUString RID_SVXBMP_GROUPBOX = u"res/sx10598.png"_ustr;
+inline constexpr OUString RID_SVXBMP_EDITBOX = u"res/sx10599.png"_ustr;
+inline constexpr OUString RID_SVXBMP_LISTBOX = u"res/sx10600.png"_ustr;
+inline constexpr OUString RID_SVXBMP_COMBOBOX = u"res/sx10601.png"_ustr;
+inline constexpr OUString RID_SVXBMP_IMAGEBUTTON = u"res/sx10604.png"_ustr;
+inline constexpr OUString RID_SVXBMP_IMAGECONTROL = u"res/sx10710.png"_ustr;
+inline constexpr OUString RID_SVXBMP_FILECONTROL = u"res/sx10605.png"_ustr;
+inline constexpr OUString RID_SVXBMP_DATEFIELD = u"res/sx10704.png"_ustr;
+inline constexpr OUString RID_SVXBMP_TIMEFIELD = u"res/sx10705.png"_ustr;
+inline constexpr OUString RID_SVXBMP_NUMERICFIELD = u"res/sx10706.png"_ustr;
+inline constexpr OUString RID_SVXBMP_CURRENCYFIELD = u"res/sx10707.png"_ustr;
+inline constexpr OUString RID_SVXBMP_PATTERNFIELD = u"res/sx10708.png"_ustr;
+inline constexpr OUString RID_SVXBMP_FORMATTEDFIELD = u"res/sx10728.png"_ustr;
+inline constexpr OUString RID_SVXBMP_SCROLLBAR = u"res/sx10768.png"_ustr;
+inline constexpr OUString RID_SVXBMP_SPINBUTTON = u"res/sx10769.png"_ustr;
+inline constexpr OUString RID_SVXBMP_NAVIGATIONBAR = u"res/sx10607.png"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx
index 71d4100d9879..25511d52b357 100644
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -24,8 +24,8 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 
-inline constexpr OUStringLiteral SERVICENAME_ACTIONTRIGGERCONTAINER = u"com.sun.star.ui.ActionTriggerContainer";
-inline constexpr OUStringLiteral IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER = u"com.sun.star.comp.ui.ActionTriggerContainer";
+inline constexpr OUString SERVICENAME_ACTIONTRIGGERCONTAINER = u"com.sun.star.ui.ActionTriggerContainer"_ustr;
+inline constexpr OUString IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER = u"com.sun.star.comp.ui.ActionTriggerContainer"_ustr;
 
 namespace framework
 {
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 78d49e7ef279..da553fa9e137 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -28,8 +28,8 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 
-inline constexpr OUStringLiteral SERVICENAME_ACTIONTRIGGER = u"com.sun.star.ui.ActionTrigger";
-inline constexpr OUStringLiteral IMPLEMENTATIONNAME_ACTIONTRIGGER = u"com.sun.star.comp.ui.ActionTrigger";
+inline constexpr OUString SERVICENAME_ACTIONTRIGGER = u"com.sun.star.ui.ActionTrigger"_ustr;
+inline constexpr OUString IMPLEMENTATIONNAME_ACTIONTRIGGER = u"com.sun.star.comp.ui.ActionTrigger"_ustr;
 
 namespace framework
 {
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index b68493696e42..0d0b62b4907b 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -26,8 +26,8 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 
-inline constexpr OUStringLiteral SERVICENAME_ACTIONTRIGGERSEPARATOR = u"com.sun.star.ui.ActionTriggerSeparator";
-inline constexpr OUStringLiteral IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR = u"com.sun.star.comp.ui.ActionTriggerSeparator";
+inline constexpr OUString SERVICENAME_ACTIONTRIGGERSEPARATOR = u"com.sun.star.ui.ActionTriggerSeparator"_ustr;
+inline constexpr OUString IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR = u"com.sun.star.comp.ui.ActionTriggerSeparator"_ustr;
 
 namespace framework
 {
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index e156f9b0da62..84035642ebf7 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -29,7 +29,7 @@
 
 namespace framework{
 
-inline constexpr OUStringLiteral PACKAGENAME_PROTOCOLHANDLER = u"Office.ProtocolHandler";                    /// name of our configuration package
+inline constexpr OUString PACKAGENAME_PROTOCOLHANDLER = u"Office.ProtocolHandler"_ustr;                    /// name of our configuration package
 
 #define CFG_PATH_SEPARATOR                          "/"                                               /// separator for configuration paths
 
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index 3e109732a7b8..87ba5b518fd1 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 
-inline constexpr OUStringLiteral IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER = u"com.sun.star.comp.ui.RootActionTriggerContainer";
+inline constexpr OUString IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER = u"com.sun.star.comp.ui.RootActionTriggerContainer"_ustr;
 
 namespace framework
 {
diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx
index 7c6fc17cc715..569c2d4c93f6 100644
--- a/framework/inc/jobs/jobconst.hxx
+++ b/framework/inc/jobs/jobconst.hxx
@@ -34,9 +34,9 @@ namespace framework
 class JobConst
 {
 public:
-    static constexpr OUStringLiteral ANSWER_DEACTIVATE_JOB = u"Deactivate";
-    static constexpr OUStringLiteral ANSWER_SAVE_ARGUMENTS = u"SaveArguments";
-    static constexpr OUStringLiteral ANSWER_SEND_DISPATCHRESULT = u"SendDispatchResult";
+    static constexpr OUString ANSWER_DEACTIVATE_JOB = u"Deactivate"_ustr;
+    static constexpr OUString ANSWER_SAVE_ARGUMENTS = u"SaveArguments"_ustr;
+    static constexpr OUString ANSWER_SEND_DISPATCHRESULT = u"SendDispatchResult"_ustr;
 };
 
 } // namespace framework
diff --git a/framework/inc/properties.h b/framework/inc/properties.h
index b11a5b2e9d71..c4eef829af0f 100644
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -25,12 +25,12 @@ namespace framework{
 
 /** properties for "Frame" class */
 
-inline constexpr OUStringLiteral FRAME_PROPNAME_ASCII_DISPATCHRECORDERSUPPLIER = u"DispatchRecorderSupplier";
-inline constexpr OUStringLiteral FRAME_PROPNAME_ASCII_ISHIDDEN = u"IsHidden";
-inline constexpr OUStringLiteral FRAME_PROPNAME_ASCII_LAYOUTMANAGER = u"LayoutManager";
-inline constexpr OUStringLiteral FRAME_PROPNAME_ASCII_TITLE = u"Title";
-inline constexpr OUStringLiteral FRAME_PROPNAME_ASCII_INDICATORINTERCEPTION = u"IndicatorInterception";
-inline constexpr OUStringLiteral FRAME_PROPNAME_ASCII_URL = u"URL";
+inline constexpr OUString FRAME_PROPNAME_ASCII_DISPATCHRECORDERSUPPLIER = u"DispatchRecorderSupplier"_ustr;
+inline constexpr OUString FRAME_PROPNAME_ASCII_ISHIDDEN = u"IsHidden"_ustr;
+inline constexpr OUString FRAME_PROPNAME_ASCII_LAYOUTMANAGER = u"LayoutManager"_ustr;
+inline constexpr OUString FRAME_PROPNAME_ASCII_TITLE = u"Title"_ustr;
+inline constexpr OUString FRAME_PROPNAME_ASCII_INDICATORINTERCEPTION = u"IndicatorInterception"_ustr;
+inline constexpr OUString FRAME_PROPNAME_ASCII_URL = u"URL"_ustr;
 
 // Please add new entries alphabetical sorted and correct all other handles!
 // Start counting with 0, so it can be used as direct index into an array too.
@@ -43,13 +43,13 @@ inline constexpr OUStringLiteral FRAME_PROPNAME_ASCII_URL = u"URL";
 
 /** properties for "LayoutManager" class */
 
-inline constexpr OUStringLiteral LAYOUTMANAGER_PROPNAME_ASCII_MENUBARCLOSER = u"MenuBarCloser";
-inline constexpr OUStringLiteral LAYOUTMANAGER_PROPNAME_ASCII_AUTOMATICTOOLBARS = u"AutomaticToolbars";
-inline constexpr OUStringLiteral LAYOUTMANAGER_PROPNAME_ASCII_REFRESHVISIBILITY = u"RefreshContextToolbarVisibility";
-inline constexpr OUStringLiteral LAYOUTMANAGER_PROPNAME_ASCII_HIDECURRENTUI = u"HideCurrentUI";
-inline constexpr OUStringLiteral LAYOUTMANAGER_PROPNAME_ASCII_LOCKCOUNT = u"LockCount";
-inline constexpr OUStringLiteral LAYOUTMANAGER_PROPNAME_ASCII_PRESERVE_CONTENT_SIZE = u"PreserveContentSize";
-inline constexpr OUStringLiteral LAYOUTMANAGER_PROPNAME_ASCII_REFRESHTOOLTIP = u"RefreshContextToolbarToolTip";
+inline constexpr OUString LAYOUTMANAGER_PROPNAME_ASCII_MENUBARCLOSER = u"MenuBarCloser"_ustr;
+inline constexpr OUString LAYOUTMANAGER_PROPNAME_ASCII_AUTOMATICTOOLBARS = u"AutomaticToolbars"_ustr;
+inline constexpr OUString LAYOUTMANAGER_PROPNAME_ASCII_REFRESHVISIBILITY = u"RefreshContextToolbarVisibility"_ustr;
+inline constexpr OUString LAYOUTMANAGER_PROPNAME_ASCII_HIDECURRENTUI = u"HideCurrentUI"_ustr;
+inline constexpr OUString LAYOUTMANAGER_PROPNAME_ASCII_LOCKCOUNT = u"LockCount"_ustr;
+inline constexpr OUString LAYOUTMANAGER_PROPNAME_ASCII_PRESERVE_CONTENT_SIZE = u"PreserveContentSize"_ustr;
+inline constexpr OUString LAYOUTMANAGER_PROPNAME_ASCII_REFRESHTOOLTIP = u"RefreshContextToolbarToolTip"_ustr;
 
 #define LAYOUTMANAGER_PROPNAME_MENUBARCLOSER            LAYOUTMANAGER_PROPNAME_ASCII_MENUBARCLOSER
 
@@ -62,18 +62,18 @@ inline constexpr OUStringLiteral LAYOUTMANAGER_PROPNAME_ASCII_REFRESHTOOLTIP = u
 #define LAYOUTMANAGER_PROPHANDLE_REFRESHTOOLTIP         6
 
 /** properties for "UICommandDescription" class */
-inline constexpr OUStringLiteral UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST = u"private:resource/image/commandimagelist";
-inline constexpr OUStringLiteral UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST = u"private:resource/image/commandrotateimagelist";
-inline constexpr OUStringLiteral UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST = u"private:resource/image/commandmirrorimagelist";
+inline constexpr OUString UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST = u"private:resource/image/commandimagelist"_ustr;
+inline constexpr OUString UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST = u"private:resource/image/commandrotateimagelist"_ustr;
+inline constexpr OUString UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST = u"private:resource/image/commandmirrorimagelist"_ustr;
 
 
 #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON            8
 
 /** properties for "AutoRecovery" class */
 
-inline constexpr OUStringLiteral AUTORECOVERY_PROPNAME_ASCII_EXISTS_RECOVERYDATA = u"ExistsRecoveryData";
-inline constexpr OUStringLiteral AUTORECOVERY_PROPNAME_ASCII_EXISTS_SESSIONDATA = u"ExistsSessionData";
-inline constexpr OUStringLiteral AUTORECOVERY_PROPNAME_ASCII_CRASHED = u"Crashed";
+inline constexpr OUString AUTORECOVERY_PROPNAME_ASCII_EXISTS_RECOVERYDATA = u"ExistsRecoveryData"_ustr;
+inline constexpr OUString AUTORECOVERY_PROPNAME_ASCII_EXISTS_SESSIONDATA = u"ExistsSessionData"_ustr;
+inline constexpr OUString AUTORECOVERY_PROPNAME_ASCII_CRASHED = u"Crashed"_ustr;
 
 #define AUTORECOVERY_PROPNAME_EXISTS_RECOVERYDATA       AUTORECOVERY_PROPNAME_ASCII_EXISTS_RECOVERYDATA
 #define AUTORECOVERY_PROPNAME_EXISTS_SESSIONDATA        AUTORECOVERY_PROPNAME_ASCII_EXISTS_SESSIONDATA
@@ -85,12 +85,12 @@ inline constexpr OUStringLiteral AUTORECOVERY_PROPNAME_ASCII_CRASHED = u"Crashed
 
 /** properties for Filter config */
 
-inline constexpr OUStringLiteral FILTER_PROPNAME_ASCII_DOCUMENTSERVICE = u"DocumentService";
+inline constexpr OUString FILTER_PROPNAME_ASCII_DOCUMENTSERVICE = u"DocumentService"_ustr;
 
 /** properties for office module config (Setup.xcu) */
 
-inline constexpr OUStringLiteral OFFICEFACTORY_PROPNAME_ASCII_UINAME = u"ooSetupFactoryUIName";
-inline constexpr OUStringLiteral OFFICEFACTORY_PROPNAME_ASCII_ICON = u"ooSetupFactoryIcon";
+inline constexpr OUString OFFICEFACTORY_PROPNAME_ASCII_UINAME = u"ooSetupFactoryUIName"_ustr;
+inline constexpr OUString OFFICEFACTORY_PROPNAME_ASCII_ICON = u"ooSetupFactoryIcon"_ustr;
 
 /** provides some helper methods to implement property sets. */
 
diff --git a/framework/inc/services.h b/framework/inc/services.h
index aa07586b8ba6..c87008f8eb7b 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -25,17 +25,17 @@ namespace framework{
 
 //  used servicenames by framework
 
-inline constexpr OUStringLiteral SERVICENAME_FILTERFACTORY = u"com.sun.star.document.FilterFactory";
-inline constexpr OUStringLiteral SERVICENAME_CFGUPDATEACCESS = u"com.sun.star.configuration.ConfigurationUpdateAccess"; // provides read/write access to the configuration
-inline constexpr OUStringLiteral SERVICENAME_CFGREADACCESS = u"com.sun.star.configuration.ConfigurationAccess";  // provides readonly access to the configuration
-inline constexpr OUStringLiteral SERVICENAME_JOB = u"com.sun.star.task.Job";
-inline constexpr OUStringLiteral SERVICENAME_PROTOCOLHANDLER = u"com.sun.star.frame.ProtocolHandler";
-inline constexpr OUStringLiteral SERVICENAME_POPUPMENUCONTROLLER = u"com.sun.star.frame.PopupMenuController";
+inline constexpr OUString SERVICENAME_FILTERFACTORY = u"com.sun.star.document.FilterFactory"_ustr;
+inline constexpr OUString SERVICENAME_CFGUPDATEACCESS = u"com.sun.star.configuration.ConfigurationUpdateAccess"_ustr; // provides read/write access to the configuration
+inline constexpr OUString SERVICENAME_CFGREADACCESS = u"com.sun.star.configuration.ConfigurationAccess"_ustr;  // provides readonly access to the configuration
+inline constexpr OUString SERVICENAME_JOB = u"com.sun.star.task.Job"_ustr;
+inline constexpr OUString SERVICENAME_PROTOCOLHANDLER = u"com.sun.star.frame.ProtocolHandler"_ustr;
+inline constexpr OUString SERVICENAME_POPUPMENUCONTROLLER = u"com.sun.star.frame.PopupMenuController"_ustr;
 
 //  used implementationnames by framework
 
 #define IMPLEMENTATIONNAME_QUICKLAUNCHER                        "com.sun.star.comp.desktop.QuickstartWrapper"
-inline constexpr OUStringLiteral IMPLEMENTATIONNAME_FWK_TASKCREATOR = u"com.sun.star.comp.framework.TaskCreator";
+inline constexpr OUString IMPLEMENTATIONNAME_FWK_TASKCREATOR = u"com.sun.star.comp.framework.TaskCreator"_ustr;
 
 }       //  namespace framework
 
diff --git a/framework/inc/targets.h b/framework/inc/targets.h
index 9d7ffb9ef4d5..331eff0dcee7 100644
--- a/framework/inc/targets.h
+++ b/framework/inc/targets.h
@@ -25,13 +25,13 @@ namespace framework{
 
 //  Values for special frame search ... sTargetFrameName of findFrame() or queryDispatch() or loadComponentFromURL()
 
-inline constexpr OUStringLiteral SPECIALTARGET_SELF = u"_self";                   // The frame himself is searched.
+inline constexpr OUString SPECIALTARGET_SELF = u"_self"_ustr;                   // The frame himself is searched.
 #define SPECIALTARGET_PARENT          u"_parent"                           // The direct parent frame is searched.
-inline constexpr OUStringLiteral SPECIALTARGET_TOP = u"_top";                     // Search at our parents for the first task (if any exist) or a frame without a parent.
-inline constexpr OUStringLiteral SPECIALTARGET_BLANK = u"_blank";                 // Create a new task.
-inline constexpr OUStringLiteral SPECIALTARGET_DEFAULT = u"_default";             // Create a new task or recycle an existing one
-inline constexpr OUStringLiteral SPECIALTARGET_BEAMER = u"_beamer";               // special frame in hierarchy
-inline constexpr OUStringLiteral SPECIALTARGET_HELPTASK = u"OFFICE_HELP_TASK";    // special name for our help task
+inline constexpr OUString SPECIALTARGET_TOP = u"_top"_ustr;                     // Search at our parents for the first task (if any exist) or a frame without a parent.
+inline constexpr OUString SPECIALTARGET_BLANK = u"_blank"_ustr;                 // Create a new task.
+inline constexpr OUString SPECIALTARGET_DEFAULT = u"_default"_ustr;             // Create a new task or recycle an existing one
+inline constexpr OUString SPECIALTARGET_BEAMER = u"_beamer"_ustr;               // special frame in hierarchy
+inline constexpr OUString SPECIALTARGET_HELPTASK = u"OFFICE_HELP_TASK"_ustr;    // special name for our help task
 
 }       //  namespace framework
 
diff --git a/framework/inc/taskcreatordefs.hxx b/framework/inc/taskcreatordefs.hxx
index c4036e08dc19..e7eca6838afb 100644
--- a/framework/inc/taskcreatordefs.hxx
+++ b/framework/inc/taskcreatordefs.hxx
@@ -22,42 +22,42 @@
 #include <rtl/ustring.hxx>
 
 /// [XFrame] if it's set, it will be used as parent frame for the new created frame.
-inline constexpr OUStringLiteral ARGUMENT_PARENTFRAME = u"ParentFrame"; // XFrame
+inline constexpr OUString ARGUMENT_PARENTFRAME = u"ParentFrame"_ustr; // XFrame
 
 /** [OUString] if it's not a special name (beginning with "_" ... which are not allowed here!)
                it will be set as the API name of the new created frame.
  */
-inline constexpr OUStringLiteral ARGUMENT_FRAMENAME = u"FrameName"; // OUString
+inline constexpr OUString ARGUMENT_FRAMENAME = u"FrameName"_ustr; // OUString
 
 /// [bool] If it's set to true we will make the new created frame visible.
-inline constexpr OUStringLiteral ARGUMENT_MAKEVISIBLE = u"MakeVisible"; // bool
+inline constexpr OUString ARGUMENT_MAKEVISIBLE = u"MakeVisible"_ustr; // bool
 
 /** [bool] If not "ContainerWindow" property is set it force creation of a
                top level window as new container window.
  */
-inline constexpr OUStringLiteral ARGUMENT_CREATETOPWINDOW = u"CreateTopWindow"; // bool
+inline constexpr OUString ARGUMENT_CREATETOPWINDOW = u"CreateTopWindow"_ustr; // bool
 
 /// [Rectangle] Place the new created frame on this place and resize the container window.
-inline constexpr OUStringLiteral ARGUMENT_POSSIZE = u"PosSize"; // Rectangle
+inline constexpr OUString ARGUMENT_POSSIZE = u"PosSize"_ustr; // Rectangle
 
 /// [XWindow] an outside created window, used as container window of the new created frame.
-inline constexpr OUStringLiteral ARGUMENT_CONTAINERWINDOW = u"ContainerWindow"; // XWindow
+inline constexpr OUString ARGUMENT_CONTAINERWINDOW = u"ContainerWindow"_ustr; // XWindow
 
 /** [bool] enable/disable special mode, where this frame will be part of
                the persistent window state feature suitable for any office module window
  */
-inline constexpr OUStringLiteral ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE
-    = u"SupportPersistentWindowState"; // bool
+inline constexpr OUString ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE
+    = u"SupportPersistentWindowState"_ustr; // bool
 
 /** [bool] enable/disable special mode, where the title bar of our
                the new created frame will be updated automatically.
                Default = ON !
  */
-inline constexpr OUStringLiteral ARGUMENT_ENABLE_TITLEBARUPDATE = u"EnableTitleBarUpdate"; // bool
+inline constexpr OUString ARGUMENT_ENABLE_TITLEBARUPDATE = u"EnableTitleBarUpdate"_ustr; // bool
 
 /** [bool] enable/disable if the frame is explicitly requested to be hidden
                Default = OFF !
  */
-inline constexpr OUStringLiteral ARGUMENT_HIDDENFORCONVERSION = u"HiddenForConversion"; // bool
+inline constexpr OUString ARGUMENT_HIDDENFORCONVERSION = u"HiddenForConversion"_ustr; // bool
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/windowstateproperties.hxx b/framework/inc/uiconfiguration/windowstateproperties.hxx
index bec99da06e34..f400dd0b54a0 100644
--- a/framework/inc/uiconfiguration/windowstateproperties.hxx
+++ b/framework/inc/uiconfiguration/windowstateproperties.hxx
@@ -21,21 +21,21 @@
 
 #include <rtl/ustring.hxx>
 
-inline constexpr OUStringLiteral WINDOWSTATE_PROPERTY_LOCKED = u"Locked";
-inline constexpr OUStringLiteral WINDOWSTATE_PROPERTY_DOCKED = u"Docked";
-inline constexpr OUStringLiteral WINDOWSTATE_PROPERTY_VISIBLE = u"Visible";
-inline constexpr OUStringLiteral WINDOWSTATE_PROPERTY_DOCKINGAREA = u"DockingArea";
-inline constexpr OUStringLiteral WINDOWSTATE_PROPERTY_DOCKPOS = u"DockPos";
-inline constexpr OUStringLiteral WINDOWSTATE_PROPERTY_DOCKSIZE = u"DockSize";
-inline constexpr OUStringLiteral WINDOWSTATE_PROPERTY_POS = u"Pos";
-inline constexpr OUStringLiteral WINDOWSTATE_PROPERTY_SIZE = u"Size";
-inline constexpr OUStringLiteral WINDOWSTATE_PROPERTY_UINAME = u"UIName";
-inline constexpr OUStringLiteral WINDOWSTATE_PROPERTY_INTERNALSTATE = u"InternalState";
-inline constexpr OUStringLiteral WINDOWSTATE_PROPERTY_STYLE = u"Style";
-inline constexpr OUStringLiteral WINDOWSTATE_PROPERTY_CONTEXT = u"ContextSensitive";
-inline constexpr OUStringLiteral WINDOWSTATE_PROPERTY_HIDEFROMENU = u"HideFromToolbarMenu";
-inline constexpr OUStringLiteral WINDOWSTATE_PROPERTY_NOCLOSE = u"NoClose";
-inline constexpr OUStringLiteral WINDOWSTATE_PROPERTY_SOFTCLOSE = u"SoftClose";
-inline constexpr OUStringLiteral WINDOWSTATE_PROPERTY_CONTEXTACTIVE = u"ContextActive";
+inline constexpr OUString WINDOWSTATE_PROPERTY_LOCKED = u"Locked"_ustr;
+inline constexpr OUString WINDOWSTATE_PROPERTY_DOCKED = u"Docked"_ustr;
+inline constexpr OUString WINDOWSTATE_PROPERTY_VISIBLE = u"Visible"_ustr;
+inline constexpr OUString WINDOWSTATE_PROPERTY_DOCKINGAREA = u"DockingArea"_ustr;
+inline constexpr OUString WINDOWSTATE_PROPERTY_DOCKPOS = u"DockPos"_ustr;
+inline constexpr OUString WINDOWSTATE_PROPERTY_DOCKSIZE = u"DockSize"_ustr;
+inline constexpr OUString WINDOWSTATE_PROPERTY_POS = u"Pos"_ustr;
+inline constexpr OUString WINDOWSTATE_PROPERTY_SIZE = u"Size"_ustr;
+inline constexpr OUString WINDOWSTATE_PROPERTY_UINAME = u"UIName"_ustr;
+inline constexpr OUString WINDOWSTATE_PROPERTY_INTERNALSTATE = u"InternalState"_ustr;
+inline constexpr OUString WINDOWSTATE_PROPERTY_STYLE = u"Style"_ustr;
+inline constexpr OUString WINDOWSTATE_PROPERTY_CONTEXT = u"ContextSensitive"_ustr;
+inline constexpr OUString WINDOWSTATE_PROPERTY_HIDEFROMENU = u"HideFromToolbarMenu"_ustr;
+inline constexpr OUString WINDOWSTATE_PROPERTY_NOCLOSE = u"NoClose"_ustr;
+inline constexpr OUString WINDOWSTATE_PROPERTY_SOFTCLOSE = u"SoftClose"_ustr;
+inline constexpr OUString WINDOWSTATE_PROPERTY_CONTEXTACTIVE = u"ContextActive"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/toolboxconfigurationdefines.hxx b/framework/inc/xml/toolboxconfigurationdefines.hxx
index 95a9c9802bc1..39f77f3f4c1d 100644
--- a/framework/inc/xml/toolboxconfigurationdefines.hxx
+++ b/framework/inc/xml/toolboxconfigurationdefines.hxx
@@ -22,7 +22,7 @@
 
 #define XMLNS_TOOLBAR               "http://openoffice.org/2001/toolbar"
 #define XMLNS_XLINK                 "http://www.w3.org/1999/xlink"
-inline constexpr OUStringLiteral XMLNS_TOOLBAR_PREFIX = u"toolbar:";
+inline constexpr OUString XMLNS_TOOLBAR_PREFIX = u"toolbar:"_ustr;
 #define XMLNS_XLINK_PREFIX          "xlink:"
 
 #define XMLNS_FILTER_SEPARATOR      "^"
@@ -40,26 +40,26 @@ inline constexpr OUStringLiteral XMLNS_TOOLBAR_PREFIX = u"toolbar:";
 #define ATTRIBUTE_VISIBLE           "visible"
 #define ATTRIBUTE_ITEMSTYLE         "style"
 
-inline constexpr OUStringLiteral ELEMENT_NS_TOOLBAR = u"toolbar:toolbar";
-inline constexpr OUStringLiteral ELEMENT_NS_TOOLBARITEM = u"toolbar:toolbaritem";
-inline constexpr OUStringLiteral ELEMENT_NS_TOOLBARSPACE = u"toolbar:toolbarspace";
-inline constexpr OUStringLiteral ELEMENT_NS_TOOLBARBREAK = u"toolbar:toolbarbreak";
-inline constexpr OUStringLiteral ELEMENT_NS_TOOLBARSEPARATOR = u"toolbar:toolbarseparator";
+inline constexpr OUString ELEMENT_NS_TOOLBAR = u"toolbar:toolbar"_ustr;
+inline constexpr OUString ELEMENT_NS_TOOLBARITEM = u"toolbar:toolbaritem"_ustr;
+inline constexpr OUString ELEMENT_NS_TOOLBARSPACE = u"toolbar:toolbarspace"_ustr;
+inline constexpr OUString ELEMENT_NS_TOOLBARBREAK = u"toolbar:toolbarbreak"_ustr;
+inline constexpr OUString ELEMENT_NS_TOOLBARSEPARATOR = u"toolbar:toolbarseparator"_ustr;
 
-inline constexpr OUStringLiteral ATTRIBUTE_XMLNS_TOOLBAR = u"xmlns:toolbar";
-inline constexpr OUStringLiteral ATTRIBUTE_XMLNS_XLINK = u"xmlns:xlink";
+inline constexpr OUString ATTRIBUTE_XMLNS_TOOLBAR = u"xmlns:toolbar"_ustr;
+inline constexpr OUString ATTRIBUTE_XMLNS_XLINK = u"xmlns:xlink"_ustr;
 
 #define ATTRIBUTE_BOOLEAN_TRUE      "true"
-inline constexpr OUStringLiteral ATTRIBUTE_BOOLEAN_FALSE  = u"false";
+inline constexpr OUString ATTRIBUTE_BOOLEAN_FALSE  = u"false"_ustr;
 
-inline constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_RADIO = u"radio";
-inline constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_AUTO = u"auto";
-inline constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_LEFT = u"left";
-inline constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_AUTOSIZE = u"autosize";
-inline constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_DROPDOWN = u"dropdown";
-inline constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_REPEAT = u"repeat";
-inline constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_TEXT = u"text";
-inline constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY = u"dropdownonly";
-inline constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_IMAGE = u"image";
+inline constexpr OUString ATTRIBUTE_ITEMSTYLE_RADIO = u"radio"_ustr;
+inline constexpr OUString ATTRIBUTE_ITEMSTYLE_AUTO = u"auto"_ustr;
+inline constexpr OUString ATTRIBUTE_ITEMSTYLE_LEFT = u"left"_ustr;
+inline constexpr OUString ATTRIBUTE_ITEMSTYLE_AUTOSIZE = u"autosize"_ustr;
+inline constexpr OUString ATTRIBUTE_ITEMSTYLE_DROPDOWN = u"dropdown"_ustr;
+inline constexpr OUString ATTRIBUTE_ITEMSTYLE_REPEAT = u"repeat"_ustr;
+inline constexpr OUString ATTRIBUTE_ITEMSTYLE_TEXT = u"text"_ustr;
+inline constexpr OUString ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY = u"dropdownonly"_ustr;
+inline constexpr OUString ATTRIBUTE_ITEMSTYLE_IMAGE = u"image"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index 725148ebbc73..ddd4b3b25784 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -43,9 +43,9 @@
 namespace framework
 {
 
-inline constexpr OUStringLiteral CFG_ENTRY_PRIMARY = u"PrimaryKeys";
-inline constexpr OUStringLiteral CFG_ENTRY_GLOBAL = u"Global";
-inline constexpr OUStringLiteral CFG_ENTRY_MODULES = u"Modules";
+inline constexpr OUString CFG_ENTRY_PRIMARY = u"PrimaryKeys"_ustr;
+inline constexpr OUString CFG_ENTRY_GLOBAL = u"Global"_ustr;
+inline constexpr OUString CFG_ENTRY_MODULES = u"Modules"_ustr;
 
 /**
     implements a read/write access to the accelerator configuration.
diff --git a/framework/source/layoutmanager/helpers.hxx b/framework/source/layoutmanager/helpers.hxx
index 5ee7d3a22af5..c58fa6665bad 100644
--- a/framework/source/layoutmanager/helpers.hxx
+++ b/framework/source/layoutmanager/helpers.hxx
@@ -30,8 +30,8 @@
 #include <vcl/window.hxx>
 #include <vcl/toolbox.hxx>
 
-inline constexpr OUStringLiteral UIRESOURCE_URL = u"private:resource";
-inline constexpr OUStringLiteral UIRESOURCETYPE_TOOLBAR = u"toolbar";
+inline constexpr OUString UIRESOURCE_URL = u"private:resource"_ustr;
+inline constexpr OUString UIRESOURCETYPE_TOOLBAR = u"toolbar"_ustr;
 #define UIRESOURCETYPE_MENUBAR          "menubar"
 
 namespace framework