From 2b938a369462b6ae650b1bfb973f0c7d380daf52 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 5 Dec 2018 10:03:14 +0200 Subject: loplugin:singlevalfields in unoxml Change-Id: I340be161aeb343ccc01b86bcb807e4441025419e Reviewed-on: https://gerrit.libreoffice.org/64595 Tested-by: Jenkins Reviewed-by: Noel Grandin --- unoxml/source/xpath/xpathapi.cxx | 6 +++--- unoxml/source/xpath/xpathapi.hxx | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'unoxml/source/xpath') diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx index 74f216d59a7f..b010c6b61341 100644 --- a/unoxml/source/xpath/xpathapi.cxx +++ b/unoxml/source/xpath/xpathapi.cxx @@ -58,15 +58,15 @@ namespace XPath { } - const char* CXPathAPI::aImplementationName = "com.sun.star.comp.xml.xpath.XPathAPI"; - const char* CXPathAPI::aSupportedServiceNames[] = { + static const char aImplementationName[] = "com.sun.star.comp.xml.xpath.XPathAPI"; + static const char* aSupportedServiceNames[] = { "com.sun.star.xml.xpath.XPathAPI", nullptr }; OUString CXPathAPI::_getImplementationName() { - return OUString::createFromAscii(aImplementationName); + return OUString(aImplementationName); } Sequence CXPathAPI::_getSupportedServiceNames() diff --git a/unoxml/source/xpath/xpathapi.hxx b/unoxml/source/xpath/xpathapi.hxx index c0e57f56e35d..1bc99b50a762 100644 --- a/unoxml/source/xpath/xpathapi.hxx +++ b/unoxml/source/xpath/xpathapi.hxx @@ -70,8 +70,6 @@ namespace XPath rSMgr); // static helpers for service info and component management - static const char* aImplementationName; - static const char* aSupportedServiceNames[]; static OUString _getImplementationName(); static css::uno::Sequence< OUString > _getSupportedServiceNames(); static css::uno::Reference< XInterface > _getInstance( -- cgit