[Libreoffice-commits] core.git: 6 commits - shell/source sot/source starmath/source stoc/source svgio/source svl/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jul 31 10:55:27 UTC 2019
shell/source/backends/desktopbe/desktopbackend.cxx | 4 +--
shell/source/backends/kf5be/kf5backend.cxx | 2 -
shell/source/backends/localebe/localebackend.cxx | 2 -
shell/source/cmdmail/cmdmailsuppl.cxx | 2 -
shell/source/unix/exec/shellexec.cxx | 2 -
sot/source/unoolestorage/xolesimplestorage.cxx | 2 -
starmath/source/AccessibleSmElement.cxx | 4 +--
starmath/source/AccessibleSmElementsControl.cxx | 2 -
starmath/source/accessibility.cxx | 4 +--
starmath/source/action.cxx | 2 -
starmath/source/smdetect.cxx | 6 ++---
starmath/source/uiobject.cxx | 2 -
starmath/source/unodoc.cxx | 2 -
starmath/source/unofilter.cxx | 2 -
starmath/source/unomodel.cxx | 2 -
stoc/source/corereflection/crefl.cxx | 2 -
stoc/source/defaultregistry/defaultregistry.cxx | 2 -
stoc/source/implementationregistration/implreg.cxx | 2 -
stoc/source/inspect/introspection.cxx | 2 -
stoc/source/invocation/invocation.cxx | 2 -
stoc/source/invocation_adapterfactory/iafactory.cxx | 2 -
stoc/source/javaloader/javaloader.cxx | 2 -
stoc/source/javavm/javavm.cxx | 2 -
stoc/source/loader/dllcomponentloader.cxx | 2 -
stoc/source/namingservice/namingservice.cxx | 2 -
stoc/source/proxy_factory/proxyfac.cxx | 2 -
stoc/source/security/access_controller.cxx | 2 -
stoc/source/security/file_policy.cxx | 2 -
stoc/source/security/permissions.cxx | 2 -
stoc/source/servicemanager/servicemanager.cxx | 4 +--
stoc/source/simpleregistry/simpleregistry.cxx | 2 -
stoc/source/typeconv/convert.cxx | 2 -
stoc/source/uriproc/ExternalUriReferenceTranslator.cxx | 2 -
stoc/source/uriproc/UriReferenceFactory.cxx | 2 -
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx | 2 -
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx | 2 -
stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx | 2 -
svgio/source/svgreader/svgtoken.cxx | 4 +--
svgio/source/svguno/xsvgparser.cxx | 2 -
svl/source/crypto/cryptosign.cxx | 12 +++++-----
svl/source/fsstor/fsfactory.cxx | 2 -
svl/source/items/macitem.cxx | 6 ++---
svl/source/misc/inettype.cxx | 2 -
svl/source/numbers/numfmuno.cxx | 8 +++---
svl/source/numbers/supservs.cxx | 2 -
svl/source/passwordcontainer/passwordcontainer.cxx | 2 -
svl/source/uno/pathservice.cxx | 2 -
47 files changed, 64 insertions(+), 64 deletions(-)
New commits:
commit 90294b464d0e5acf21cb152babb11d7f96ecf5d7
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:48:51 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:54:55 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): shell
Change-Id: I0045eac5f2395f56dcb1ed8a958c93c28de496a9
Reviewed-on: https://gerrit.libreoffice.org/76647
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx
index 2872438d4f96..03fe834506b9 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -58,8 +58,8 @@
namespace {
OUString getDefaultImplementationName() {
- return OUString(
- "com.sun.star.comp.configuration.backend.DesktopBackend");
+ return
+ "com.sun.star.comp.configuration.backend.DesktopBackend";
}
css::uno::Sequence< OUString > getDefaultSupportedServiceNames() {
diff --git a/shell/source/backends/kf5be/kf5backend.cxx b/shell/source/backends/kf5be/kf5backend.cxx
index 182d24893456..a2cae6c6c4fd 100644
--- a/shell/source/backends/kf5be/kf5backend.cxx
+++ b/shell/source/backends/kf5be/kf5backend.cxx
@@ -58,7 +58,7 @@ namespace
{
OUString getServiceImplementationName()
{
- return OUString("com.sun.star.comp.configuration.backend.KF5Backend");
+ return "com.sun.star.comp.configuration.backend.KF5Backend";
}
css::uno::Sequence<OUString> getServiceSupportedServiceNames()
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx
index 3cb381a721a9..191c5940980e 100644
--- a/shell/source/backends/localebe/localebackend.cxx
+++ b/shell/source/backends/localebe/localebackend.cxx
@@ -316,7 +316,7 @@ css::uno::Any LocaleBackend::getPropertyValue(
OUString LocaleBackend::getBackendName() {
- return OUString("com.sun.star.comp.configuration.backend.LocaleBackend") ;
+ return "com.sun.star.comp.configuration.backend.LocaleBackend" ;
}
OUString SAL_CALL LocaleBackend::getImplementationName()
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx
index b4e4322a2ff2..df8e1f5c170e 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -283,7 +283,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
OUString SAL_CALL CmdMailSuppl::getImplementationName( )
{
- return OUString("com.sun.star.comp.system.SimpleCommandMail");
+ return "com.sun.star.comp.system.SimpleCommandMail";
}
sal_Bool SAL_CALL CmdMailSuppl::supportsService( const OUString& ServiceName )
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index febf7cdf947c..1e669b695e1d 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -237,7 +237,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
OUString SAL_CALL ShellExec::getImplementationName( )
{
- return OUString("com.sun.star.comp.system.SystemShellExecute");
+ return "com.sun.star.comp.system.SystemShellExecute";
}
sal_Bool SAL_CALL ShellExec::supportsService( const OUString& ServiceName )
commit 9a33b501b3eb82d8ec08b391c35efa44a3723a2f
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:48:46 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:54:49 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): sot
Change-Id: If50079060effe857d5c4659a82c827ce16548c46
Reviewed-on: https://gerrit.libreoffice.org/76646
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx
index 09de314226ab..82d7f8bbb7a5 100644
--- a/sot/source/unoolestorage/xolesimplestorage.cxx
+++ b/sot/source/unoolestorage/xolesimplestorage.cxx
@@ -677,7 +677,7 @@ void SAL_CALL OLESimpleStorage::setClassInfo( const uno::Sequence< sal_Int8 >& /
// XServiceInfo
OUString SAL_CALL OLESimpleStorage::getImplementationName()
{
- return OUString("com.sun.star.comp.embed.OLESimpleStorage");
+ return "com.sun.star.comp.embed.OLESimpleStorage";
}
sal_Bool SAL_CALL OLESimpleStorage::supportsService( const OUString& ServiceName )
commit 2372d1a8b5e116b0ea84d09b4b577cc0f4ee7333
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:48:38 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:54:43 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): starmath
Change-Id: I12c7978be638fb875be1b183c70a8eb08bedf778
Reviewed-on: https://gerrit.libreoffice.org/76645
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/starmath/source/AccessibleSmElement.cxx b/starmath/source/AccessibleSmElement.cxx
index e4cebe9712f6..551d0d3ca9a2 100644
--- a/starmath/source/AccessibleSmElement.cxx
+++ b/starmath/source/AccessibleSmElement.cxx
@@ -107,7 +107,7 @@ void AccessibleSmElement::disposing()
OUString AccessibleSmElement::getImplementationName()
{
- return OUString("com.sun.star.comp.toolkit.AccessibleSmElement");
+ return "com.sun.star.comp.toolkit.AccessibleSmElement";
}
sal_Bool AccessibleSmElement::supportsService(const OUString& rServiceName)
@@ -274,7 +274,7 @@ OUString AccessibleSmElement::getAccessibleActionDescription(sal_Int32 nIndex)
testAction(nIndex);
- return OUString("press");
+ return "press";
}
uno::Reference<XAccessibleKeyBinding>
diff --git a/starmath/source/AccessibleSmElementsControl.cxx b/starmath/source/AccessibleSmElementsControl.cxx
index 5421c03799eb..3e9c2d84e792 100644
--- a/starmath/source/AccessibleSmElementsControl.cxx
+++ b/starmath/source/AccessibleSmElementsControl.cxx
@@ -156,7 +156,7 @@ sal_Int32 AccessibleSmElementsControl::getBackground()
// XServiceInfo
OUString AccessibleSmElementsControl::getImplementationName()
{
- return OUString("com.sun.star.comp.toolkit.AccessibleSmElementsControl");
+ return "com.sun.star.comp.toolkit.AccessibleSmElementsControl";
}
sal_Bool AccessibleSmElementsControl::supportsService(const OUString& rServiceName)
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 75408826ff42..2121f5da59e6 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -720,7 +720,7 @@ sal_Bool SAL_CALL SmGraphicAccessible::copyText(
OUString SAL_CALL SmGraphicAccessible::getImplementationName()
{
- return OUString("SmGraphicAccessible");
+ return "SmGraphicAccessible";
}
sal_Bool SAL_CALL SmGraphicAccessible::supportsService(
@@ -1763,7 +1763,7 @@ void SAL_CALL SmEditAccessible::removeAccessibleEventListener( const uno::Refere
OUString SAL_CALL SmEditAccessible::getImplementationName()
{
- return OUString("SmEditAccessible");
+ return "SmEditAccessible";
}
sal_Bool SAL_CALL SmEditAccessible::supportsService(
diff --git a/starmath/source/action.cxx b/starmath/source/action.cxx
index 21b75a481f67..37e643c85cd9 100644
--- a/starmath/source/action.cxx
+++ b/starmath/source/action.cxx
@@ -47,7 +47,7 @@ void SmFormatAction::Repeat(SfxRepeatTarget& rDocSh)
OUString SmFormatAction::GetComment() const
{
- return OUString(RID_UNDOFORMATNAME);
+ return RID_UNDOFORMATNAME;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 0db1564f2a06..aa6280156619 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -80,7 +80,7 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence< PropertyValue >& lDescriptor
{
sal_uInt8 nVersion;
if ( GetMathTypeVersion( aStorage.get(), nVersion ) && nVersion <=3 )
- return OUString("math_MathType_3x");
+ return "math_MathType_3x";
}
}
}
@@ -114,7 +114,7 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence< PropertyValue >& lDescriptor
0 == strncmp( "<math:math> ", aBuffer, 12));
if ( bIsMathType )
- return OUString("math_MathML_XML_Math");
+ return "math_MathML_XML_Math";
}
}
@@ -124,7 +124,7 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence< PropertyValue >& lDescriptor
/* XServiceInfo */
OUString SAL_CALL SmFilterDetect::getImplementationName()
{
- return OUString("com.sun.star.comp.math.FormatDetector");
+ return "com.sun.star.comp.math.FormatDetector";
}
/* XServiceInfo */
diff --git a/starmath/source/uiobject.cxx b/starmath/source/uiobject.cxx
index ffa1c9cec109..a4dad7ffbccc 100644
--- a/starmath/source/uiobject.cxx
+++ b/starmath/source/uiobject.cxx
@@ -104,7 +104,7 @@ std::unique_ptr<UIObject> ElementSelectorUIObject::create(vcl::Window* pWindow)
OUString ElementSelectorUIObject::get_name() const
{
- return OUString("SmElementSelector");
+ return "SmElementSelector";
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx
index ac2e35ca14ef..8e5230ad7f44 100644
--- a/starmath/source/unodoc.cxx
+++ b/starmath/source/unodoc.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star;
OUString SmDocument_getImplementationName() throw()
{
- return OUString( "com.sun.star.comp.Math.FormulaDocument" );
+ return "com.sun.star.comp.Math.FormulaDocument";
}
uno::Sequence< OUString > SmDocument_getSupportedServiceNames() throw()
diff --git a/starmath/source/unofilter.cxx b/starmath/source/unofilter.cxx
index 8c142e8f7274..7add12f9e3fb 100644
--- a/starmath/source/unofilter.cxx
+++ b/starmath/source/unofilter.cxx
@@ -101,7 +101,7 @@ void MathTypeFilter::setTargetDocument(const uno::Reference< lang::XComponent >&
OUString MathTypeFilter::getImplementationName()
{
- return OUString("com.sun.star.comp.Math.MathTypeFilter");
+ return "com.sun.star.comp.Math.MathTypeFilter";
}
sal_Bool MathTypeFilter::supportsService(const OUString& rServiceName)
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index ce6e1d0c4f68..8f200542829e 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -387,7 +387,7 @@ static sal_Int16 lcl_AnyToINT16(const uno::Any& rAny)
OUString SmModel::getImplementationName()
{
- return OUString("com.sun.star.comp.Math.FormulaDocument");
+ return "com.sun.star.comp.Math.FormulaDocument";
}
sal_Bool SmModel::supportsService(const OUString& rServiceName)
commit d15e0ff4fd120ede2bf5599f7323628c58c3df91
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:48:28 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:54:36 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): stoc
Change-Id: Id739d5ff815d3bb1db48e9b1c2b3f739e3f11dfd
Reviewed-on: https://gerrit.libreoffice.org/76644
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index e76fd1c130fb..8ac22858c21a 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -117,7 +117,7 @@ void IdlReflectionServiceImpl::dispose()
OUString IdlReflectionServiceImpl::getImplementationName()
{
- return OUString("com.sun.star.comp.stoc.CoreReflection");
+ return "com.sun.star.comp.stoc.CoreReflection";
}
sal_Bool IdlReflectionServiceImpl::supportsService( const OUString & rServiceName )
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index afa4d2ad6aa6..69cd40406944 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -1050,7 +1050,7 @@ sal_Bool SAL_CALL NestedRegistryImpl::hasElements( )
OUString SAL_CALL NestedRegistryImpl::getImplementationName( )
{
- return OUString("com.sun.star.comp.stoc.NestedRegistry");
+ return "com.sun.star.comp.stoc.NestedRegistry";
}
sal_Bool SAL_CALL NestedRegistryImpl::supportsService( const OUString& ServiceName )
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 5923e44a91c6..545e2cd6820b 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -1115,7 +1115,7 @@ ImplementationRegistration::ImplementationRegistration( const Reference < XCompo
// XServiceInfo
OUString ImplementationRegistration::getImplementationName()
{
- return OUString("com.sun.star.comp.stoc.ImplementationRegistration");
+ return "com.sun.star.comp.stoc.ImplementationRegistration";
}
// XServiceInfo
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 474952f7cdd5..ecfd5684004e 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -1534,7 +1534,7 @@ private:
}
virtual OUString SAL_CALL getImplementationName() override
- { return OUString("com.sun.star.comp.stoc.Introspection"); }
+ { return "com.sun.star.comp.stoc.Introspection"; }
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index 694ffa2904b8..0969578620db 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -72,7 +72,7 @@ static Sequence< OUString > inv_getSupportedServiceNames()
static OUString inv_getImplementationName()
{
- return OUString(IMPLNAME);
+ return IMPLNAME;
}
// TODO: Implement centrally
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 7248a22b1e35..4a8c716dbeb4 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -65,7 +65,7 @@ static Sequence< OUString > invadp_getSupportedServiceNames()
static OUString invadp_getImplementationName()
{
- return OUString(IMPLNAME);
+ return IMPLNAME;
}
struct hash_ptr
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index e980d7dddebe..4832b4c346d6 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -76,7 +76,7 @@ static Sequence< OUString > loader_getSupportedServiceNames()
static OUString loader_getImplementationName()
{
- return OUString( "com.sun.star.comp.stoc.JavaComponentLoader" );
+ return "com.sun.star.comp.stoc.JavaComponentLoader";
}
class JavaComponentLoader : public WeakImplHelper<XImplementationLoader, XServiceInfo>
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index eaecc2a91174..71ffbb3fffb1 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -187,7 +187,7 @@ bool SingletonFactory::m_bDisposed = false;
OUString serviceGetImplementationName()
{
- return OUString("com.sun.star.comp.stoc.JavaVirtualMachine");
+ return "com.sun.star.comp.stoc.JavaVirtualMachine";
}
css::uno::Sequence< OUString > serviceGetSupportedServiceNames()
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index 1935271d536c..fe88d1b74746 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -76,7 +76,7 @@ DllComponentLoader::DllComponentLoader( const Reference<XComponentContext> & xCt
OUString SAL_CALL DllComponentLoader::getImplementationName( )
{
- return OUString("com.sun.star.comp.stoc.DLLComponentLoader");
+ return "com.sun.star.comp.stoc.DLLComponentLoader";
}
sal_Bool SAL_CALL DllComponentLoader::supportsService( const OUString& ServiceName )
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index ddfc1af60a4f..8b35ec58b3c5 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -52,7 +52,7 @@ static Sequence< OUString > ns_getSupportedServiceNames()
static OUString ns_getImplementationName()
{
- return OUString(IMPLNAME);
+ return IMPLNAME;
}
typedef std::unordered_map< OUString, Reference<XInterface > > HashMap_OWString_Interface;
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index f21868b48964..55d53661dccd 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -51,7 +51,7 @@ namespace
OUString proxyfac_getImplementationName()
{
- return OUString(IMPL_NAME);
+ return IMPL_NAME;
}
Sequence< OUString > proxyfac_getSupportedServiceNames()
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index 534ac99256fe..08ba90a20670 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -838,7 +838,7 @@ Reference< security::XAccessControlContext > AccessController::getContext()
OUString AccessController::getImplementationName()
{
- return OUString("com.sun.star.security.comp.stoc.AccessController");
+ return "com.sun.star.security.comp.stoc.AccessController";
}
sal_Bool AccessController::supportsService( OUString const & serviceName )
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 70fd16f404d7..9d8edc2bf102 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -472,7 +472,7 @@ void FilePolicy::refresh()
OUString FilePolicy::getImplementationName()
{
- return OUString(IMPL_NAME);
+ return IMPL_NAME;
}
sal_Bool FilePolicy::supportsService( OUString const & serviceName )
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx
index 92a957cc9a63..ab70ac1e051b 100644
--- a/stoc/source/security/permissions.cxx
+++ b/stoc/source/security/permissions.cxx
@@ -450,7 +450,7 @@ bool AllPermission::implies( Permission const & ) const
OUString AllPermission::toString() const
{
- return OUString("com.sun.star.security.AllPermission");
+ return "com.sun.star.security.AllPermission";
}
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 000c7d0dc900..2af11198678a 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -894,7 +894,7 @@ void OServiceManager::initialize( Sequence< Any > const & )
// XServiceInfo
OUString OServiceManager::getImplementationName()
{
- return OUString("com.sun.star.comp.stoc.OServiceManager");
+ return "com.sun.star.comp.stoc.OServiceManager";
}
// XServiceInfo
@@ -1153,7 +1153,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return OUString("com.sun.star.comp.stoc.ORegistryServiceManager"); }
+ { return "com.sun.star.comp.stoc.ORegistryServiceManager"; }
Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index ab2251cedc86..29c9011f6ef3 100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -83,7 +83,7 @@ private:
OUString const & aKeyName, OUString const & aUrl) override;
virtual OUString SAL_CALL getImplementationName() override
- { return OUString("com.sun.star.comp.stoc.SimpleRegistry"); }
+ { return "com.sun.star.comp.stoc.SimpleRegistry"; }
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 928629da4afa..5a13985f8687 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -264,7 +264,7 @@ TypeConverter_Impl::TypeConverter_Impl() {}
// XServiceInfo
OUString TypeConverter_Impl::getImplementationName()
{
- return OUString("com.sun.star.comp.stoc.TypeConverter");
+ return "com.sun.star.comp.stoc.TypeConverter";
}
// XServiceInfo
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index 5aec7c3595b2..f7b99bf9a8e7 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -70,7 +70,7 @@ private:
OUString Translator::getImplementationName()
{
- return OUString("com.sun.star.comp.uri.ExternalUriReferenceTranslator");
+ return "com.sun.star.comp.uri.ExternalUriReferenceTranslator";
}
sal_Bool Translator::supportsService(OUString const & serviceName)
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index 2359bc31b403..d27d617074a3 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -287,7 +287,7 @@ private:
OUString Factory::getImplementationName()
{
- return OUString("com.sun.star.comp.uri.UriReferenceFactory");
+ return "com.sun.star.comp.uri.UriReferenceFactory";
}
sal_Bool Factory::supportsService(OUString const & serviceName)
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index 828ff085510a..105d00bb1e80 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -161,7 +161,7 @@ private:
OUString Parser::getImplementationName()
{
- return OUString("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand");
+ return "com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand";
}
sal_Bool Parser::supportsService(OUString const & serviceName)
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index f12a74f3bdb8..2f4cb9e09071 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -375,7 +375,7 @@ private:
OUString Parser::getImplementationName()
{
- return OUString("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript");
+ return "com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript";
}
sal_Bool Parser::supportsService(OUString const & serviceName)
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index 8d1ea79b1901..e2b37db202df 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -70,7 +70,7 @@ private:
OUString Factory::getImplementationName()
{
- return OUString("com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory");
+ return "com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory";
}
sal_Bool Factory::supportsService(OUString const & serviceName)
commit 254eb4186a286785baa58d2c1f8fe47ced608a34
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:48:22 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:54:31 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): svgio
Change-Id: I998fb299c52766dc7240926af69ce25347f79505
Reviewed-on: https://gerrit.libreoffice.org/76643
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/svgio/source/svgreader/svgtoken.cxx b/svgio/source/svgreader/svgtoken.cxx
index 6215cc0c6db5..9e286c128d09 100644
--- a/svgio/source/svgreader/svgtoken.cxx
+++ b/svgio/source/svgreader/svgtoken.cxx
@@ -355,12 +355,12 @@ namespace svgio
const OUString getStrTitle()
{
- return OUString(aSVGStrTitle);
+ return aSVGStrTitle;
}
const OUString getStrDesc()
{
- return OUString(aSVGStrDesc);
+ return aSVGStrDesc;
}
} // end of namespace svgreader
} // end of namespace svgio
diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx
index 57c1c81ed28f..f7fbcc59cf0b 100644
--- a/svgio/source/svguno/xsvgparser.cxx
+++ b/svgio/source/svguno/xsvgparser.cxx
@@ -86,7 +86,7 @@ namespace svgio
OUString XSvgParser_getImplementationName()
{
- return OUString( "svgio::svgreader::XSvgParser" );
+ return "svgio::svgreader::XSvgParser";
}
uno::Reference< uno::XInterface > XSvgParser_createInstance(const uno::Reference< uno::XComponentContext >& context)
commit 0f1af34528565809affd76d5efa49b254bc26145
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:48:16 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:54:24 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): svl
Change-Id: I7df3b3c430c0bb8e12eeedc1d0bf11d1f7453f55
Reviewed-on: https://gerrit.libreoffice.org/76642
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
index 2ace6a9fbee0..c85b5d5870d4 100644
--- a/svl/source/crypto/cryptosign.cxx
+++ b/svl/source/crypto/cryptosign.cxx
@@ -358,12 +358,12 @@ OUString PKIStatusToString(int n)
{
switch (n)
{
- case 0: return OUString("granted");
- case 1: return OUString("grantedWithMods");
- case 2: return OUString("rejection");
- case 3: return OUString("waiting");
- case 4: return OUString("revocationWarning");
- case 5: return OUString("revocationNotification");
+ case 0: return "granted";
+ case 1: return "grantedWithMods";
+ case 2: return "rejection";
+ case 3: return "waiting";
+ case 4: return "revocationWarning";
+ case 5: return "revocationNotification";
default: return "unknown (" + OUString::number(n) + ")";
}
}
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 980113267806..1b4174fb9558 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
@@ -45,7 +45,7 @@ uno::Sequence< OUString > FSStorageFactory::impl_staticGetSupportedServiceNames(
OUString FSStorageFactory::impl_staticGetImplementationName()
{
- return OUString("com.sun.star.comp.embed.FileSystemStorageFactory");
+ return "com.sun.star.comp.embed.FileSystemStorageFactory";
}
uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::impl_staticCreateSelfInstance(
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 4eeaa823e2a3..5f923774b513 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -41,15 +41,15 @@ OUString SvxMacro::GetLanguage()const
{
if(eType==STARBASIC)
{
- return OUString(SVX_MACRO_LANGUAGE_STARBASIC);
+ return SVX_MACRO_LANGUAGE_STARBASIC;
}
else if(eType==JAVASCRIPT)
{
- return OUString(SVX_MACRO_LANGUAGE_JAVASCRIPT);
+ return SVX_MACRO_LANGUAGE_JAVASCRIPT;
}
else if(eType==EXTENDED_STYPE)
{
- return OUString(SVX_MACRO_LANGUAGE_SF);
+ return SVX_MACRO_LANGUAGE_SF;
}
return aLibName;
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index f92db768ddcb..9c620694e36f 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -293,7 +293,7 @@ OUString INetContentTypes::GetContentType(INetContentType eTypeID)
if (aTypeName.isEmpty())
{
OSL_FAIL("INetContentTypes::GetContentType(): Bad ID");
- return OUString(CONTENT_TYPE_STR_APP_OCTSTREAM);
+ return CONTENT_TYPE_STR_APP_OCTSTREAM;
}
return aTypeName;
}
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 66ed4aae0359..aa0d08584f12 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -331,7 +331,7 @@ sal_Int32 SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber( cons
OUString SAL_CALL SvNumberFormatterServiceObj::getImplementationName()
{
- return OUString("com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject");
+ return "com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject";
}
sal_Bool SAL_CALL SvNumberFormatterServiceObj::supportsService( const OUString& ServiceName )
@@ -571,7 +571,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getFormatForLocale( sal_Int32 nKey, const
OUString SAL_CALL SvNumberFormatsObj::getImplementationName()
{
- return OUString("SvNumberFormatsObj");
+ return "SvNumberFormatsObj";
}
sal_Bool SAL_CALL SvNumberFormatsObj::supportsService( const OUString& ServiceName )
@@ -781,7 +781,7 @@ void SAL_CALL SvNumberFormatObj::setPropertyValues( const uno::Sequence<beans::P
OUString SAL_CALL SvNumberFormatObj::getImplementationName()
{
- return OUString("SvNumberFormatObj");
+ return "SvNumberFormatObj";
}
sal_Bool SAL_CALL SvNumberFormatObj::supportsService( const OUString& ServiceName )
@@ -907,7 +907,7 @@ void SAL_CALL SvNumberFormatSettingsObj::removeVetoableChangeListener( const OUS
OUString SAL_CALL SvNumberFormatSettingsObj::getImplementationName()
{
- return OUString("SvNumberFormatSettingsObj");
+ return "SvNumberFormatSettingsObj";
}
sal_Bool SAL_CALL SvNumberFormatSettingsObj::supportsService( const OUString& ServiceName )
diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index 77bbd449e88e..bbdf1dc7c70d 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
@@ -98,7 +98,7 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence<
OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getImplementationName( )
{
- return OUString("com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject");
+ return "com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject";
}
sal_Bool SAL_CALL SvNumberFormatsSupplierServiceObject::supportsService( const OUString& _rServiceName )
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index a8dfd1bc0f29..0c6c1b29abde 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -1315,7 +1315,7 @@ Sequence< OUString > PasswordContainer::impl_getStaticSupportedServiceNames( )
OUString PasswordContainer::impl_getStaticImplementationName()
{
- return OUString("stardiv.svl.PasswordContainer");
+ return "stardiv.svl.PasswordContainer";
}
Reference< XInterface > SAL_CALL PasswordContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager )
diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx
index 8017379c9c97..6b428b160f64 100644
--- a/svl/source/uno/pathservice.cxx
+++ b/svl/source/uno/pathservice.cxx
@@ -40,7 +40,7 @@ public:
virtual OUString SAL_CALL getImplementationName() override
{
- return OUString("com.sun.star.comp.svl.PathService");
+ return "com.sun.star.comp.svl.PathService";
}
virtual sal_Bool SAL_CALL supportsService (
More information about the Libreoffice-commits
mailing list