New loplugin:stringliteralvar

See the comment at the top of compilerplugins/clang/stringliteralvar.cxx for
details.

(Turned some affected variables in included files into inline variables, to
avoid GCC warnings about unused variables.)

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

19 files changed, 81 insertions, 78 deletions

diff --git a/framework/inc/taskcreatordefs.hxx b/framework/inc/taskcreatordefs.hxx
index 1b63cd28105b..02b85221c801 100644
--- a/framework/inc/taskcreatordefs.hxx
+++ b/framework/inc/taskcreatordefs.hxx
@@ -21,37 +21,38 @@
 #define INCLUDED_FRAMEWORK_INC_TASKCREATORDEFS_HXX
 
 /// [XFrame] if it's set, it will be used as parent frame for the new created frame.
-const char ARGUMENT_PARENTFRAME[] = "ParentFrame"; // XFrame
+const OUStringLiteral ARGUMENT_PARENTFRAME = u"ParentFrame"; // 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.
  */
-const char ARGUMENT_FRAMENAME[] = "FrameName"; // OUString
+const OUStringLiteral ARGUMENT_FRAMENAME = u"FrameName"; // OUString
 
 /// [sal_Bool] If it's set to sal_True we will make the new created frame visible.
-const char ARGUMENT_MAKEVISIBLE[] = "MakeVisible"; // sal_Bool
+const OUStringLiteral ARGUMENT_MAKEVISIBLE = u"MakeVisible"; // sal_Bool
 
 /** [sal_Bool] If not "ContainerWindow" property is set it force creation of a
                top level window as new container window.
  */
-const char ARGUMENT_CREATETOPWINDOW[] = "CreateTopWindow"; // sal_Bool
+const OUStringLiteral ARGUMENT_CREATETOPWINDOW = u"CreateTopWindow"; // sal_Bool
 
 /// [Rectangle] Place the new created frame on this place and resize the container window.
-const char ARGUMENT_POSSIZE[] = "PosSize"; // Rectangle
+inline const OUStringLiteral ARGUMENT_POSSIZE = u"PosSize"; // Rectangle
 
 /// [XWindow] an outside created window, used as container window of the new created frame.
-const char ARGUMENT_CONTAINERWINDOW[] = "ContainerWindow"; // XWindow
+inline const OUStringLiteral ARGUMENT_CONTAINERWINDOW = u"ContainerWindow"; // XWindow
 
 /** [sal_Bool] enable/disable special mode, where this frame will be part of
                the persistent window state feature suitable for any office module window
  */
-const char ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE[] = "SupportPersistentWindowState"; // sal_Bool
+const OUStringLiteral ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE
+    = u"SupportPersistentWindowState"; // sal_Bool
 
 /** [sal_Bool] enable/disable special mode, where the title bar of our
                the new created frame will be updated automatically.
                Default = ON !
  */
-const char ARGUMENT_ENABLE_TITLEBARUPDATE[] = "EnableTitleBarUpdate"; // sal_Bool
+inline const OUStringLiteral ARGUMENT_ENABLE_TITLEBARUPDATE = u"EnableTitleBarUpdate"; // sal_Bool
 
 #endif // INCLUDED_FRAMEWORK_INC_TASKCREATORDEFS_HXX
 
diff --git a/framework/qa/cppunit/loadenv.cxx b/framework/qa/cppunit/loadenv.cxx
index 96d28cd47396..5ce6826060d0 100644
--- a/framework/qa/cppunit/loadenv.cxx
+++ b/framework/qa/cppunit/loadenv.cxx
@@ -35,7 +35,7 @@ void Test::setUp()
     mxDesktop.set(frame::Desktop::create(mxComponentContext));
 }
 
