framework/source/accelerators/acceleratorconfiguration.cxx | 8 -
framework/source/accelerators/storageholder.cxx | 2
framework/source/dispatch/closedispatcher.cxx | 4
framework/source/dispatch/servicehandler.cxx | 2
framework/source/dispatch/systemexec.cxx | 2
framework/source/fwe/classes/addonsoptions.cxx | 10 +-
framework/source/fwe/helper/propertysetcontainer.cxx | 2
framework/source/fwe/xml/menudocumenthandler.cxx | 46
+++++-----
framework/source/fwe/xml/statusbardocumenthandler.cxx | 36 +++----
framework/source/fwe/xml/toolboxdocumenthandler.cxx | 10 +-
framework/source/fwi/classes/protocolhandlercache.cxx | 2
framework/source/fwi/uielement/constitemcontainer.cxx | 2
framework/source/fwi/uielement/itemcontainer.cxx | 4
framework/source/fwi/uielement/rootitemcontainer.cxx | 6 -
framework/source/helper/statusindicatorfactory.cxx | 2
framework/source/helper/uiconfigelementwrapperbase.cxx | 16 +--
framework/source/helper/uielementwrapperbase.cxx | 6 -
framework/source/jobs/jobexecutor.cxx | 4
framework/source/layoutmanager/layoutmanager.cxx | 2
framework/source/loadenv/loadenv.cxx | 4
framework/source/recording/dispatchrecorder.cxx | 2
framework/source/services/autorecovery.cxx | 24 ++---
framework/source/services/pathsettings.cxx | 10 +-
framework/source/uiconfiguration/imagemanagerimpl.cxx | 4
framework/source/uielement/fontsizemenucontroller.cxx | 2
framework/source/uielement/langselectionstatusbarcontroller.cxx | 2
framework/source/uielement/macrosmenucontroller.cxx | 2
framework/source/uielement/menubarmanager.cxx | 2
framework/source/uielement/newmenucontroller.cxx | 4
framework/source/uielement/recentfilesmenucontroller.cxx | 8 -
framework/source/uielement/toolbarsmenucontroller.cxx | 8 -
framework/source/uielement/uicommanddescription.cxx | 16 +--
framework/source/xml/imagesdocumenthandler.cxx | 10 +-
sal/osl/unx/pipe.cxx | 4
sal/qa/osl/pipe/osl_Pipe.cxx | 8 -
sal/qa/rtl/digest/rtl_digest.cxx | 2
sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx | 16 +--
sal/qa/rtl/process/rtl_Process.cxx | 4
sal/qa/rtl/textenc/rtl_textcvt.cxx | 2
39 files changed, 150 insertions(+), 150 deletions(-)
New commits:
commit 35948cad8d41c0e70debb442b8f6182b28f0a65a
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Oct 19 10:30:23 2023 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Oct 20 07:06:31 2023 +0200
Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: sal
Change-Id: If4a7951fd3f9f7f2e081e6b8ba482566260c3235
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158209
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx
index 9aaa83bcb79e..43f577ba8f44 100644
--- a/sal/osl/unx/pipe.cxx
+++ b/sal/osl/unx/pipe.cxx
@@ -37,8 +37,8 @@
#include <sys/stat.h>
#include <unistd.h>
-constexpr OStringLiteral PIPEDEFAULTPATH = "/tmp";
-constexpr OStringLiteral PIPEALTERNATEPATH = "/var/tmp";
+constexpr OString PIPEDEFAULTPATH = "/tmp"_ostr;
+constexpr OString PIPEALTERNATEPATH = "/var/tmp"_ostr;
static oslPipe osl_psz_createPipe(const char *pszPipeName, oslPipeOptions
Options, oslSecurity Security);
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 39c9e99864f6..62463f8868dc 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -82,11 +82,11 @@ static void printPipeError( ::osl::Pipe const & aPipe )
// pipe name and transfer contents
-constexpr OUStringLiteral aTestPipeName(u"testpipe2");
-constexpr OUStringLiteral aTestPipe1(u"testpipe1");
+constexpr OUString aTestPipeName(u"testpipe2"_ustr);
+constexpr OUString aTestPipe1(u"testpipe1"_ustr);
-constexpr OStringLiteral m_pTestString1("Sun Microsystems");
-constexpr OStringLiteral m_pTestString2("test pipe PASS/OK");
+constexpr OString m_pTestString1("Sun Microsystems"_ostr);
+constexpr OString m_pTestString2("test pipe PASS/OK"_ostr);
// test code start here
diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx
index f62e951a7295..e259eead6a69 100644
--- a/sal/qa/rtl/digest/rtl_digest.cxx
+++ b/sal/qa/rtl/digest/rtl_digest.cxx
@@ -36,7 +36,7 @@ using namespace rtl;
namespace
{
-constexpr OStringLiteral sSampleString ("This is a sample
sentence, which we use to check some crypto functions in sal.");
+constexpr OString sSampleString ("This is a sample sentence,
which we use to check some crypto functions in sal."_ostr);
constexpr OStringLiteral sSampleString_only_one_diff ("This is a sample
sentence. which we use to check some crypto functions in sal.");
const rtlDigestAlgorithm constDigestAlgorithms[] =
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
index 6134bc20195a..24e77cd24047 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
@@ -80,41 +80,41 @@ void createMessage(
void test::oustringbuffer::Utf32::appendUtf32() {
int const str1Len = 3;
sal_Unicode const str1[str1Len] = { 'a', 'b', 'c' };
- static constexpr OUStringLiteral str2 = u"abcd";
- static constexpr OUStringLiteral str3 = u"abcd\U00010000";
+ static constexpr OUString str2 = u"abcd"_ustr;
+ static constexpr OUString str3 = u"abcd\U00010000"_ustr;
OStringBuffer message;
OUStringBuffer buf1(std::u16string_view(str1, str1Len));
buf1.appendUtf32('d');
OUString res1(buf1.makeStringAndClear());
createMessage(message, res1, str2);
CPPUNIT_ASSERT_EQUAL_MESSAGE(
- message.getStr(), OUString(str2), res1);
+ message.getStr(), str2, res1);
OUStringBuffer buf2(str2);
buf2.appendUtf32(0x10000);
OUString res2(buf2.makeStringAndClear());
createMessage(message, res2, str3);
CPPUNIT_ASSERT_EQUAL_MESSAGE(
- message.getStr(), OUString(str3), res2);
+ message.getStr(), str3, res2);
}
void test::oustringbuffer::Utf32::insertUtf32() {
int const str1Len = 3;
sal_Unicode const str1[str1Len] = { 'a', 'b', 'c' };
- static constexpr OUStringLiteral str2 = u"abdc";
- static constexpr OUStringLiteral str3 = u"ab\U0010FFFFdc";
+ static constexpr OUString str2 = u"abdc"_ustr;
+ static constexpr OUString str3 = u"ab\U0010FFFFdc"_ustr;
OStringBuffer message;
OUStringBuffer buf1(std::u16string_view(str1, str1Len));
buf1.insertUtf32(2, 'd');
OUString res1(buf1.makeStringAndClear());
createMessage(message, res1, str2);
CPPUNIT_ASSERT_EQUAL_MESSAGE(
- message.getStr(), OUString(str2), res1);
+ message.getStr(), str2, res1);
OUStringBuffer buf2(str2);
buf2.insertUtf32(2, 0x10FFFF);
OUString res2(buf2.makeStringAndClear());
createMessage(message, res2, str3);
CPPUNIT_ASSERT_EQUAL_MESSAGE(
- message.getStr(), OUString(str3), res2);
+ message.getStr(), str3, res2);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/process/rtl_Process.cxx
b/sal/qa/rtl/process/rtl_Process.cxx
index 4895035bf185..391f000c7cad 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -69,7 +69,7 @@ public:
#if defined(_WIN32)
static constexpr OUStringLiteral EXECUTABLE_NAME(u"child_process.exe");
#else
- static constexpr OUStringLiteral EXECUTABLE_NAME(u"child_process");
+ static constexpr OUString EXECUTABLE_NAME(u"child_process"_ustr);
#endif
OUString suCWD = getModulePath();
// OUString suCWD2 = getExecutableDirectory();
@@ -198,7 +198,7 @@ public:
#if defined(_WIN32)
static constexpr OUStringLiteral EXEC_NAME(u"child_process_id.exe");
#else
- static constexpr OUStringLiteral EXEC_NAME(u"child_process_id");
+ static constexpr OUString EXEC_NAME(u"child_process_id"_ustr);
#endif
sal_uInt8 pTargetUUID1[16];
rtl_getGlobalProcessId( pTargetUUID1 );
diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx
b/sal/qa/rtl/textenc/rtl_textcvt.cxx
index b2d4591065dd..6780b37f55fe 100644
--- a/sal/qa/rtl/textenc/rtl_textcvt.cxx
+++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx
@@ -3027,7 +3027,7 @@ void Test::testInvalidUtf8() {
auto const converter = rtl_createTextToUnicodeConverter(
RTL_TEXTENCODING_JAVA_UTF8);
CPPUNIT_ASSERT(converter != nullptr);
- constexpr OStringLiteral input(u8"\U00010000");
+ constexpr OString input(u8"\U00010000"_ostr);
sal_Unicode buf[TEST_STRING_SIZE];
sal_uInt32 info;
sal_Size converted;
commit 64c47c92d09c276408405e2520328155dd665427
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Oct 19 10:30:16 2023 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Oct 20 07:06:17 2023 +0200
Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: framework
Change-Id: I0f17c569eddcdc30bfca4cdcd25cb05cf783ec23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158200
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx
b/framework/source/accelerators/acceleratorconfiguration.cxx
index 975b5bf11f7d..0dff986fa91e 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -53,13 +53,13 @@
#include <rtl/ustrbuf.hxx>
#include <o3tl/string_view.hxx>
-constexpr OUStringLiteral PRESET_DEFAULT = u"default";
-constexpr OUStringLiteral TARGET_CURRENT = u"current";
+constexpr OUString PRESET_DEFAULT = u"default"_ustr;
+constexpr OUString TARGET_CURRENT = u"current"_ustr;
namespace framework
{
- constexpr OUStringLiteral CFG_ENTRY_SECONDARY = u"SecondaryKeys";
- constexpr OUStringLiteral CFG_PROP_COMMAND = u"Command";
+ constexpr OUString CFG_ENTRY_SECONDARY = u"SecondaryKeys"_ustr;
+ constexpr OUString CFG_PROP_COMMAND = u"Command"_ustr;
static OUString lcl_getKeyString(const css::awt::KeyEvent& aKeyEvent)
{
diff --git a/framework/source/accelerators/storageholder.cxx
b/framework/source/accelerators/storageholder.cxx
index c0a6106d7202..6cef699bfb14 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -30,7 +30,7 @@
#include <algorithm>
-constexpr OUStringLiteral PATH_SEPARATOR = u"/";
+constexpr OUString PATH_SEPARATOR = u"/"_ustr;
#define PATH_SEPARATOR_UNICODE u'/'
namespace framework
diff --git a/framework/source/dispatch/closedispatcher.cxx
b/framework/source/dispatch/closedispatcher.cxx
index a30aab0c447f..2fd3bc91e39f 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -52,8 +52,8 @@ namespace framework{
#endif
namespace fpf = ::framework::pattern::frame;
-constexpr OUStringLiteral URL_CLOSEDOC = u".uno:CloseDoc";
-constexpr OUStringLiteral URL_CLOSEWIN = u".uno:CloseWin";
+constexpr OUString URL_CLOSEDOC = u".uno:CloseDoc"_ustr;
+constexpr OUString URL_CLOSEWIN = u".uno:CloseWin"_ustr;
const char URL_CLOSEFRAME[] = ".uno:CloseFrame";
CloseDispatcher::CloseDispatcher(css::uno::Reference<
css::uno::XComponentContext > xContext ,
diff --git a/framework/source/dispatch/servicehandler.cxx
b/framework/source/dispatch/servicehandler.cxx
index 7a85a98d604b..cb29898350b9 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -30,7 +30,7 @@
namespace framework{
-constexpr OUStringLiteral PROTOCOL_VALUE = u"service:";
+constexpr OUString PROTOCOL_VALUE = u"service:"_ustr;
// XInterface, XTypeProvider, XServiceInfo
diff --git a/framework/source/dispatch/systemexec.cxx
b/framework/source/dispatch/systemexec.cxx
index c7b3778427b8..1891b9b62b1f 100644
--- a/framework/source/dispatch/systemexec.cxx
+++ b/framework/source/dispatch/systemexec.cxx
@@ -30,7 +30,7 @@
namespace framework{
-constexpr OUStringLiteral PROTOCOL_VALUE = u"systemexecute:";
+constexpr OUString PROTOCOL_VALUE = u"systemexecute:"_ustr;
// XInterface, XTypeProvider, XServiceInfo
diff --git a/framework/source/fwe/classes/addonsoptions.cxx
b/framework/source/fwe/classes/addonsoptions.cxx
index cd384c737aa7..7801fa5e8175 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -52,7 +52,7 @@ using namespace ::com::sun::star;
constexpr OUStringLiteral ROOTNODE_ADDONMENU = u"Office.Addons";
constexpr OUStringLiteral PATHDELIMITER = u"/";
-constexpr OUStringLiteral SEPARATOR_URL = u"private:separator";
+constexpr OUString SEPARATOR_URL = u"private:separator"_ustr;
#define PROPERTYNAME_URL
ADDONSMENUITEM_STRING_URL
#define PROPERTYNAME_TITLE
ADDONSMENUITEM_STRING_TITLE
@@ -928,7 +928,7 @@ OUString AddonsOptions_Impl::GeneratePrefixURL()
void AddonsOptions_Impl::ReadMenuMergeInstructions(
MergeMenuInstructionContainer& aContainer )
{
- static constexpr OUStringLiteral aMenuMergeRootName(
u"AddonUI/OfficeMenuBarMerging/" );
+ static constexpr OUString aMenuMergeRootName(
u"AddonUI/OfficeMenuBarMerging/"_ustr );
Sequence< OUString > aAddonMergeNodesSeq = GetNodeNames(
aMenuMergeRootName );
@@ -1000,7 +1000,7 @@ void AddonsOptions_Impl::ReadMergeMenuData(
std::u16string_view aMergeAddonInstr
void AddonsOptions_Impl::ReadToolbarMergeInstructions(
ToolbarMergingInstructions& rCachedToolbarMergingInstructions )
{
- static constexpr OUStringLiteral aToolbarMergeRootName(
u"AddonUI/OfficeToolbarMerging/" );
+ static constexpr OUString aToolbarMergeRootName(
u"AddonUI/OfficeToolbarMerging/"_ustr );
Sequence< OUString > aAddonMergeNodesSeq = GetNodeNames(
aToolbarMergeRootName );
sal_uInt32 nCount = aAddonMergeNodesSeq.getLength();
@@ -1072,7 +1072,7 @@ void AddonsOptions_Impl::ReadMergeToolbarData(
std::u16string_view aMergeAddonIn
void AddonsOptions_Impl::ReadNotebookBarMergeInstructions(
NotebookBarMergingInstructions& rCachedNotebookBarMergingInstructions)
{
- static constexpr OUStringLiteral
aNotebookBarMergeRootName(u"AddonUI/OfficeNotebookBarMerging/");
+ static constexpr OUString
aNotebookBarMergeRootName(u"AddonUI/OfficeNotebookBarMerging/"_ustr);
Sequence<OUString> aAddonMergeNodesSeq =
GetNodeNames(aNotebookBarMergeRootName);
sal_uInt32 nCount = aAddonMergeNodesSeq.getLength();
@@ -1147,7 +1147,7 @@ void AddonsOptions_Impl::ReadMergeNotebookBarData(
void AddonsOptions_Impl::ReadStatusbarMergeInstructions(
MergeStatusbarInstructionContainer& aContainer )
{
- static constexpr OUStringLiteral aStatusbarMergeRootName(
u"AddonUI/OfficeStatusbarMerging/" );
+ static constexpr OUString aStatusbarMergeRootName(
u"AddonUI/OfficeStatusbarMerging/"_ustr );
Sequence< OUString > aAddonMergeNodesSeq = GetNodeNames(
aStatusbarMergeRootName );
sal_uInt32 nCount = aAddonMergeNodesSeq.getLength();
diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx
b/framework/source/fwe/helper/propertysetcontainer.cxx
index 2fcd07a53fde..c766b40db56b 100644
--- a/framework/source/fwe/helper/propertysetcontainer.cxx
+++ b/framework/source/fwe/helper/propertysetcontainer.cxx
@@ -23,7 +23,7 @@
#include <cppuhelper/queryinterface.hxx>
#include <vcl/svapp.hxx>
-constexpr OUStringLiteral WRONG_TYPE_EXCEPTION = u"Only XPropertSet allowed!";
+constexpr OUString WRONG_TYPE_EXCEPTION = u"Only XPropertSet allowed!"_ustr;
using namespace cppu;
using namespace com::sun::star::uno;
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx
b/framework/source/fwe/xml/menudocumenthandler.cxx
index 950759215043..96e4b2324ba8 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -40,25 +40,25 @@
constexpr OUStringLiteral XMLNS_MENU = u"http://openoffice.org/2001/menu";;
-constexpr OUStringLiteral ELEMENT_MENUBAR =
u"http://openoffice.org/2001/menu^menubar";;
-constexpr OUStringLiteral ELEMENT_MENU =
u"http://openoffice.org/2001/menu^menu";;
-constexpr OUStringLiteral ELEMENT_MENUPOPUP =
u"http://openoffice.org/2001/menu^menupopup";;
-constexpr OUStringLiteral ELEMENT_MENUITEM =
u"http://openoffice.org/2001/menu^menuitem";;
-constexpr OUStringLiteral ELEMENT_MENUSEPARATOR =
u"http://openoffice.org/2001/menu^menuseparator";;
+constexpr OUString ELEMENT_MENUBAR =
u"http://openoffice.org/2001/menu^menubar"_ustr;
+constexpr OUString ELEMENT_MENU = u"http://openoffice.org/2001/menu^menu"_ustr;
+constexpr OUString ELEMENT_MENUPOPUP =
u"http://openoffice.org/2001/menu^menupopup"_ustr;
+constexpr OUString ELEMENT_MENUITEM =
u"http://openoffice.org/2001/menu^menuitem"_ustr;
+constexpr OUString ELEMENT_MENUSEPARATOR =
u"http://openoffice.org/2001/menu^menuseparator"_ustr;
constexpr OUStringLiteral ELEMENT_NS_MENUBAR = u"menu:menubar";
-constexpr OUStringLiteral ELEMENT_NS_MENU = u"menu:menu";
-constexpr OUStringLiteral ELEMENT_NS_MENUPOPUP = u"menu:menupopup";
-constexpr OUStringLiteral ELEMENT_NS_MENUITEM = u"menu:menuitem";
-constexpr OUStringLiteral ELEMENT_NS_MENUSEPARATOR = u"menu:menuseparator";
-
-constexpr OUStringLiteral ATTRIBUTE_ID = u"http://openoffice.org/2001/menu^id";;
-constexpr OUStringLiteral ATTRIBUTE_LABEL =
u"http://openoffice.org/2001/menu^label";;
-constexpr OUStringLiteral ATTRIBUTE_HELPID =
u"http://openoffice.org/2001/menu^helpid";;
-constexpr OUStringLiteral ATTRIBUTE_STYLE =
u"http://openoffice.org/2001/menu^style";;
-
-constexpr OUStringLiteral ATTRIBUTE_NS_ID = u"menu:id";
-constexpr OUStringLiteral ATTRIBUTE_NS_LABEL = u"menu:label";
+constexpr OUString ELEMENT_NS_MENU = u"menu:menu"_ustr;
+constexpr OUString ELEMENT_NS_MENUPOPUP = u"menu:menupopup"_ustr;
+constexpr OUString ELEMENT_NS_MENUITEM = u"menu:menuitem"_ustr;
+constexpr OUString ELEMENT_NS_MENUSEPARATOR = u"menu:menuseparator"_ustr;
+
+constexpr OUString ATTRIBUTE_ID = u"http://openoffice.org/2001/menu^id"_ustr;
+constexpr OUString ATTRIBUTE_LABEL =
u"http://openoffice.org/2001/menu^label"_ustr;
+constexpr OUString ATTRIBUTE_HELPID =
u"http://openoffice.org/2001/menu^helpid"_ustr;
+constexpr OUString ATTRIBUTE_STYLE =
u"http://openoffice.org/2001/menu^style"_ustr;
+
+constexpr OUString ATTRIBUTE_NS_ID = u"menu:id"_ustr;
+constexpr OUString ATTRIBUTE_NS_LABEL = u"menu:label"_ustr;
constexpr OUStringLiteral ATTRIBUTE_NS_HELPID = u"menu:helpid";
constexpr OUStringLiteral ATTRIBUTE_NS_STYLE = u"menu:style";
@@ -71,12 +71,12 @@ constexpr OUStringLiteral MENUBAR_DOCTYPE = u"<!DOCTYPE
menu:menubar PUBLIC \"-/
#define ATTRIBUTE_ITEMSTYLE_RADIO "radio"
// Property names of a menu/menu item ItemDescriptor
-constexpr OUStringLiteral ITEM_DESCRIPTOR_COMMANDURL = u"CommandURL";
-constexpr OUStringLiteral ITEM_DESCRIPTOR_HELPURL = u"HelpURL";
-constexpr OUStringLiteral ITEM_DESCRIPTOR_CONTAINER =
u"ItemDescriptorContainer";
-constexpr OUStringLiteral ITEM_DESCRIPTOR_LABEL = u"Label";
-constexpr OUStringLiteral ITEM_DESCRIPTOR_TYPE = u"Type";
-constexpr OUStringLiteral ITEM_DESCRIPTOR_STYLE = u"Style";
+constexpr OUString ITEM_DESCRIPTOR_COMMANDURL = u"CommandURL"_ustr;
+constexpr OUString ITEM_DESCRIPTOR_HELPURL = u"HelpURL"_ustr;
+constexpr OUString ITEM_DESCRIPTOR_CONTAINER = u"ItemDescriptorContainer"_ustr;
+constexpr OUString ITEM_DESCRIPTOR_LABEL = u"Label"_ustr;
+constexpr OUString ITEM_DESCRIPTOR_TYPE = u"Type"_ustr;
+constexpr OUString ITEM_DESCRIPTOR_STYLE = u"Style"_ustr;
// using namespaces
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx
b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 0a477f951ca6..cafd3258eca1 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -38,12 +38,12 @@ using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::ui;
using namespace ::com::sun::star::container;
-constexpr OUStringLiteral XMLNS_STATUSBAR =
u"http://openoffice.org/2001/statusbar";;
-constexpr OUStringLiteral XMLNS_XLINK = u"http://www.w3.org/1999/xlink";;
+constexpr OUString XMLNS_STATUSBAR =
u"http://openoffice.org/2001/statusbar"_ustr;
+constexpr OUString XMLNS_XLINK = u"http://www.w3.org/1999/xlink"_ustr;
constexpr OUStringLiteral XMLNS_STATUSBAR_PREFIX = u"statusbar:";
constexpr OUStringLiteral XMLNS_XLINK_PREFIX = u"xlink:";
-constexpr OUStringLiteral XMLNS_FILTER_SEPARATOR = u"^";
+constexpr OUString XMLNS_FILTER_SEPARATOR = u"^"_ustr;
#define ELEMENT_STATUSBAR "statusbar"
#define ELEMENT_STATUSBARITEM "statusbaritem"
@@ -58,22 +58,22 @@ constexpr OUStringLiteral XMLNS_FILTER_SEPARATOR = u"^";
#define ATTRIBUTE_HELPURL "helpid"
#define ATTRIBUTE_MANDATORY "mandatory"
-constexpr OUStringLiteral ELEMENT_NS_STATUSBAR = u"statusbar:statusbar";
-constexpr OUStringLiteral ELEMENT_NS_STATUSBARITEM =
u"statusbar:statusbaritem";
+constexpr OUString ELEMENT_NS_STATUSBAR = u"statusbar:statusbar"_ustr;
+constexpr OUString ELEMENT_NS_STATUSBARITEM = u"statusbar:statusbaritem"_ustr;
constexpr OUStringLiteral ATTRIBUTE_XMLNS_STATUSBAR = u"xmlns:statusbar";
constexpr OUStringLiteral ATTRIBUTE_XMLNS_XLINK = u"xmlns:xlink";
-constexpr OUStringLiteral ATTRIBUTE_BOOLEAN_TRUE = u"true";
-constexpr OUStringLiteral ATTRIBUTE_BOOLEAN_FALSE = u"false";
+constexpr OUString ATTRIBUTE_BOOLEAN_TRUE = u"true"_ustr;
+constexpr OUString ATTRIBUTE_BOOLEAN_FALSE = u"false"_ustr;
-constexpr OUStringLiteral ATTRIBUTE_ALIGN_LEFT = u"left";
-constexpr OUStringLiteral ATTRIBUTE_ALIGN_RIGHT = u"right";
-constexpr OUStringLiteral ATTRIBUTE_ALIGN_CENTER = u"center";
+constexpr OUString ATTRIBUTE_ALIGN_LEFT = u"left"_ustr;
+constexpr OUString ATTRIBUTE_ALIGN_RIGHT = u"right"_ustr;
+constexpr OUString ATTRIBUTE_ALIGN_CENTER = u"center"_ustr;
constexpr OUStringLiteral ATTRIBUTE_STYLE_IN = u"in";
-constexpr OUStringLiteral ATTRIBUTE_STYLE_OUT = u"out";
-constexpr OUStringLiteral ATTRIBUTE_STYLE_FLAT = u"flat";
+constexpr OUString ATTRIBUTE_STYLE_OUT = u"out"_ustr;
+constexpr OUString ATTRIBUTE_STYLE_FLAT = u"flat"_ustr;
constexpr OUStringLiteral STATUSBAR_DOCTYPE = u"<!DOCTYPE statusbar:statusbar
PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"statusbar.dtd\">";
@@ -81,12 +81,12 @@ namespace framework
{
// Property names of a menu/menu item ItemDescriptor
-constexpr OUStringLiteral ITEM_DESCRIPTOR_COMMANDURL = u"CommandURL";
-constexpr OUStringLiteral ITEM_DESCRIPTOR_HELPURL = u"HelpURL";
-constexpr OUStringLiteral ITEM_DESCRIPTOR_OFFSET = u"Offset";
-constexpr OUStringLiteral ITEM_DESCRIPTOR_STYLE = u"Style";
-constexpr OUStringLiteral ITEM_DESCRIPTOR_WIDTH = u"Width";
-constexpr OUStringLiteral ITEM_DESCRIPTOR_TYPE = u"Type";
+constexpr OUString ITEM_DESCRIPTOR_COMMANDURL = u"CommandURL"_ustr;
+constexpr OUString ITEM_DESCRIPTOR_HELPURL = u"HelpURL"_ustr;
+constexpr OUString ITEM_DESCRIPTOR_OFFSET = u"Offset"_ustr;
+constexpr OUString ITEM_DESCRIPTOR_STYLE = u"Style"_ustr;
+constexpr OUString ITEM_DESCRIPTOR_WIDTH = u"Width"_ustr;
+constexpr OUString ITEM_DESCRIPTOR_TYPE = u"Type"_ustr;
static void ExtractStatusbarItemParameters(
const Sequence< PropertyValue >& rProp,
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index 26b28a04f348..7464939e1e03 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -49,11 +49,11 @@ namespace framework
{
// Property names of a menu/menu item ItemDescriptor
-constexpr OUStringLiteral ITEM_DESCRIPTOR_COMMANDURL = u"CommandURL";
-constexpr OUStringLiteral ITEM_DESCRIPTOR_LABEL = u"Label";
-constexpr OUStringLiteral ITEM_DESCRIPTOR_TYPE = u"Type";
-constexpr OUStringLiteral ITEM_DESCRIPTOR_STYLE = u"Style";
-constexpr OUStringLiteral ITEM_DESCRIPTOR_VISIBLE = u"IsVisible";
+constexpr OUString ITEM_DESCRIPTOR_COMMANDURL = u"CommandURL"_ustr;
+constexpr OUString ITEM_DESCRIPTOR_LABEL = u"Label"_ustr;
+constexpr OUString ITEM_DESCRIPTOR_TYPE = u"Type"_ustr;
+constexpr OUString ITEM_DESCRIPTOR_STYLE = u"Style"_ustr;
+constexpr OUString ITEM_DESCRIPTOR_VISIBLE = u"IsVisible"_ustr;
static void ExtractToolbarParameters( const Sequence< PropertyValue >& rProp,
OUString&
rCommandURL,
diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx
b/framework/source/fwi/classes/protocolhandlercache.cxx
index 7619d4323a24..490e2c91075e 100644
--- a/framework/source/fwi/classes/protocolhandlercache.cxx
+++ b/framework/source/fwi/classes/protocolhandlercache.cxx
@@ -31,7 +31,7 @@
#include <sal/log.hxx>
#include <vcl/svapp.hxx>
-constexpr OUStringLiteral SETNAME_HANDLER = u"HandlerSet"; // name of
configuration set inside package
+constexpr OUString SETNAME_HANDLER = u"HandlerSet"_ustr; // name of
configuration set inside package
namespace framework{
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx
b/framework/source/fwi/uielement/constitemcontainer.cxx
index cab82acd870c..40865c8f1b81 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -34,7 +34,7 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::container;
const int PROPHANDLE_UINAME = 1;
-constexpr OUStringLiteral PROPNAME_UINAME = u"UIName";
+constexpr OUString PROPNAME_UINAME = u"UIName"_ustr;
namespace framework
{
diff --git a/framework/source/fwi/uielement/itemcontainer.cxx
b/framework/source/fwi/uielement/itemcontainer.cxx
index bc0116b2f3f7..22bd077fced3 100644
--- a/framework/source/fwi/uielement/itemcontainer.cxx
+++ b/framework/source/fwi/uielement/itemcontainer.cxx
@@ -31,8 +31,8 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
-constexpr OUStringLiteral WRONG_TYPE_EXCEPTION
- = u"Type must be css::uno::Sequence< css::beans::PropertyValue >";
+constexpr OUString WRONG_TYPE_EXCEPTION
+ = u"Type must be css::uno::Sequence< css::beans::PropertyValue >"_ustr;
namespace framework
{
diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx
b/framework/source/fwi/uielement/rootitemcontainer.cxx
index fdfb6b709c4a..652f0dd8029f 100644
--- a/framework/source/fwi/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
@@ -34,11 +34,11 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
-constexpr OUStringLiteral WRONG_TYPE_EXCEPTION
- = u"Type must be css::uno::Sequence< css::beans::PropertyValue >";
+constexpr OUString WRONG_TYPE_EXCEPTION
+ = u"Type must be css::uno::Sequence< css::beans::PropertyValue >"_ustr;
const int PROPHANDLE_UINAME = 1;
-constexpr OUStringLiteral PROPNAME_UINAME = u"UIName";
+constexpr OUString PROPNAME_UINAME = u"UIName"_ustr;
namespace framework
{
diff --git a/framework/source/helper/statusindicatorfactory.cxx
b/framework/source/helper/statusindicatorfactory.cxx
index e9e54df6b65b..64cf3543c22a 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -42,7 +42,7 @@ namespace framework{
sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0; ///< static counter
for rescheduling
-constexpr OUStringLiteral PROGRESS_RESOURCE =
u"private:resource/progressbar/progressbar";
+constexpr OUString PROGRESS_RESOURCE =
u"private:resource/progressbar/progressbar"_ustr;
StatusIndicatorFactory::StatusIndicatorFactory(css::uno::Reference<
css::uno::XComponentContext > xContext)
: m_xContext (std::move(xContext ))
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx
b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 95d5b4c65951..05e6467a5b89 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;
-constexpr OUStringLiteral UIELEMENT_PROPNAME_CONFIGLISTENER =
u"ConfigListener";
-constexpr OUStringLiteral UIELEMENT_PROPNAME_CONFIGSOURCE =
u"ConfigurationSource";
-constexpr OUStringLiteral UIELEMENT_PROPNAME_FRAME = u"Frame";
-constexpr OUStringLiteral UIELEMENT_PROPNAME_PERSISTENT = u"Persistent";
-constexpr OUStringLiteral UIELEMENT_PROPNAME_RESOURCEURL = u"ResourceURL";
-constexpr OUStringLiteral UIELEMENT_PROPNAME_TYPE = u"Type";
-constexpr OUStringLiteral UIELEMENT_PROPNAME_XMENUBAR = u"XMenuBar";
-constexpr OUStringLiteral UIELEMENT_PROPNAME_NOCLOSE = u"NoClose";
+constexpr OUString UIELEMENT_PROPNAME_CONFIGLISTENER = u"ConfigListener"_ustr;
+constexpr OUString UIELEMENT_PROPNAME_CONFIGSOURCE =
u"ConfigurationSource"_ustr;
+constexpr OUString UIELEMENT_PROPNAME_FRAME = u"Frame"_ustr;
+constexpr OUString UIELEMENT_PROPNAME_PERSISTENT = u"Persistent"_ustr;
+constexpr OUString UIELEMENT_PROPNAME_RESOURCEURL = u"ResourceURL"_ustr;
+constexpr OUString UIELEMENT_PROPNAME_TYPE = u"Type"_ustr;
+constexpr OUString UIELEMENT_PROPNAME_XMENUBAR = u"XMenuBar"_ustr;
+constexpr OUString UIELEMENT_PROPNAME_NOCLOSE = u"NoClose"_ustr;
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 829e4f9523eb..dcf9f89e91ee 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;
-constexpr OUStringLiteral UIELEMENT_PROPNAME_RESOURCEURL = u"ResourceURL";
-constexpr OUStringLiteral UIELEMENT_PROPNAME_TYPE = u"Type";
-constexpr OUStringLiteral UIELEMENT_PROPNAME_FRAME = u"Frame";
+constexpr OUString UIELEMENT_PROPNAME_RESOURCEURL = u"ResourceURL"_ustr;
+constexpr OUString UIELEMENT_PROPNAME_TYPE = u"Type"_ustr;
+constexpr OUString UIELEMENT_PROPNAME_FRAME = u"Frame"_ustr;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
diff --git a/framework/source/jobs/jobexecutor.cxx
b/framework/source/jobs/jobexecutor.cxx
index 158351f19c4e..61806538585b 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -230,8 +230,8 @@ void SAL_CALL JobExecutor::trigger( const OUString& sEvent )
void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject&
aEvent )
{
- static constexpr OUStringLiteral
EVENT_ON_DOCUMENT_OPENED(u"onDocumentOpened"); // Job UI event : OnNew or
OnLoad
- static constexpr OUStringLiteral
EVENT_ON_DOCUMENT_ADDED(u"onDocumentAdded"); // Job API event : OnCreate or
OnLoadFinished
+ static constexpr OUString
EVENT_ON_DOCUMENT_OPENED(u"onDocumentOpened"_ustr); // Job UI event : OnNew
or OnLoad
+ static constexpr OUString
EVENT_ON_DOCUMENT_ADDED(u"onDocumentAdded"_ustr); // Job API event :
OnCreate or OnLoadFinished
OUString aModuleIdentifier;
::std::vector< JobData::TJob2DocEventBinding > lJobs;
diff --git a/framework/source/layoutmanager/layoutmanager.cxx
b/framework/source/layoutmanager/layoutmanager.cxx
index ec8bcbdb8b88..d4d30416ad26 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -77,7 +77,7 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::ui;
using namespace ::com::sun::star::frame;
-constexpr OUStringLiteral STATUS_BAR_ALIAS =
u"private:resource/statusbar/statusbar";
+constexpr OUString STATUS_BAR_ALIAS =
u"private:resource/statusbar/statusbar"_ustr;
namespace framework
{
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index 0684c7b5fa69..277e69fae8af 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -92,8 +92,8 @@
#include <classes/taskcreator.hxx>
#include <tools/fileutil.hxx>
-constexpr OUStringLiteral PROP_TYPES = u"Types";
-constexpr OUStringLiteral PROP_NAME = u"Name";
+constexpr OUString PROP_TYPES = u"Types"_ustr;
+constexpr OUString PROP_NAME = u"Name"_ustr;
namespace framework {
diff --git a/framework/source/recording/dispatchrecorder.cxx
b/framework/source/recording/dispatchrecorder.cxx
index 9c4a1bc90a81..965042290fc7 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::uno;
namespace framework{
// used to mark a dispatch as comment (mostly it indicates an error) Changing
of this define will impact all using of such comments...
-constexpr OUStringLiteral REM_AS_COMMENT = u"rem ";
+constexpr OUString REM_AS_COMMENT = u"rem "_ustr;
// XInterface, XTypeProvider, XServiceInfo
diff --git a/framework/source/services/autorecovery.cxx
b/framework/source/services/autorecovery.cxx
index 03a7d3b40748..03936b54aee8 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1048,16 +1048,16 @@ const char CFG_ENTRY_AUTOSAVE_USERAUTOSAVE_ENABLED[] =
"AutoSave/UserAutoSaveEna
constexpr OUStringLiteral CFG_ENTRY_REALDEFAULTFILTER =
u"ooSetupFactoryActualFilter";
-constexpr OUStringLiteral CFG_ENTRY_PROP_TEMPURL = u"TempURL";
-constexpr OUStringLiteral CFG_ENTRY_PROP_ORIGINALURL = u"OriginalURL";
-constexpr OUStringLiteral CFG_ENTRY_PROP_TEMPLATEURL = u"TemplateURL";
+constexpr OUString CFG_ENTRY_PROP_TEMPURL = u"TempURL"_ustr;
+constexpr OUString CFG_ENTRY_PROP_ORIGINALURL = u"OriginalURL"_ustr;
+constexpr OUString CFG_ENTRY_PROP_TEMPLATEURL = u"TemplateURL"_ustr;
constexpr OUStringLiteral CFG_ENTRY_PROP_FACTORYURL = u"FactoryURL";
-constexpr OUStringLiteral CFG_ENTRY_PROP_MODULE = u"Module";
-constexpr OUStringLiteral CFG_ENTRY_PROP_DOCUMENTSTATE = u"DocumentState";
-constexpr OUStringLiteral CFG_ENTRY_PROP_FILTER = u"Filter";
-constexpr OUStringLiteral CFG_ENTRY_PROP_TITLE = u"Title";
+constexpr OUString CFG_ENTRY_PROP_MODULE = u"Module"_ustr;
+constexpr OUString CFG_ENTRY_PROP_DOCUMENTSTATE = u"DocumentState"_ustr;
+constexpr OUString CFG_ENTRY_PROP_FILTER = u"Filter"_ustr;
+constexpr OUString CFG_ENTRY_PROP_TITLE = u"Title"_ustr;
constexpr OUStringLiteral CFG_ENTRY_PROP_ID = u"ID";
-constexpr OUStringLiteral CFG_ENTRY_PROP_VIEWNAMES = u"ViewNames";
+constexpr OUString CFG_ENTRY_PROP_VIEWNAMES = u"ViewNames"_ustr;
constexpr OUStringLiteral FILTER_PROP_TYPE = u"Type";
constexpr OUStringLiteral TYPE_PROP_EXTENSIONS = u"Extensions";
@@ -1080,7 +1080,7 @@ const char EVENT_ON_SAVEFAILED[] = "OnSaveFailed";
const char EVENT_ON_SAVEASFAILED[] = "OnSaveAsFailed";
const char EVENT_ON_SAVETOFAILED[] = "OnCopyToFailed";
-constexpr OUStringLiteral RECOVERY_ITEM_BASE_IDENTIFIER = u"recovery_item_";
+constexpr OUString RECOVERY_ITEM_BASE_IDENTIFIER = u"recovery_item_"_ustr;
const char CMD_PROTOCOL[] = "vnd.sun.star.autorecovery:";
@@ -1104,9 +1104,9 @@ constexpr OUStringLiteral PROP_SAVEPATH = u"SavePath";
constexpr OUStringLiteral PROP_ENTRY_ID = u"EntryID";
constexpr OUStringLiteral PROP_AUTOSAVE_STATE = u"AutoSaveState";
-constexpr OUStringLiteral OPERATION_START = u"start";
-constexpr OUStringLiteral OPERATION_STOP = u"stop";
-constexpr OUStringLiteral OPERATION_UPDATE = u"update";
+constexpr OUString OPERATION_START = u"start"_ustr;
+constexpr OUString OPERATION_STOP = u"stop"_ustr;
+constexpr OUString OPERATION_UPDATE = u"update"_ustr;
const sal_Int32 MIN_DISCSPACE_DOCSAVE = 5; // [MB]
const sal_Int32 MIN_DISCSPACE_CONFIGSAVE = 1; // [MB]
diff --git a/framework/source/services/pathsettings.cxx
b/framework/source/services/pathsettings.cxx
index 9457ad862787..0a24b96adda7 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -54,8 +54,8 @@
using namespace framework;
-constexpr OUStringLiteral CFGPROP_USERPATHS = u"UserPaths";
-constexpr OUStringLiteral CFGPROP_WRITEPATH = u"WritePath";
+constexpr OUString CFGPROP_USERPATHS = u"UserPaths"_ustr;
+constexpr OUString CFGPROP_WRITEPATH = u"WritePath"_ustr;
/*
0 : old style "Template" string using ";" as
separator
@@ -64,9 +64,9 @@ constexpr OUStringLiteral CFGPROP_WRITEPATH = u"WritePath";
3 : write path "Template_write" string
*/
-constexpr OUStringLiteral POSTFIX_INTERNAL_PATHS = u"_internal";
-constexpr OUStringLiteral POSTFIX_USER_PATHS = u"_user";
-constexpr OUStringLiteral POSTFIX_WRITE_PATH = u"_writable";
+constexpr OUString POSTFIX_INTERNAL_PATHS = u"_internal"_ustr;
+constexpr OUString POSTFIX_USER_PATHS = u"_user"_ustr;
+constexpr OUString POSTFIX_WRITE_PATH = u"_writable"_ustr;
namespace {
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx
b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 8bc322ff6667..a387fa011586 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;
-constexpr OUStringLiteral IMAGE_FOLDER = u"images";
-constexpr OUStringLiteral BITMAPS_FOLDER = u"Bitmaps";
+constexpr OUString IMAGE_FOLDER = u"images"_ustr;
+constexpr OUString BITMAPS_FOLDER = u"Bitmaps"_ustr;
const o3tl::enumarray<vcl::ImageType, const char*> IMAGELIST_XML_FILE =
{
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx
b/framework/source/uielement/fontsizemenucontroller.cxx
index 62d3ce3bec14..10234d61cba1 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -155,7 +155,7 @@ void FontSizeMenuController::fillPopupMenu( Reference<
css::awt::XPopupMenu > co
m_aHeightArray.clear();
sal_uInt16 nPos = 0; // Id is nPos+1
- static constexpr OUStringLiteral aFontHeightCommand(
u".uno:FontHeight?FontHeight.Height:float=" );
+ static constexpr OUString aFontHeightCommand(
u".uno:FontHeight?FontHeight.Height:float="_ustr );
// first insert font size names (for simplified/traditional chinese)
FontSizeNames aFontSizeNames(
Application::GetSettings().GetUILanguageTag().getLanguageType() );
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx
b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index cd1f13c2149d..f913688526db 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -134,7 +134,7 @@ void LangSelectionStatusbarController::LangMenu(
// add first few entries to main menu
sal_Int16 nItemId = static_cast< sal_Int16 >(MID_LANG_SEL_1);
- static constexpr OUStringLiteral sAsterisk(u"*"); // multiple languages
in current selection
+ static constexpr OUString sAsterisk(u"*"_ustr); // multiple languages in
current selection
const OUString sNone( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE
));
std::map< sal_Int16, OUString > aLangMap;
for (auto const& langItem : aLangItems)
diff --git a/framework/source/uielement/macrosmenucontroller.cxx
b/framework/source/uielement/macrosmenucontroller.cxx
index 1c0ebf629a79..0cc8fba505c7 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -121,7 +121,7 @@ void MacrosMenuController::addScriptItems(const
Reference<css::awt::XPopupMenu>&
{
static constexpr OUStringLiteral
aCmdBase(u".uno:ScriptOrganizer?ScriptOrganizer.Language:string=");
static constexpr OUStringLiteral ellipsis( u"..." );
- static constexpr OUStringLiteral
providerKey(u"com.sun.star.script.provider.ScriptProviderFor");
+ static constexpr OUString
providerKey(u"com.sun.star.script.provider.ScriptProviderFor"_ustr);
sal_uInt16 itemId = startItemId;
Reference< XContentEnumerationAccess > xEnumAccess(
m_xContext->getServiceManager(), UNO_QUERY_THROW );
Reference< XEnumeration > xEnum = xEnumAccess->createContentEnumeration (
"com.sun.star.script.provider.LanguageScriptProvider" );
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index f86ede8eb052..bd0a326a3574 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -76,7 +76,7 @@ const sal_uInt16 ITEMID_ADDONLIST = 6678; // used
to be a SID in sfx
namespace framework
{
-constexpr OUStringLiteral aCmdHelpIndex = u".uno:HelpIndex";
+constexpr OUString aCmdHelpIndex = u".uno:HelpIndex"_ustr;
constexpr OUStringLiteral aCmdToolsMenu = u".uno:ToolsMenu";
constexpr OUStringLiteral aCmdHelpMenu = u".uno:HelpMenu";
constexpr OUStringLiteral aSpecialWindowCommand = u".uno:WindowList";
diff --git a/framework/source/uielement/newmenucontroller.cxx
b/framework/source/uielement/newmenucontroller.cxx
index 55c4d324801f..fb133540c358 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -44,7 +44,7 @@
#include <cppuhelper/supportsservice.hxx>
// Defines
-constexpr OUStringLiteral aSlotNewDocDirect = u".uno:AddDirect";
+constexpr OUString aSlotNewDocDirect = u".uno:AddDirect"_ustr;
constexpr OUStringLiteral aSlotAutoPilot = u".uno:AutoPilotMenu";
using namespace com::sun::star::uno;
@@ -297,7 +297,7 @@ void NewMenuController::fillPopupMenu( Reference<
css::awt::XPopupMenu > const &
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
URL aTargetURL;
- aTargetURL.Complete = m_bNewMenu ? OUString(aSlotNewDocDirect) :
OUString(aSlotAutoPilot);
+ aTargetURL.Complete = m_bNewMenu ? aSlotNewDocDirect :
OUString(aSlotAutoPilot);
m_xURLTransformer->parseStrict( aTargetURL );
Reference< XDispatch > xMenuItemDispatch =
xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
if(xMenuItemDispatch == nullptr)
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx
b/framework/source/uielement/recentfilesmenucontroller.cxx
index 9c8eea5ef694..4355069c683d 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -50,9 +50,9 @@ using namespace com::sun::star::util;
namespace {
-constexpr OUStringLiteral CMD_CLEAR_LIST = u".uno:ClearRecentFileList";
-constexpr OUStringLiteral CMD_OPEN_AS_TEMPLATE = u".uno:OpenTemplate";
-constexpr OUStringLiteral CMD_OPEN_REMOTE = u".uno:OpenRemote";
+constexpr OUString CMD_CLEAR_LIST = u".uno:ClearRecentFileList"_ustr;
+constexpr OUString CMD_OPEN_AS_TEMPLATE = u".uno:OpenTemplate"_ustr;
+constexpr OUString CMD_OPEN_REMOTE = u".uno:OpenRemote"_ustr;
class RecentFilesMenuController : public svt::PopupMenuControllerBase
{
@@ -448,7 +448,7 @@ void SAL_CALL RecentFilesMenuController::dispatch(
if ( nQueryPart <= 0 )
return;
- static constexpr OUStringLiteral aEntryArgStr( u"entry=" );
+ static constexpr OUString aEntryArgStr( u"entry="_ustr );
sal_Int32 nEntryArg = aURL.Complete.indexOf( aEntryArgStr, nQueryPart );
sal_Int32 nEntryPos = nEntryArg + aEntryArgStr.getLength();
if (( nEntryArg <= 0 ) || ( nEntryPos >= aURL.Complete.getLength() ))
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx
b/framework/source/uielement/toolbarsmenucontroller.cxx
index 1378645ce07e..e19a7ec40b00 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -66,10 +66,10 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::ui;
-constexpr OUStringLiteral CMD_RESTOREVISIBILITY = u".cmd:RestoreVisibility";
+constexpr OUString CMD_RESTOREVISIBILITY = u".cmd:RestoreVisibility"_ustr;
constexpr OUStringLiteral CMD_LOCKTOOLBARS = u".uno:ToolbarLock";
-constexpr OUStringLiteral STATIC_CMD_PART =
u".uno:AvailableToolbars?Toolbar:string=";
+constexpr OUString STATIC_CMD_PART =
u".uno:AvailableToolbars?Toolbar:string="_ustr;
const char STATIC_INTERNAL_CMD_PART[] = ".cmd:";
namespace framework
@@ -139,8 +139,8 @@ css::uno::Sequence< OUString > SAL_CALL
ToolbarsMenuController::getSupportedServ
return { SERVICENAME_POPUPMENUCONTROLLER };
}
-constexpr OUStringLiteral g_aPropUIName( u"UIName" );
-constexpr OUStringLiteral g_aPropResourceURL( u"ResourceURL" );
+constexpr OUString g_aPropUIName( u"UIName"_ustr );
+constexpr OUString g_aPropResourceURL( u"ResourceURL"_ustr );
ToolbarsMenuController::ToolbarsMenuController( const css::uno::Reference<
css::uno::XComponentContext >& xContext ) :
svt::PopupMenuControllerBase( xContext ),
diff --git a/framework/source/uielement/uicommanddescription.cxx
b/framework/source/uielement/uicommanddescription.cxx
index f37663bc0e54..bbeb21851d2e 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -55,7 +55,7 @@ using namespace ::com::sun::star::frame;
const char CONFIGURATION_ROOT_ACCESS[] =
"/org.openoffice.Office.UI.";
// Special resource URLs to retrieve additional information
-constexpr OUStringLiteral PRIVATE_RESOURCE_URL = u"private:";
+constexpr OUString PRIVATE_RESOURCE_URL = u"private:"_ustr;
const sal_Int32 COMMAND_PROPERTY_IMAGE = 1;
const sal_Int32 COMMAND_PROPERTY_ROTATE = 2;
@@ -266,13 +266,13 @@ Any ConfigurationAccess_UICommand::getSequenceFromCache(
const OUString& aComman
if ( !pIter->second.bCommandNameCreated )
fillInfoFromResult( pIter->second, pIter->second.aLabel );
- static constexpr OUStringLiteral sLabel = u"Label";
- static constexpr OUStringLiteral sName = u"Name";
- static constexpr OUStringLiteral sPopup = u"Popup";
- static constexpr OUStringLiteral sPopupLabel = u"PopupLabel";
- static constexpr OUStringLiteral sTooltipLabel = u"TooltipLabel";
- static constexpr OUStringLiteral sTargetURL = u"TargetURL";
- static constexpr OUStringLiteral sIsExperimental = u"IsExperimental";
+ static constexpr OUString sLabel = u"Label"_ustr;
+ static constexpr OUString sName = u"Name"_ustr;
+ static constexpr OUString sPopup = u"Popup"_ustr;
+ static constexpr OUString sPopupLabel = u"PopupLabel"_ustr;
+ static constexpr OUString sTooltipLabel = u"TooltipLabel"_ustr;
+ static constexpr OUString sTargetURL = u"TargetURL"_ustr;
+ static constexpr OUString sIsExperimental = u"IsExperimental"_ustr;
Sequence< PropertyValue > aPropSeq{
comphelper::makePropertyValue(sLabel,
!pIter->second.aContextLabel.isEmpty()
?
Any(pIter->second.aContextLabel)
diff --git a/framework/source/xml/imagesdocumenthandler.cxx
b/framework/source/xml/imagesdocumenthandler.cxx
index 962c0a8bbd0e..ff5799f5c775 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -36,9 +36,9 @@ using namespace ::com::sun::star::xml::sax;
#define ELEMENT_EXTERNALIMAGES "externalimages"
#define ELEMENT_EXTERNALENTRY "externalentry"
-constexpr OUStringLiteral ELEMENT_NS_IMAGESCONTAINER =
u"image:imagescontainer";
-constexpr OUStringLiteral ELEMENT_NS_IMAGES = u"image:images";
-constexpr OUStringLiteral ELEMENT_NS_ENTRY = u"image:entry";
+constexpr OUString ELEMENT_NS_IMAGESCONTAINER = u"image:imagescontainer"_ustr;
+constexpr OUString ELEMENT_NS_IMAGES = u"image:images"_ustr;
+constexpr OUString ELEMENT_NS_ENTRY = u"image:entry"_ustr;
#define ATTRIBUTE_HREF "href"
#define ATTRIBUTE_MASKCOLOR "maskcolor"
@@ -55,8 +55,8 @@ constexpr OUStringLiteral ATTRIBUTE_XMLNS_XLINK =
u"xmlns:xlink";
constexpr OUStringLiteral ATTRIBUTE_XLINK_TYPE = u"xlink:type";
constexpr OUStringLiteral ATTRIBUTE_XLINK_TYPE_VALUE = u"simple";
-constexpr OUStringLiteral XMLNS_IMAGE = u"http://openoffice.org/2001/image";;
-constexpr OUStringLiteral XMLNS_XLINK = u"http://www.w3.org/1999/xlink";;
+constexpr OUString XMLNS_IMAGE = u"http://openoffice.org/2001/image"_ustr;
+constexpr OUString XMLNS_XLINK = u"http://www.w3.org/1999/xlink"_ustr;
constexpr OUStringLiteral XMLNS_IMAGE_PREFIX = u"image:";
constexpr OUStringLiteral XMLNS_FILTER_SEPARATOR = u"^";
