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

Change-Id: I5156318afde0f56cf3eb8d1c74c6db8d5e378600

1 files changed, 4 insertions, 27 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 &)