diff options
-rw-r--r-- | sw/source/ui/uno/swdetect.cxx | 16 | ||||
-rw-r--r-- | sw/source/ui/uno/swdetect.hxx | 8 | ||||
-rw-r--r-- | sw/util/swd.component | 6 |
3 files changed, 5 insertions, 25 deletions
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index ed91a6d0e9a6..af951ced90db 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -113,7 +113,7 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor /* XServiceInfo */ OUString SAL_CALL SwFilterDetect::getImplementationName() throw( RuntimeException, std::exception ) { - return impl_getStaticImplementationName(); + return OUString("com.sun.star.comp.writer.FormatDetector" ); } /* XServiceInfo */ @@ -125,12 +125,6 @@ sal_Bool SAL_CALL SwFilterDetect::supportsService( const OUString& sServiceName /* XServiceInfo */ Sequence< OUString > SAL_CALL SwFilterDetect::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - return impl_getStaticSupportedServiceNames(); -} - -/* Helper for XServiceInfo */ -Sequence< OUString > SwFilterDetect::impl_getStaticSupportedServiceNames() -{ Sequence< OUString > seqServiceNames( 3 ); seqServiceNames.getArray() [0] = "com.sun.star.frame.ExtendedTypeDetection"; seqServiceNames.getArray() [1] = "com.sun.star.text.FormatDetector"; @@ -138,14 +132,8 @@ Sequence< OUString > SwFilterDetect::impl_getStaticSupportedServiceNames() return seqServiceNames ; } -/* Helper for XServiceInfo */ -OUString SwFilterDetect::impl_getStaticImplementationName() -{ - return OUString("com.sun.star.comp.writer.FormatDetector" ); -} - extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_writer_FormatDetector_get_implementation(::com::sun::star::uno::XComponentContext* component, +com_sun_star_comp_writer_FormatDetector_get_implementation(::com::sun::star::uno::XComponentContext*, ::com::sun::star::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SwFilterDetect()); diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx index eba07537684b..d2138626fabe 100644 --- a/sw/source/ui/uno/swdetect.hxx +++ b/sw/source/ui/uno/swdetect.hxx @@ -39,10 +39,6 @@ namespace com { namespace star { - namespace lang - { - class XMultiServiceFactory; - } namespace beans { struct PropertyValue; @@ -66,10 +62,6 @@ public: virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - /* Helper for XServiceInfo */ - static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); - static OUString impl_getStaticImplementationName(); - // XExtendedFilterDetect virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/sw/util/swd.component b/sw/util/swd.component index e09b38524654..be51018b4005 100644 --- a/sw/util/swd.component +++ b/sw/util/swd.component @@ -18,9 +18,9 @@ --> <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" - prefix="swd" xmlns="http://openoffice.org/2010/uno-components"> - <implementation name="com.sun.star.comp.writer.FormatDetector" - constructor="com_sun_star_comp_writer_FormatDetector_get_implementation"> + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.writer.FormatDetector" + constructor="com_sun_star_comp_writer_FormatDetector_get_implementation"> <service name="com.sun.star.frame.ExtendedTypeDetection"/> <service name="com.sun.star.text.FormatDetector"/> <service name="com.sun.star.text.W4WFormatDetector"/> |