diff options
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/inc/bitmaps.hlst | 8 | ||||
| -rw-r--r-- | desktop/inc/strings.hxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/registry/inc/dp_backend.h | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/registry/package/dp_package.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/inc/helpids.h | 4 | ||||
| -rw-r--r-- | desktop/source/lib/init.cxx | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/desktop/inc/bitmaps.hlst b/desktop/inc/bitmaps.hlst index 69005c522c50..1f565b47dd6e 100644 --- a/desktop/inc/bitmaps.hlst +++ b/desktop/inc/bitmaps.hlst @@ -9,9 +9,9 @@ #pragma once -inline constexpr OUStringLiteral RID_BMP_WARNING = u"desktop/res/caution_16.png"; -inline constexpr OUStringLiteral RID_BMP_LOCKED = u"desktop/res/lock_16.png"; -inline constexpr OUStringLiteral RID_BMP_SHARED = u"desktop/res/shared_16.png"; -inline constexpr OUStringLiteral RID_BMP_EXTENSION = u"desktop/res/extension_32.png"; +inline constexpr OUString RID_BMP_WARNING = u"desktop/res/caution_16.png"_ustr; +inline constexpr OUString RID_BMP_LOCKED = u"desktop/res/lock_16.png"_ustr; +inline constexpr OUString RID_BMP_SHARED = u"desktop/res/shared_16.png"_ustr; +inline constexpr OUString RID_BMP_EXTENSION = u"desktop/res/extension_32.png"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/desktop/inc/strings.hxx b/desktop/inc/strings.hxx index 9b086b52693e..09582c6c5e66 100644 --- a/desktop/inc/strings.hxx +++ b/desktop/inc/strings.hxx @@ -11,6 +11,6 @@ #include <rtl/ustring.hxx> -inline constexpr OUStringLiteral RID_APPTITLE = u"%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION"; +inline constexpr OUString RID_APPTITLE = u"%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 0fe39db4571d..a68420d6b019 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -38,7 +38,7 @@ namespace dp_registry::backend class PackageRegistryBackend; -inline constexpr OUStringLiteral BACKEND_SERVICE_NAME = u"com.sun.star.deployment.PackageRegistryBackend"; +inline constexpr OUString BACKEND_SERVICE_NAME = u"com.sun.star.deployment.PackageRegistryBackend"_ustr; typedef ::cppu::WeakComponentImplHelper< css::deployment::XPackage > t_PackageBase; diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index c27f5174045a..3a6c466a1813 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -309,7 +309,7 @@ sal_Bool BackendImpl::supportsService(OUString const & ServiceName) Sequence<OUString> BackendImpl::getSupportedServiceNames() { - return { OUString(BACKEND_SERVICE_NAME) }; + return { BACKEND_SERVICE_NAME }; } // XPackageRegistry diff --git a/desktop/source/inc/helpids.h b/desktop/source/inc/helpids.h index da49afb99446..b7d7c4359770 100644 --- a/desktop/source/inc/helpids.h +++ b/desktop/source/inc/helpids.h @@ -21,7 +21,7 @@ #include <rtl/ustring.hxx> -inline constexpr OUStringLiteral HID_EXTENSION_MANAGER_LISTBOX_ENABLE = u"DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE"; -inline constexpr OUStringLiteral HID_EXTENSION_MANAGER_LISTBOX_DISABLE = u"DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE"; +inline constexpr OUString HID_EXTENSION_MANAGER_LISTBOX_ENABLE = u"DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE"_ustr; +inline constexpr OUString HID_EXTENSION_MANAGER_LISTBOX_DISABLE = u"DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 880374e2d0f5..bccac7338367 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -7703,7 +7703,6 @@ void setLanguageToolConfig() if (xSpell.is()) { Sequence<OUString> aEmpty; - static constexpr OUStringLiteral cSpell(SN_SPELLCHECKER); Sequence<css::lang::Locale> aLocales = xSpell->getLocales(); uno::Reference<linguistic2::XProofreader> xGC( @@ -7715,7 +7714,8 @@ void setLanguageToolConfig() { // turn off spell checker if LanguageTool supports the locale already if (xSuppLoc->hasLocale(aLocales[itLocale])) - xLangSrv->setConfiguredServices(cSpell, aLocales[itLocale], aEmpty); + xLangSrv->setConfiguredServices( + SN_SPELLCHECKER, aLocales[itLocale], aEmpty); } } } |