stoc/source/implementationregistration/implreg.cxx | 40 ++++++++++-----------
stoc/source/security/access_controller.cxx | 4 +-
stoc/source/security/file_policy.cxx | 2 -
3 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit ea4d4d0979ae295f1045362c621bdcb6583fbc15
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Oct 19 10:30:29 2023 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Oct 20 12:50:55 2023 +0200
Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: stoc
Change-Id: Ic8c251b97f5e5bdf81599534384d86ac9904da53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158222
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/stoc/source/implementationregistration/implreg.cxx
b/stoc/source/implementationregistration/implreg.cxx
index 0f711b7dcf63..ca8c6b2673df 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -57,28 +57,28 @@ using namespace osl;
namespace {
-constexpr OUStringLiteral slash_UNO_slash_REGISTRY_LINKS
- = u"/UNO/REGISTRY_LINKS";
-constexpr OUStringLiteral slash_IMPLEMENTATIONS
- = u"/IMPLEMENTATIONS";
-constexpr OUStringLiteral slash_UNO
- = u"/UNO";
-constexpr OUStringLiteral slash_UNO_slash_SERVICES
- = u"/UNO/SERVICES";
-constexpr OUStringLiteral slash_UNO_slash_SINGLETONS
- = u"/UNO/SINGLETONS";
-constexpr OUStringLiteral slash_SERVICES
- = u"/SERVICES/";
-constexpr OUStringLiteral slash_UNO_slash_LOCATION
- = u"/UNO/LOCATION";
-constexpr OUStringLiteral slash_UNO_slash_ACTIVATOR
- = u"/UNO/ACTIVATOR";
-constexpr OUStringLiteral colon_old
- = u":old";
+constexpr OUString slash_UNO_slash_REGISTRY_LINKS
+ = u"/UNO/REGISTRY_LINKS"_ustr;
+constexpr OUString slash_IMPLEMENTATIONS
+ = u"/IMPLEMENTATIONS"_ustr;
+constexpr OUString slash_UNO
+ = u"/UNO"_ustr;
+constexpr OUString slash_UNO_slash_SERVICES
+ = u"/UNO/SERVICES"_ustr;
+constexpr OUString slash_UNO_slash_SINGLETONS
+ = u"/UNO/SINGLETONS"_ustr;
+constexpr OUString slash_SERVICES
+ = u"/SERVICES/"_ustr;
+constexpr OUString slash_UNO_slash_LOCATION
+ = u"/UNO/LOCATION"_ustr;
+constexpr OUString slash_UNO_slash_ACTIVATOR
+ = u"/UNO/ACTIVATOR"_ustr;
+constexpr OUString colon_old
+ = u":old"_ustr;
constexpr OUStringLiteral com_sun_star_registry_SimpleRegistry
= u"com.sun.star.registry.SimpleRegistry";
-constexpr OUStringLiteral Registry
- = u"Registry";
+constexpr OUString Registry
+ = u"Registry"_ustr;
// static deleteAllLinkReferences()
diff --git a/stoc/source/security/access_controller.cxx
b/stoc/source/security/access_controller.cxx
index af58d1472878..1359e529c73d 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -50,7 +50,7 @@
#include <memory>
-constexpr OUStringLiteral SERVICE_NAME =
u"com.sun.star.security.AccessController";
+constexpr OUString SERVICE_NAME =
u"com.sun.star.security.AccessController"_ustr;
constexpr OUStringLiteral USER_CREDS = u"access-control.user-credentials.id";
@@ -64,7 +64,7 @@ namespace {
// static stuff initialized when loading lib
OUString s_envType = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-constexpr OUStringLiteral s_acRestriction = u"access-control.restriction";
+constexpr OUString s_acRestriction = u"access-control.restriction"_ustr;
/** ac context intersects permissions of two ac contexts
diff --git a/stoc/source/security/file_policy.cxx
b/stoc/source/security/file_policy.cxx
index 5bbd604b1a72..63d0c6156e50 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -40,7 +40,7 @@
#include <unordered_map>
#include <utility>
-constexpr OUStringLiteral IMPL_NAME =
u"com.sun.star.security.comp.stoc.FilePolicy";
+constexpr OUString IMPL_NAME =
u"com.sun.star.security.comp.stoc.FilePolicy"_ustr;
using namespace ::osl;
using namespace ::cppu;