-char const DATA_DIRECTORY[] = "/framework/qa/cppunit/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/framework/qa/cppunit/data/";
 
 class DocumentOpener
 {
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index d2df6e582c8f..e813213a92a0 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -57,8 +57,8 @@
 
 namespace framework
 {
-    const char CFG_ENTRY_SECONDARY[] = "SecondaryKeys";
-    const char CFG_PROP_COMMAND[] = "Command";
+    const OUStringLiteral CFG_ENTRY_SECONDARY = u"SecondaryKeys";
+    const OUStringLiteral CFG_PROP_COMMAND = u"Command";
 
     static OUString lcl_getKeyString(const css::awt::KeyEvent& aKeyEvent)
     {
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 4b5a7ff06f10..ad55be6dd213 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -72,12 +72,12 @@
 #define ATTRIBUTE_ITEMSTYLE_RADIO    "radio"
 
 // Property names of a menu/menu item ItemDescriptor
-const char ITEM_DESCRIPTOR_COMMANDURL[]  = "CommandURL";
-const char ITEM_DESCRIPTOR_HELPURL[]     = "HelpURL";
-const char ITEM_DESCRIPTOR_CONTAINER[]   = "ItemDescriptorContainer";
-const char ITEM_DESCRIPTOR_LABEL[]       = "Label";
-const char ITEM_DESCRIPTOR_TYPE[]        = "Type";
-const char ITEM_DESCRIPTOR_STYLE[]       = "Style";
+const OUStringLiteral ITEM_DESCRIPTOR_COMMANDURL = u"CommandURL";
+const OUStringLiteral ITEM_DESCRIPTOR_HELPURL = u"HelpURL";
+const OUStringLiteral ITEM_DESCRIPTOR_CONTAINER = u"ItemDescriptorContainer";
+const OUStringLiteral ITEM_DESCRIPTOR_LABEL = u"Label";
+const OUStringLiteral ITEM_DESCRIPTOR_TYPE = u"Type";
+const OUStringLiteral ITEM_DESCRIPTOR_STYLE = u"Style";
 
 //  using namespaces
 
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index 5ed0ee665405..a829e03ad20d 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -48,11 +48,11 @@ namespace framework
 {
 
 // Property names of a menu/menu item ItemDescriptor
-const char ITEM_DESCRIPTOR_COMMANDURL[]  = "CommandURL";
-const char ITEM_DESCRIPTOR_LABEL[]       = "Label";
-const char ITEM_DESCRIPTOR_TYPE[]        = "Type";
-const char ITEM_DESCRIPTOR_STYLE[]       = "Style";
-const char ITEM_DESCRIPTOR_VISIBLE[]     = "IsVisible";
+const OUStringLiteral ITEM_DESCRIPTOR_COMMANDURL = u"CommandURL";
+const OUStringLiteral ITEM_DESCRIPTOR_LABEL = u"Label";
+const OUStringLiteral ITEM_DESCRIPTOR_TYPE = u"Type";
+const OUStringLiteral ITEM_DESCRIPTOR_STYLE = u"Style";
+const OUStringLiteral ITEM_DESCRIPTOR_VISIBLE = u"IsVisible";
 
 static void ExtractToolbarParameters( const Sequence< PropertyValue >& rProp,
                                       OUString&                        rCommandURL,
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index d0a621babcd5..212f0a80e24b 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -33,7 +33,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
 
 const int PROPHANDLE_UINAME     = 1;
-const char PROPNAME_UINAME[]    = "UIName";
+const OUStringLiteral PROPNAME_UINAME = u"UIName";
 
 namespace framework
 {
diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx
index 79e5104e933f..55f6ccecfd50 100644
--- a/framework/source/fwi/uielement/itemcontainer.cxx
+++ b/framework/source/fwi/uielement/itemcontainer.cxx
@@ -30,7 +30,8 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
 
-const char WRONG_TYPE_EXCEPTION[] = "Type must be css::uno::Sequence< css::beans::PropertyValue >";
+const OUStringLiteral WRONG_TYPE_EXCEPTION
+    = u"Type must be css::uno::Sequence< css::beans::PropertyValue >";
 
 namespace framework
 {
diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx
index edf695135d1d..0016789d2da6 100644
--- a/framework/source/fwi/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
@@ -33,10 +33,11 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
 
-const char WRONG_TYPE_EXCEPTION[] = "Type must be css::uno::Sequence< css::beans::PropertyValue >";
+const OUStringLiteral WRONG_TYPE_EXCEPTION
+    = u"Type must be css::uno::Sequence< css::beans::PropertyValue >";
 
 const int PROPHANDLE_UINAME     = 1;
-const char PROPNAME_UINAME[]    = "UIName";
+const OUStringLiteral PROPNAME_UINAME = u"UIName";
 
 namespace framework
 {
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index f525a1d2c1dd..ce923b2f9e55 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -48,7 +48,7 @@ struct RescheduleLock: public rtl::Static<osl::Mutex, RescheduleLock> {}; ///< m
 
 }
 
-const char PROGRESS_RESOURCE[] = "private:resource/progressbar/progressbar";
+const OUStringLiteral PROGRESS_RESOURCE = u"private:resource/progressbar/progressbar";
 
 StatusIndicatorFactory::StatusIndicatorFactory(const css::uno::Reference< css::uno::XComponentContext >& xContext)
     : m_xContext          (xContext )
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index b0138d04a77c..f27c51186f30 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -37,14 +37,14 @@ const int UIELEMENT_PROPHANDLE_TYPE             = 5;
 const int UIELEMENT_PROPHANDLE_XMENUBAR         = 6;
 const int UIELEMENT_PROPHANDLE_CONFIGLISTENER   = 7;
 const int UIELEMENT_PROPHANDLE_NOCLOSE          = 8;
-const char UIELEMENT_PROPNAME_CONFIGLISTENER[] = "ConfigListener";
-const char UIELEMENT_PROPNAME_CONFIGSOURCE[] = "ConfigurationSource";
-const char UIELEMENT_PROPNAME_FRAME[] = "Frame";
-const char UIELEMENT_PROPNAME_PERSISTENT[] = "Persistent";
-const char UIELEMENT_PROPNAME_RESOURCEURL[] = "ResourceURL";
-const char UIELEMENT_PROPNAME_TYPE[] = "Type";
-const char UIELEMENT_PROPNAME_XMENUBAR[] = "XMenuBar";
-const char UIELEMENT_PROPNAME_NOCLOSE[] = "NoClose";
+const OUStringLiteral UIELEMENT_PROPNAME_CONFIGLISTENER = u"ConfigListener";
+const OUStringLiteral UIELEMENT_PROPNAME_CONFIGSOURCE = u"ConfigurationSource";
+const OUStringLiteral UIELEMENT_PROPNAME_FRAME = u"Frame";
+const OUStringLiteral UIELEMENT_PROPNAME_PERSISTENT = u"Persistent";
+const OUStringLiteral UIELEMENT_PROPNAME_RESOURCEURL = u"ResourceURL";
+const OUStringLiteral UIELEMENT_PROPNAME_TYPE = u"Type";
+const OUStringLiteral UIELEMENT_PROPNAME_XMENUBAR = u"XMenuBar";
+const OUStringLiteral UIELEMENT_PROPNAME_NOCLOSE = u"NoClose";
 using namespace com::sun::star::beans;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::frame;
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index 76cf234ff94f..06db2788beac 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -28,9 +28,9 @@
 const int UIELEMENT_PROPHANDLE_RESOURCEURL  = 1;
 const int UIELEMENT_PROPHANDLE_TYPE         = 2;
 const int UIELEMENT_PROPHANDLE_FRAME        = 3;
-const char UIELEMENT_PROPNAME_RESOURCEURL[] = "ResourceURL";
-const char UIELEMENT_PROPNAME_TYPE[] = "Type";
-const char UIELEMENT_PROPNAME_FRAME[] = "Frame";
+const OUStringLiteral UIELEMENT_PROPNAME_RESOURCEURL = u"ResourceURL";
+const OUStringLiteral UIELEMENT_PROPNAME_TYPE = u"Type";
+const OUStringLiteral UIELEMENT_PROPNAME_FRAME = u"Frame";
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index 8066a63ff760..6f9daa38b14b 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -40,9 +40,9 @@
 namespace framework
 {
 
-const char CFG_ENTRY_PRIMARY[] = "PrimaryKeys";
-const char CFG_ENTRY_GLOBAL[] = "Global";
-const char CFG_ENTRY_MODULES[] = "Modules";
+inline const OUStringLiteral CFG_ENTRY_PRIMARY = u"PrimaryKeys";
+inline const OUStringLiteral CFG_ENTRY_GLOBAL = u"Global";
+inline const OUStringLiteral CFG_ENTRY_MODULES = u"Modules";
 
 /**
     implements a read/write access to the accelerator configuration.
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 67a40b89738c..6090cb0f9646 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -76,7 +76,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::ui;
 using namespace ::com::sun::star::frame;
 
-const char STATUS_BAR_ALIAS[] = "private:resource/statusbar/statusbar";
+const OUStringLiteral STATUS_BAR_ALIAS = u"private:resource/statusbar/statusbar";
 
 namespace framework
 {
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 59687abbeefb..c24e65959cfb 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -91,8 +91,8 @@
 #include <classes/taskcreator.hxx>
 #include <tools/fileutil.hxx>
 
-const char PROP_TYPES[] = "Types";
-const char PROP_NAME[] = "Name";
+const OUStringLiteral PROP_TYPES = u"Types";
+const OUStringLiteral PROP_NAME = u"Name";
 
 namespace framework {
 
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index c7cdabb4e365..10b8574d6155 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -995,30 +995,30 @@ private:
 };
 
 // recovery.xcu
-const char CFG_PACKAGE_RECOVERY[] = "org.openoffice.Office.Recovery/";
+const OUStringLiteral CFG_PACKAGE_RECOVERY = u"org.openoffice.Office.Recovery/";
 
 const char CFG_ENTRY_AUTOSAVE_ENABLED[] = "AutoSave/Enabled";
 const char CFG_ENTRY_AUTOSAVE_TIMEINTERVALL[] = "AutoSave/TimeIntervall"; //sic!
 
-const char CFG_ENTRY_REALDEFAULTFILTER[] = "ooSetupFactoryActualFilter";
+const OUStringLiteral CFG_ENTRY_REALDEFAULTFILTER = u"ooSetupFactoryActualFilter";
 
-const char CFG_ENTRY_PROP_TEMPURL[] = "TempURL";
-const char CFG_ENTRY_PROP_ORIGINALURL[] = "OriginalURL";
-const char CFG_ENTRY_PROP_TEMPLATEURL[] = "TemplateURL";
-const char CFG_ENTRY_PROP_FACTORYURL[] = "FactoryURL";
-const char CFG_ENTRY_PROP_MODULE[] = "Module";
-const char CFG_ENTRY_PROP_DOCUMENTSTATE[] = "DocumentState";
-const char CFG_ENTRY_PROP_FILTER[] = "Filter";
-const char CFG_ENTRY_PROP_TITLE[] = "Title";
-const char CFG_ENTRY_PROP_ID[] = "ID";
-const char CFG_ENTRY_PROP_VIEWNAMES[] = "ViewNames";
+const OUStringLiteral CFG_ENTRY_PROP_TEMPURL = u"TempURL";
+const OUStringLiteral CFG_ENTRY_PROP_ORIGINALURL = u"OriginalURL";
+const OUStringLiteral CFG_ENTRY_PROP_TEMPLATEURL = u"TemplateURL";
+const OUStringLiteral CFG_ENTRY_PROP_FACTORYURL = u"FactoryURL";
+const OUStringLiteral CFG_ENTRY_PROP_MODULE = u"Module";
+const OUStringLiteral CFG_ENTRY_PROP_DOCUMENTSTATE = u"DocumentState";
+const OUStringLiteral CFG_ENTRY_PROP_FILTER = u"Filter";
+const OUStringLiteral CFG_ENTRY_PROP_TITLE = u"Title";
+const OUStringLiteral CFG_ENTRY_PROP_ID = u"ID";
+const OUStringLiteral CFG_ENTRY_PROP_VIEWNAMES = u"ViewNames";
 
-const char FILTER_PROP_TYPE[] = "Type";
-const char TYPE_PROP_EXTENSIONS[] = "Extensions";
+const OUStringLiteral FILTER_PROP_TYPE = u"Type";
+const OUStringLiteral TYPE_PROP_EXTENSIONS = u"Extensions";
 
 // setup.xcu
-const char CFG_ENTRY_PROP_EMPTYDOCUMENTURL[] = "ooSetupFactoryEmptyDocumentURL";
-const char CFG_ENTRY_PROP_FACTORYSERVICE[] = "ooSetupFactoryDocumentService";
+const OUStringLiteral CFG_ENTRY_PROP_EMPTYDOCUMENTURL = u"ooSetupFactoryEmptyDocumentURL";
+const OUStringLiteral CFG_ENTRY_PROP_FACTORYSERVICE = u"ooSetupFactoryDocumentService";
 
 const char EVENT_ON_NEW[] = "OnNew";
 const char EVENT_ON_LOAD[] = "OnLoad";
@@ -1034,7 +1034,7 @@ const char EVENT_ON_SAVEFAILED[] = "OnSaveFailed";
 const char EVENT_ON_SAVEASFAILED[] = "OnSaveAsFailed";
 const char EVENT_ON_SAVETOFAILED[] = "OnCopyToFailed";
 
-const char RECOVERY_ITEM_BASE_IDENTIFIER[] = "recovery_item_";
+const OUStringLiteral RECOVERY_ITEM_BASE_IDENTIFIER = u"recovery_item_";
 
 const char CMD_PROTOCOL[] = "vnd.sun.star.autorecovery:";
 
@@ -1050,17 +1050,17 @@ const char CMD_DO_SESSION_RESTORE[] = "/doSessionRestore";    // restore a saved
 const char CMD_DO_DISABLE_RECOVERY[] = "/disableRecovery";    // disable recovery and auto save (!) temp. for this office session
 const char CMD_DO_SET_AUTOSAVE_STATE[] = "/setAutoSaveState";    // disable/enable auto save (not crash save) for this office session
 
-const char REFERRER_USER[] = "private:user";
+const OUStringLiteral REFERRER_USER = u"private:user";
 
-const char PROP_DISPATCH_ASYNCHRON[] = "DispatchAsynchron";
-const char PROP_PROGRESS[] = "StatusIndicator";
-const char PROP_SAVEPATH[] = "SavePath";
-const char PROP_ENTRY_ID[] = "EntryID";
-const char PROP_AUTOSAVE_STATE[] = "AutoSaveState";
+const OUStringLiteral PROP_DISPATCH_ASYNCHRON = u"DispatchAsynchron";
+const OUStringLiteral PROP_PROGRESS = u"StatusIndicator";
+const OUStringLiteral PROP_SAVEPATH = u"SavePath";
+const OUStringLiteral PROP_ENTRY_ID = u"EntryID";
+const OUStringLiteral PROP_AUTOSAVE_STATE = u"AutoSaveState";
 
-const char OPERATION_START[] = "start";
-const char OPERATION_STOP[] = "stop";
-const char OPERATION_UPDATE[] = "update";
+const OUStringLiteral OPERATION_START = u"start";
+const OUStringLiteral OPERATION_STOP = u"stop";
+const OUStringLiteral OPERATION_UPDATE = u"update";
 
 const sal_Int32       MIN_DISCSPACE_DOCSAVE                  =   5; // [MB]
 const sal_Int32       MIN_DISCSPACE_CONFIGSAVE               =   1; // [MB]
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 681ce8a4a7ba..6206aa3864f5 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -64,8 +64,8 @@ using namespace ::cppu;
 
 const sal_Int16 MAX_IMAGETYPE_VALUE       = css::ui::ImageType::SIZE_32;
 
-const char   IMAGE_FOLDER[]        = "images";
-const char   BITMAPS_FOLDER[]      = "Bitmaps";
+const OUStringLiteral IMAGE_FOLDER = u"images";
+const OUStringLiteral BITMAPS_FOLDER = u"Bitmaps";
 
 const o3tl::enumarray<vcl::ImageType, const char*> IMAGELIST_XML_FILE =
 {
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 3d79087be85d..e0fd3d07f4d2 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -40,9 +40,9 @@ using namespace com::sun::star::util;
 
 namespace {
 
-const char CMD_CLEAR_LIST[]   = ".uno:ClearRecentFileList";
-const char CMD_OPEN_AS_TEMPLATE[] = ".uno:OpenTemplate";
-const char CMD_OPEN_REMOTE[]  = ".uno:OpenRemote";
+const OUStringLiteral CMD_CLEAR_LIST = u".uno:ClearRecentFileList";
+const OUStringLiteral CMD_OPEN_AS_TEMPLATE = u".uno:OpenTemplate";
+const OUStringLiteral CMD_OPEN_REMOTE = u".uno:OpenRemote";
 
 class RecentFilesMenuController :  public svt::PopupMenuControllerBase
 {
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 7cce1b37d29c..0689cd39aff2 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -68,9 +68,9 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::ui;
 
-const char CMD_RESTOREVISIBILITY[]       = ".cmd:RestoreVisibility";
+const OUStringLiteral CMD_RESTOREVISIBILITY = u".cmd:RestoreVisibility";
 
-const char STATIC_CMD_PART[]             = ".uno:AvailableToolbars?Toolbar:string=";
+const OUStringLiteral STATIC_CMD_PART    = u".uno:AvailableToolbars?Toolbar:string=";
 const char STATIC_INTERNAL_CMD_PART[]    = ".cmd:";
 
 namespace framework
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 28c606ea96a4..23ef0b8654f4 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star::frame;
 const char CONFIGURATION_ROOT_ACCESS[]           = "/org.openoffice.Office.UI.";
 
 // Special resource URLs to retrieve additional information
-const char PRIVATE_RESOURCE_URL[]                = "private:";
+const OUStringLiteral PRIVATE_RESOURCE_URL       = u"private:";
 
 const sal_Int32   COMMAND_PROPERTY_IMAGE                = 1;
 const sal_Int32   COMMAND_PROPERTY_ROTATE               = 2;