From a3d0091d185f39eddabf4d372ebe0ac3061dbb89 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann <sbergman@redhat.com> Date: Wed, 23 Dec 2020 13:16:31 +0100 Subject: 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> --- basic/source/basmgr/basmgr.cxx | 12 ++++++------ basic/source/classes/sbunoobj.cxx | 6 +++--- basic/source/runtime/runtime.cxx | 2 +- basic/source/uno/dlgcont.cxx | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'basic') diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 77f5939cd9d0..a3cf5b9e3ccf 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -84,12 +84,12 @@ typedef WeakImplHelper< script::XStarBasicAccess > StarBasicAccessHelper; // Version 2 // + bool bReference -const char szStdLibName[] = "Standard"; -const char szBasicStorage[] = "StarBASIC"; -const char szOldManagerStream[] = "BasicManager"; -const char szManagerStream[] = "BasicManager2"; -const char szImbedded[] = "LIBIMBEDDED"; -const char szCryptingKey[] = "CryptedBasic"; +const OUStringLiteral szStdLibName = u"Standard"; +const OUStringLiteral szBasicStorage = u"StarBASIC"; +const OUStringLiteral szOldManagerStream = u"BasicManager"; +const OUStringLiteral szManagerStream = u"BasicManager2"; +const OUStringLiteral szImbedded = u"LIBIMBEDDED"; +const OStringLiteral szCryptingKey = "CryptedBasic"; const StreamMode eStreamReadMode = StreamMode::READ | StreamMode::NOCREATE | StreamMode::SHARE_DENYALL; diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 3816d351302c..82ffb8c11699 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -99,9 +99,9 @@ using namespace cppu; // Identifiers for creating the strings for dbg_Properties -char16_t constexpr ID_DBG_SUPPORTEDINTERFACES[] = u"Dbg_SupportedInterfaces"; -char const ID_DBG_PROPERTIES[] = "Dbg_Properties"; -char const ID_DBG_METHODS[] = "Dbg_Methods"; +OUStringLiteral constexpr ID_DBG_SUPPORTEDINTERFACES = u"Dbg_SupportedInterfaces"; +OUStringLiteral const ID_DBG_PROPERTIES = u"Dbg_Properties"; +OUStringLiteral const ID_DBG_METHODS = u"Dbg_Methods"; char const aSeqLevelStr[] = "[]"; diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 5a64166b63a1..3ceaf38cafc7 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -1786,7 +1786,7 @@ void removeDimAsNewRecoverItem( SbxVariable* pVar ) // saving object variable // not-object variables will cause errors -const char pCollectionStr[] = "Collection"; +const OUStringLiteral pCollectionStr = u"Collection"; void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, bool bHandleDefaultProp ) { diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index b303349fa009..a8e124616910 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -342,8 +342,8 @@ SfxLibraryContainer* SfxDialogLibraryContainer::createInstanceImpl() return new SfxDialogLibraryContainer(); } -const char aResourceFileNameBase[] = "DialogStrings"; -const char aResourceFileCommentBase[] = "# Strings for Dialog Library "; +const OUStringLiteral aResourceFileNameBase = u"DialogStrings"; +const OUStringLiteral aResourceFileCommentBase = u"# Strings for Dialog Library "; // Resource handling Reference< css::resource::XStringResourcePersistence > -- cgit