1 files changed, 17 insertions, 24 deletions
diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.cxx b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
index ee0d646cde47..c1034b1e0625 100644
--- a/writerperfect/source/calc/MWAWCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
@@ -101,43 +101,36 @@ void MWAWCalcImportFilter::doRegisterHandlers(OdsGenerator &rGenerator)
     rGenerator.registerEmbeddedObjectHandler("image/mwaw-ods", &handleEmbeddedMWAWSpreadsheetObject);
 }
 
-OUString MWAWCalcImportFilter_getImplementationName()
-throw (RuntimeException)
-{
-    return OUString("com.sun.star.comp.Calc.MWAWCalcImportFilter");
-}
-
-Sequence< OUString > SAL_CALL MWAWCalcImportFilter_getSupportedServiceNames()
-throw (RuntimeException)
-{
-    Sequence < OUString > aRet(2);
-    OUString *pArray = aRet.getArray();
-    pArray[0] =  "com.sun.star.document.ImportFilter";
-    pArray[1] =  "com.sun.star.document.ExtendedTypeDetection";
-    return aRet;
-}
-
-Reference< XInterface > SAL_CALL MWAWCalcImportFilter_createInstance(const Reference< XComponentContext > &rContext)
-throw(Exception)
-{
-    return static_cast<cppu::OWeakObject *>(new MWAWCalcImportFilter(rContext));
-}
-
 // XServiceInfo
 OUString SAL_CALL MWAWCalcImportFilter::getImplementationName()
 throw (RuntimeException, std::exception)
 {
-    return MWAWCalcImportFilter_getImplementationName();
+    return OUString("com.sun.star.comp.Calc.MWAWCalcImportFilter");
 }
+
 sal_Bool SAL_CALL MWAWCalcImportFilter::supportsService(const OUString &rServiceName)
 throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
+
 Sequence< OUString > SAL_CALL MWAWCalcImportFilter::getSupportedServiceNames()
 throw (RuntimeException, std::exception)
 {
-    return MWAWCalcImportFilter_getSupportedServiceNames();
+    Sequence < OUString > aRet(2);
+    OUString *pArray = aRet.getArray();
+    pArray[0] =  "com.sun.star.document.ImportFilter";
+    pArray[1] =  "com.sun.star.document.ExtendedTypeDetection";
+    return aRet;
+}
+
+extern "C"
+SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL
+com_sun_star_comp_Calc_MWAWCalcImportFilter_get_implementation(
+    css::uno::XComponentContext *const context,
+    const css::uno::Sequence<css::uno::Any> &)
+{
+    return cppu::acquire(new MWAWCalcImportFilter(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */