basctl/source/basicide/baside2.cxx | 2 +-
basctl/source/basicide/baside3.cxx | 2 +-
basctl/source/basicide/basides1.cxx | 12 ++++++------
basctl/source/basicide/basidesh.cxx | 4 ++--
basctl/source/basicide/bastypes.cxx | 2 +-
basctl/source/basicide/localizationmgr.cxx | 8 ++++----
basctl/source/dlged/dlged.cxx | 4 ++--
basctl/source/dlged/propbrw.cxx | 2 +-
8 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 8c230395bc374a2be4e9bb341a10f9e8f8cf467e
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Oct 19 10:30:03 2023 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Oct 19 15:29:04 2023 +0200
Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: basctl
Change-Id: I771d90376e3497cd28abeda2c8c794c049a80d84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158143
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 60d25cf74128..b01e5c238a6c 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -95,7 +95,7 @@ short const ValidWindow = 0x1234;
#if defined(OW) || defined(MTF)
char const FilterMask_All[] = "*";
#else
-constexpr OUStringLiteral FilterMask_All = u"*.*";
+constexpr OUString FilterMask_All = u"*.*"_ustr;
#endif
} // end anonymous namespace
diff --git a/basctl/source/basicide/baside3.cxx
b/basctl/source/basicide/baside3.cxx
index f8197a49d909..4b5d13fb6ecf 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -72,7 +72,7 @@ using namespace ::com::sun::star::ui::dialogs;
#ifdef _WIN32
OUStringLiteral const FilterMask_All = u"*.*";
#else
-constexpr OUStringLiteral FilterMask_All = u"*";
+constexpr OUString FilterMask_All = u"*"_ustr;
#endif
DialogWindow::DialogWindow(DialogWindowLayout* pParent, ScriptDocument const&
rDocument,
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index 66820cd21881..9ef9f75e3f40 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1342,12 +1342,12 @@ void Shell::SetCurWindow( BaseWindow* pNewWin, bool
bUpdateTabBar, bool bRemembe
void Shell::ManageToolbars()
{
- static constexpr OUStringLiteral aMacroBarResName =
u"private:resource/toolbar/macrobar";
- static constexpr OUStringLiteral aDialogBarResName =
u"private:resource/toolbar/dialogbar";
- static constexpr OUStringLiteral aInsertControlsBarResName
- = u"private:resource/toolbar/insertcontrolsbar";
- static constexpr OUStringLiteral aFormControlsBarResName
- = u"private:resource/toolbar/formcontrolsbar";
+ static constexpr OUString aMacroBarResName =
u"private:resource/toolbar/macrobar"_ustr;
+ static constexpr OUString aDialogBarResName =
u"private:resource/toolbar/dialogbar"_ustr;
+ static constexpr OUString aInsertControlsBarResName
+ = u"private:resource/toolbar/insertcontrolsbar"_ustr;
+ static constexpr OUString aFormControlsBarResName
+ = u"private:resource/toolbar/formcontrolsbar"_ustr;
if( !pCurWin )
return;
diff --git a/basctl/source/basicide/basidesh.cxx
b/basctl/source/basicide/basidesh.cxx
index 73d27e2eea34..d23da94d268f 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -77,8 +77,8 @@
namespace basctl
{
-constexpr OUStringLiteral BASIC_IDE_EDITOR_WINDOW = u"BasicIDEEditorWindow";
-constexpr OUStringLiteral BASIC_IDE_CURRENT_ZOOM = u"CurrentZoom";
+constexpr OUString BASIC_IDE_EDITOR_WINDOW = u"BasicIDEEditorWindow"_ustr;
+constexpr OUString BASIC_IDE_CURRENT_ZOOM = u"CurrentZoom"_ustr;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
diff --git a/basctl/source/basicide/bastypes.cxx
b/basctl/source/basicide/bastypes.cxx
index bbd71ad08ce0..8c523e2bdb04 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -54,7 +54,7 @@ namespace basctl
{
// ID used for the read-only infobar
-constexpr OUStringLiteral BASIC_IDE_READONLY_INFOBAR = u"readonly";
+constexpr OUString BASIC_IDE_READONLY_INFOBAR = u"readonly"_ustr;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
diff --git a/basctl/source/basicide/localizationmgr.cxx
b/basctl/source/basicide/localizationmgr.cxx
index 22e44c09c6aa..68d2f63622f7 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -53,9 +53,9 @@ using namespace ::com::sun::star::resource;
namespace
{
-constexpr OUStringLiteral aDot(u".");
-constexpr OUStringLiteral aEsc(u"&");
-constexpr OUStringLiteral aSemi(u";");
+constexpr OUString aDot(u"."_ustr);
+constexpr OUString aEsc(u"&"_ustr);
+constexpr OUString aSemi(u";"_ustr);
} // namespace
@@ -80,7 +80,7 @@ bool LocalizationMgr::isLibraryLocalized ()
void LocalizationMgr::handleTranslationbar ()
{
- static constexpr OUStringLiteral aToolBarResName =
u"private:resource/toolbar/translationbar";
+ static constexpr OUString aToolBarResName =
u"private:resource/toolbar/translationbar"_ustr;
Reference< beans::XPropertySet > xFrameProps
( m_pShell->GetViewFrame().GetFrame().GetFrameInterface(),
uno::UNO_QUERY );
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 873fb3792dd7..2eb099718b5b 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -58,8 +58,8 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::io;
-constexpr OUStringLiteral aResourceResolverPropName = u"ResourceResolver";
-constexpr OUStringLiteral aDecorationPropName = u"Decoration";
+constexpr OUString aResourceResolverPropName = u"ResourceResolver"_ustr;
+constexpr OUString aDecorationPropName = u"Decoration"_ustr;
// DlgEdHint
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 1bdc03811958..bb45d5f13e8d 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -141,7 +141,7 @@ void PropBrw::ImplReCreateController()
// create a property browser controller
Reference< XMultiComponentFactory > xFactory(
xInspectorContext->getServiceManager(), UNO_SET_THROW );
- static constexpr OUStringLiteral s_sControllerServiceName =
u"com.sun.star.awt.PropertyBrowserController";
+ static constexpr OUString s_sControllerServiceName =
u"com.sun.star.awt.PropertyBrowserController"_ustr;
m_xBrowserController.set( xFactory->createInstanceWithContext(
s_sControllerServiceName, xInspectorContext ), UNO_QUERY );
if ( !m_xBrowserController.is() )
{
