6 files changed, 9 insertions, 15 deletions
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
index 8d244ab6d6e9..bbb412a32df0 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -101,15 +101,15 @@ namespace DOM
         return static_cast< XDocumentBuilder* >(new CDocumentBuilder);
     }
 
-    const char* CDocumentBuilder::aImplementationName = "com.sun.star.comp.xml.dom.DocumentBuilder";
-    const char* CDocumentBuilder::aSupportedServiceNames[] = {
+    static const char aImplementationName[] = "com.sun.star.comp.xml.dom.DocumentBuilder";
+    static const char* aSupportedServiceNames[] = {
         "com.sun.star.xml.dom.DocumentBuilder",
         nullptr
     };
 
     OUString CDocumentBuilder::_getImplementationName()
     {
-        return OUString::createFromAscii(aImplementationName);
+        return OUString(aImplementationName);
     }
     Sequence<OUString> CDocumentBuilder::_getSupportedServiceNames()
     {
diff --git a/unoxml/source/dom/documentbuilder.hxx b/unoxml/source/dom/documentbuilder.hxx
index 4ef3e1840de1..ca5927161ceb 100644
--- a/unoxml/source/dom/documentbuilder.hxx
+++ b/unoxml/source/dom/documentbuilder.hxx
@@ -60,8 +60,6 @@ namespace DOM
         explicit CDocumentBuilder();
 
         // 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(
diff --git a/unoxml/source/dom/saxbuilder.cxx b/unoxml/source/dom/saxbuilder.cxx
index 81da91c51073..a6e189b4b475 100644
--- a/unoxml/source/dom/saxbuilder.cxx
+++ b/unoxml/source/dom/saxbuilder.cxx
@@ -38,8 +38,8 @@ namespace DOM
         return static_cast< XSAXDocumentBuilder* >(new CSAXDocumentBuilder(rSMgr));
     }
 
-    const char* CSAXDocumentBuilder::aImplementationName = "com.sun.star.comp.xml.dom.SAXDocumentBuilder";
-    const char* CSAXDocumentBuilder::aSupportedServiceNames[] = {
+    static const char aImplementationName[] = "com.sun.star.comp.xml.dom.SAXDocumentBuilder";
+    static const char* aSupportedServiceNames[] = {
         "com.sun.star.xml.dom.SAXDocumentBuilder",
         nullptr
     };
@@ -51,7 +51,7 @@ namespace DOM
 
     OUString CSAXDocumentBuilder::_getImplementationName()
     {
-        return OUString::createFromAscii(aImplementationName);
+        return OUString(aImplementationName);
     }
     Sequence<OUString> CSAXDocumentBuilder::_getSupportedServiceNames()
     {
diff --git a/unoxml/source/dom/saxbuilder.hxx b/unoxml/source/dom/saxbuilder.hxx
index 79c8ba0c5ff7..e2279a0c24bb 100644
--- a/unoxml/source/dom/saxbuilder.hxx
+++ b/unoxml/source/dom/saxbuilder.hxx
@@ -61,8 +61,6 @@ namespace DOM
 
     public:
         // 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(const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr);
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<OUString> 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(