Clean up previous commit

Change-Id: Ibb7d689bd175959a195d27130db1a29d30f423bf

5 files changed, 6 insertions, 34 deletions

diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx
index d7584ec2b5a0..b8bddd8577ee 100644
--- a/sc/source/ui/unoobj/exceldetect.cxx
+++ b/sc/source/ui/unoobj/exceldetect.cxx
@@ -29,7 +29,7 @@ ScExcelBiffDetect::~ScExcelBiffDetect() {}
 
 OUString ScExcelBiffDetect::getImplementationName() throw (uno::RuntimeException, std::exception)
 {
-    return impl_getStaticImplementationName();
+    return OUString("com.sun.star.comp.calc.ExcelBiffFormatDetector");
 }
 
 sal_Bool ScExcelBiffDetect::supportsService( const OUString& aName ) throw (uno::RuntimeException, std::exception)
@@ -39,7 +39,9 @@ sal_Bool ScExcelBiffDetect::supportsService( const OUString& aName ) throw (uno:
 
 uno::Sequence<OUString> ScExcelBiffDetect::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
 {
-    return impl_getStaticSupportedServiceNames();
+    uno::Sequence<OUString> aNames(1);
+    aNames[0] = "com.sun.star.frame.ExtendedTypeDetection";
+    return aNames;
 }
 
 namespace {
@@ -192,19 +194,6 @@ OUString ScExcelBiffDetect::detect( uno::Sequence<beans::PropertyValue>& lDescri
     return aType;
 }
 
-uno::Sequence<OUString> ScExcelBiffDetect::impl_getStaticSupportedServiceNames()
-{
-    uno::Sequence<OUString> aNames(1);
-    aNames[0] = "com.sun.star.frame.ExtendedTypeDetection";
-    return aNames;
-}
-
-OUString ScExcelBiffDetect::impl_getStaticImplementationName()
-{
-    return OUString("com.sun.star.comp.calc.ExcelBiffFormatDetector");
-}
-
-
 extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
 com_sun_star_comp_calc_ExcelBiffFormatDetector_get_implementation(::com::sun::star::uno::XComponentContext* context,
                                                                   ::com::sun::star::uno::Sequence<css::uno::Any> const &)
diff --git a/sc/source/ui/unoobj/exceldetect.hxx b/sc/source/ui/unoobj/exceldetect.hxx
index ff5c57c336d6..9b70ea31e846 100644
--- a/sc/source/ui/unoobj/exceldetect.hxx
+++ b/sc/source/ui/unoobj/exceldetect.hxx
@@ -33,9 +33,6 @@ public:
     // XExtendedFilterDetection
     virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor )
         throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-    static com::sun::star::uno::Sequence<OUString> impl_getStaticSupportedServiceNames();
-    static OUString impl_getStaticImplementationName();
 };
 
 #endif
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index a173ffcaf73e..8d29d6e0e10d 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -313,7 +313,7 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l
 
 OUString SAL_CALL ScFilterDetect::getImplementationName() throw (uno::RuntimeException, std::exception)
 {
-    return impl_getStaticImplementationName();
+    return OUString("com.sun.star.comp.calc.FormatDetector");
 }
 
 sal_Bool ScFilterDetect::supportsService( const OUString& sServiceName )
@@ -325,21 +325,11 @@ sal_Bool ScFilterDetect::supportsService( const OUString& sServiceName )
 com::sun::star::uno::Sequence<OUString> ScFilterDetect::getSupportedServiceNames()
     throw (uno::RuntimeException, std::exception)
 {
-    return impl_getStaticSupportedServiceNames();
-}
-
-uno::Sequence<OUString> ScFilterDetect::impl_getStaticSupportedServiceNames()
-{
     uno::Sequence<OUString> seqServiceNames(1);
     seqServiceNames.getArray()[0] = "com.sun.star.frame.ExtendedTypeDetection";
     return seqServiceNames;
 }
 
-OUString ScFilterDetect::impl_getStaticImplementationName()
-{
-    return OUString("com.sun.star.comp.calc.FormatDetector");
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
 com_sun_star_comp_calc_FormatDetector_get_implementation(::com::sun::star::uno::XComponentContext* context,
                                                          ::com::sun::star::uno::Sequence<css::uno::Any> const &)
diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx
index 52cb9cff1bc5..2aae88cfe6e1 100644
--- a/sc/source/ui/unoobj/scdetect.hxx
+++ b/sc/source/ui/unoobj/scdetect.hxx
@@ -47,10 +47,6 @@ public:
     virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
-    /* Helper for XServiceInfo */
-    static com::sun::star::uno::Sequence<OUString> impl_getStaticSupportedServiceNames();
-    static OUString impl_getStaticImplementationName();
-
     // XExtendedFilterDetect
 
     virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor )
diff --git a/sc/util/scd.component b/sc/util/scd.component
index 124ff027851a..15a38dd563cd 100644
--- a/sc/util/scd.component
+++ b/sc/util/scd.component
@@ -18,7 +18,7 @@
  -->
 
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    prefix="scd" xmlns="http://openoffice.org/2010/uno-components">
+    xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.calc.FormatDetector"
       constructor="com_sun_star_comp_calc_FormatDetector_get_implementation">
     <service name="com.sun.star.frame.ExtendedTypeDetection"/>