stocservices.component: The rest of the services + cleanup.

Change-Id: I5156318afde0f56cf3eb8d1c74c6db8d5e378600

5 files changed, 28 insertions, 130 deletions

diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index fba94d29ece8..c84cacb52810 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include "stocservices.hxx"
-
 #include <boost/noncopyable.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/Exception.hpp>
@@ -79,8 +76,7 @@ private:
 OUString Translator::getImplementationName()
     throw (css::uno::RuntimeException, std::exception)
 {
-    return
-        stoc_services::ExternalUriReferenceTranslator::getImplementationName();
+    return OUString("com.sun.star.comp.uri.ExternalUriReferenceTranslator");
 }
 
 sal_Bool Translator::supportsService(OUString const & serviceName)
@@ -92,8 +88,9 @@ sal_Bool Translator::supportsService(OUString const & serviceName)
 css::uno::Sequence< OUString > Translator::getSupportedServiceNames()
     throw (css::uno::RuntimeException, std::exception)
 {
-    return stoc_services::ExternalUriReferenceTranslator::
-        getSupportedServiceNames();
+    css::uno::Sequence< OUString > s(1);
+    s[0] = "com.sun.star.uri.ExternalUriReferenceTranslator";
+    return s;
 }
 
 OUString Translator::translateToInternal(
@@ -193,26 +190,6 @@ OUString Translator::translateToExternal(
 
 }
 
-namespace stoc_services  { namespace ExternalUriReferenceTranslator {
-
-css::uno::Reference< css::uno::XInterface > create(
-    css::uno::Reference< css::uno::XComponentContext > const & context)
-{
-    return static_cast< cppu::OWeakObject * >(new Translator(context));
-}
-
-OUString getImplementationName() {
-    return OUString("com.sun.star.comp.uri.ExternalUriReferenceTranslator");
-}
-
-css::uno::Sequence< OUString > getSupportedServiceNames() {
-    css::uno::Sequence< OUString > s(1);
-    s[0] = "com.sun.star.uri.ExternalUriReferenceTranslator";
-    return s;
-}
-
-} }
-
 extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
 com_sun_star_comp_uri_ExternalUriReferenceTranslator_get_implementation(::com::sun::star::uno::XComponentContext* rxContext,
         ::com::sun::star::uno::Sequence<css::uno::Any> const &)
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index 08b967c484f8..9ac0b4c3ecf9 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -50,7 +50,6 @@
 #include <sal/types.h>
 
 #include "UriReference.hxx"
-#include "stocservices.hxx"
 
 namespace {
 
@@ -311,7 +310,7 @@ private:
 OUString Factory::getImplementationName()
     throw (css::uno::RuntimeException, std::exception)
 {
-    return stoc_services::UriReferenceFactory::getImplementationName();
+    return OUString("com.sun.star.comp.uri.UriReferenceFactory");
 }
 
 sal_Bool Factory::supportsService(OUString const & serviceName)
@@ -323,7 +322,9 @@ sal_Bool Factory::supportsService(OUString const & serviceName)
 css::uno::Sequence< OUString > Factory::getSupportedServiceNames()
     throw (css::uno::RuntimeException, std::exception)
 {
-    return stoc_services::UriReferenceFactory::getSupportedServiceNames();
+    css::uno::Sequence< OUString > s(1);
+    s[0] = "com.sun.star.uri.UriReferenceFactory";
+    return s;
 }
 
 css::uno::Reference< css::uri::XUriReference > Factory::parse(
@@ -632,26 +633,6 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeRelative(
 
 }
 
-namespace stoc_services { namespace UriReferenceFactory {
-
-css::uno::Reference< css::uno::XInterface > create(
-    css::uno::Reference< css::uno::XComponentContext > const & context)
-{
-    return static_cast< cppu::OWeakObject * >(new Factory(context));
-}
-
-OUString getImplementationName() {
-    return OUString("com.sun.star.comp.uri.UriReferenceFactory");
-}
-
-css::uno::Sequence< OUString > getSupportedServiceNames() {
-    css::uno::Sequence< OUString > s(1);
-    s[0] = "com.sun.star.uri.UriReferenceFactory";
-    return s;
-}
-
-} }
-
 extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
 com_sun_star_comp_uri_UriReferenceFactory_get_implementation(::com::sun::star::uno::XComponentContext* rxContext,
         ::com::sun::star::uno::Sequence<css::uno::Any> const &)
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index 777651a6ea9a..0157f78bb7f9 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -19,8 +19,6 @@
 
 #include <sal/config.h>
 
-#include "stocservices.hxx"
-
 #include <exception>
 
 #include <boost/noncopyable.hpp>
@@ -184,8 +182,7 @@ private:
 OUString Parser::getImplementationName()
     throw (css::uno::RuntimeException, std::exception)
 {
-    return ::stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTexpand::
-        getImplementationName();
+    return OUString("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand");
 }
 
 sal_Bool Parser::supportsService(OUString const & serviceName)
@@ -197,8 +194,9 @@ sal_Bool Parser::supportsService(OUString const & serviceName)
 css::uno::Sequence< OUString > Parser::getSupportedServiceNames()
     throw (css::uno::RuntimeException, std::exception)
 {
-    return ::stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTexpand::
-        getSupportedServiceNames();
+    css::uno::Sequence< OUString > s(1);
+    s[0] = "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand";
+    return s;
 }
 
 css::uno::Reference< css::uri::XUriReference > Parser::parse(
@@ -213,27 +211,12 @@ css::uno::Reference< css::uri::XUriReference > Parser::parse(
 
 }
 
-namespace stoc_services { namespace UriSchemeParser_vndDOTsunDOTstarDOTexpand {
-
-css::uno::Reference< css::uno::XInterface > create(
-    SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext >
-        const &)
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_uri_UriSchemeParser_vndDOTsunDOTstarDOTexpand_get_implementation(::com::sun::star::uno::XComponentContext*,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
 {
     //TODO: single instance
-    return static_cast< ::cppu::OWeakObject * >(new Parser);
-}
-
-OUString getImplementationName() {
-    return OUString(
-            "com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand");
+    return ::cppu::acquire(new Parser());
 }
 
-css::uno::Sequence< OUString > getSupportedServiceNames() {
-    css::uno::Sequence< OUString > s(1);
-    s[0] = "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand";
-    return s;
-}
-
-} }
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index 5866c31d4658..631e6ef589e4 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include "stocservices.hxx"
-
 #include "UriReference.hxx"
 
 #include <boost/noncopyable.hpp>
@@ -405,8 +402,7 @@ private:
 OUString Parser::getImplementationName()
     throw (css::uno::RuntimeException, std::exception)
 {
-    return stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTscript::
-        getImplementationName();
+    return OUString("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript");
 }
 
 sal_Bool Parser::supportsService(OUString const & serviceName)
@@ -418,8 +414,9 @@ sal_Bool Parser::supportsService(OUString const & serviceName)
 css::uno::Sequence< OUString > Parser::getSupportedServiceNames()
     throw (css::uno::RuntimeException, std::exception)
 {
-    return stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTscript::
-        getSupportedServiceNames();
+    css::uno::Sequence< OUString > s(1);
+    s[0] = "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript";
+    return s;
 }
 
 css::uno::Reference< css::uri::XUriReference >
@@ -435,27 +432,12 @@ Parser::parse(
 
 }
 
-namespace stoc_services {
-namespace UriSchemeParser_vndDOTsunDOTstarDOTscript {
-
-css::uno::Reference< css::uno::XInterface > create(
-    SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext >
-        const &)
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_uri_UriSchemeParser_vndDOTsunDOTstarDOTscript_get_implementation(::com::sun::star::uno::XComponentContext*,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
 {
     //TODO: single instance
-    return static_cast< cppu::OWeakObject * >(new Parser);
-}
-
-OUString getImplementationName() {
-    return OUString("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript");
-}
-
-css::uno::Sequence< OUString > getSupportedServiceNames() {
-    css::uno::Sequence< OUString > s(1);
-    s[0] = "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript";
-    return s;
+    return ::cppu::acquire(new Parser());
 }
 
-} }
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index 0276942cf2cc..7c37e9ce95b8 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include "stocservices.hxx"
-
 #include <boost/noncopyable.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/Exception.hpp>
@@ -79,9 +76,7 @@ private:
 OUString Factory::getImplementationName()
     throw (css::uno::RuntimeException, std::exception)
 {
-    return
-        stoc_services::VndSunStarPkgUrlReferenceFactory::
-        getImplementationName();
+    return OUString("com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory");
 }
 
 sal_Bool Factory::supportsService(OUString const & serviceName)
@@ -93,8 +88,9 @@ sal_Bool Factory::supportsService(OUString const & serviceName)
 css::uno::Sequence< OUString > Factory::getSupportedServiceNames()
     throw (css::uno::RuntimeException, std::exception)
 {
-    return stoc_services::VndSunStarPkgUrlReferenceFactory::
-        getSupportedServiceNames();
+    css::uno::Sequence< OUString > s(1);
+    s[0] = "com.sun.star.uri.VndSunStarPkgUrlReferenceFactory";
+    return s;
 }
 
 css::uno::Reference< css::uri::XUriReference >
@@ -122,27 +118,6 @@ Factory::createVndSunStarPkgUrlReference(
 
 }
 
-namespace stoc_services { namespace VndSunStarPkgUrlReferenceFactory
-{
-
-css::uno::Reference< css::uno::XInterface > create(
-    css::uno::Reference< css::uno::XComponentContext > const & context)
-{
-    return static_cast< cppu::OWeakObject * >(new Factory(context));
-}
-
-OUString getImplementationName() {
-    return OUString("com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory");
-}
-
-css::uno::Sequence< OUString > getSupportedServiceNames() {
-    css::uno::Sequence< OUString > s(1);
-    s[0] = "com.sun.star.uri.VndSunStarPkgUrlReferenceFactory";
-    return s;
-}
-
-} }
-
 extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
 com_sun_star_comp_uri_VndSunStarPkgUrlReferenceFactory_get_implementation(::com::sun::star::uno::XComponentContext* rxContext,
         ::com::sun::star::uno::Sequence<css::uno::Any> const &)