From 3af1b7f59340e5b82e65680d157d0ea16cdc3c81 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 8 Feb 2016 08:47:22 +0100 Subject: drop unused include Change-Id: Ia0d9568ee33cab8498946a535baa6edb4ae28796 --- writerperfect/Library_wpftdraw.mk | 1 - writerperfect/source/draw/CDRImportFilter.cxx | 17 ++++++++------- writerperfect/source/draw/CDRImportFilter.hxx | 10 --------- writerperfect/source/draw/CMXImportFilter.cxx | 17 ++++++++------- writerperfect/source/draw/CMXImportFilter.hxx | 10 --------- writerperfect/source/draw/FreehandImportFilter.cxx | 17 ++++++++------- writerperfect/source/draw/FreehandImportFilter.hxx | 10 --------- writerperfect/source/draw/MSPUBImportFilter.cxx | 19 +++++++++-------- writerperfect/source/draw/MSPUBImportFilter.hxx | 10 --------- writerperfect/source/draw/MWAWDrawImportFilter.cxx | 17 ++++++++------- writerperfect/source/draw/MWAWDrawImportFilter.hxx | 10 --------- .../source/draw/PageMakerImportFilter.cxx | 17 ++++++++------- .../source/draw/PageMakerImportFilter.hxx | 10 --------- writerperfect/source/draw/VisioImportFilter.cxx | 17 ++++++++------- writerperfect/source/draw/VisioImportFilter.hxx | 10 --------- writerperfect/source/draw/WPGImportFilter.cxx | 17 ++++++++------- writerperfect/source/draw/WPGImportFilter.hxx | 10 --------- writerperfect/source/draw/wpftdraw.component | 24 ++++++++++++++-------- 18 files changed, 96 insertions(+), 147 deletions(-) (limited to 'writerperfect') diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk index 1e57fcd9aa1a..b6927db98ffc 100644 --- a/writerperfect/Library_wpftdraw.mk +++ b/writerperfect/Library_wpftdraw.mk @@ -71,7 +71,6 @@ $(eval $(call gb_Library_add_exception_objects,wpftdraw,\ writerperfect/source/draw/PageMakerImportFilter \ writerperfect/source/draw/VisioImportFilter \ writerperfect/source/draw/WPGImportFilter \ - writerperfect/source/draw/wpftdraw_genericfilter \ )) # vim: set noet sw=4 ts=4: diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx index 7a9c833efb45..0c697bd772f3 100644 --- a/writerperfect/source/draw/CDRImportFilter.cxx +++ b/writerperfect/source/draw/CDRImportFilter.cxx @@ -49,7 +49,7 @@ throw (RuntimeException) return OUString("com.sun.star.comp.Draw.CDRImportFilter"); } -Sequence< OUString > SAL_CALL CDRImportFilter_getSupportedServiceNames() +Sequence< OUString > CDRImportFilter_getSupportedServiceNames() throw (RuntimeException) { Sequence < OUString > aRet(2); @@ -59,12 +59,6 @@ throw (RuntimeException) return aRet; } -Reference< XInterface > SAL_CALL CDRImportFilter_createInstance(const Reference< XComponentContext > &rContext) -throw(Exception) -{ - return static_cast(new CDRImportFilter(rContext)); -} - // XServiceInfo OUString SAL_CALL CDRImportFilter::getImplementationName() throw (RuntimeException, std::exception) @@ -82,4 +76,13 @@ throw (RuntimeException, std::exception) return CDRImportFilter_getSupportedServiceNames(); } +extern "C" +SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +com_sun_star_comp_Draw_CDRImportFilter_get_implementation( + css::uno::XComponentContext *const context, + const css::uno::Sequence &) +{ + return cppu::acquire(new CDRImportFilter(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/draw/CDRImportFilter.hxx b/writerperfect/source/draw/CDRImportFilter.hxx index f28301df5160..28c20c7f7806 100644 --- a/writerperfect/source/draw/CDRImportFilter.hxx +++ b/writerperfect/source/draw/CDRImportFilter.hxx @@ -39,16 +39,6 @@ private: virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, OdgGenerator &rGenerator, utl::MediaDescriptor &) override; }; -OUString CDRImportFilter_getImplementationName() -throw (css::uno::RuntimeException); - -css::uno::Sequence< OUString > SAL_CALL CDRImportFilter_getSupportedServiceNames() -throw (css::uno::RuntimeException); - -css::uno::Reference< css::uno::XInterface > -SAL_CALL CDRImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext) -throw (css::uno::Exception); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx index 9f034eb64598..0d89de95f052 100644 --- a/writerperfect/source/draw/CMXImportFilter.cxx +++ b/writerperfect/source/draw/CMXImportFilter.cxx @@ -49,7 +49,7 @@ throw (RuntimeException) return OUString("com.sun.star.comp.Draw.CMXImportFilter"); } -Sequence< OUString > SAL_CALL CMXImportFilter_getSupportedServiceNames() +Sequence< OUString > CMXImportFilter_getSupportedServiceNames() throw (RuntimeException) { Sequence < OUString > aRet(2); @@ -59,12 +59,6 @@ throw (RuntimeException) return aRet; } -Reference< XInterface > SAL_CALL CMXImportFilter_createInstance(const Reference< XComponentContext > &rContext) -throw(Exception) -{ - return static_cast(new CMXImportFilter(rContext)); -} - // XServiceInfo OUString SAL_CALL CMXImportFilter::getImplementationName() throw (RuntimeException, std::exception) @@ -82,4 +76,13 @@ throw (RuntimeException, std::exception) return CMXImportFilter_getSupportedServiceNames(); } +extern "C" +SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +com_sun_star_comp_Draw_CMXImportFilter_get_implementation( + css::uno::XComponentContext *const context, + const css::uno::Sequence &) +{ + return cppu::acquire(new CMXImportFilter(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/draw/CMXImportFilter.hxx b/writerperfect/source/draw/CMXImportFilter.hxx index d5dbe8af78f3..62c6a4bca52b 100644 --- a/writerperfect/source/draw/CMXImportFilter.hxx +++ b/writerperfect/source/draw/CMXImportFilter.hxx @@ -39,16 +39,6 @@ private: virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, OdgGenerator &rGenerator, utl::MediaDescriptor &) override; }; -OUString CMXImportFilter_getImplementationName() -throw (css::uno::RuntimeException); - -css::uno::Sequence< OUString > SAL_CALL CMXImportFilter_getSupportedServiceNames() -throw (css::uno::RuntimeException); - -css::uno::Reference< css::uno::XInterface > -SAL_CALL CMXImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext) -throw (css::uno::Exception); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/draw/FreehandImportFilter.cxx b/writerperfect/source/draw/FreehandImportFilter.cxx index 941be250875a..0427c907d6a3 100644 --- a/writerperfect/source/draw/FreehandImportFilter.cxx +++ b/writerperfect/source/draw/FreehandImportFilter.cxx @@ -45,7 +45,7 @@ throw (RuntimeException) return OUString("com.sun.star.comp.Draw.FreehandImportFilter"); } -Sequence< OUString > SAL_CALL FreehandImportFilter_getSupportedServiceNames() +Sequence< OUString > FreehandImportFilter_getSupportedServiceNames() throw (RuntimeException) { Sequence < OUString > aRet(2); @@ -55,12 +55,6 @@ throw (RuntimeException) return aRet; } -Reference< XInterface > SAL_CALL FreehandImportFilter_createInstance(const Reference< XComponentContext > &rContext) -throw(Exception) -{ - return static_cast(new FreehandImportFilter(rContext)); -} - // XServiceInfo OUString SAL_CALL FreehandImportFilter::getImplementationName() throw (RuntimeException, std::exception) @@ -78,4 +72,13 @@ throw (RuntimeException, std::exception) return FreehandImportFilter_getSupportedServiceNames(); } +extern "C" +SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +com_sun_star_comp_Draw_FreehandImportFilter_get_implementation( + css::uno::XComponentContext *const context, + const css::uno::Sequence &) +{ + return cppu::acquire(new FreehandImportFilter(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/draw/FreehandImportFilter.hxx b/writerperfect/source/draw/FreehandImportFilter.hxx index 3a84a52ac53c..c277ff8e91e5 100644 --- a/writerperfect/source/draw/FreehandImportFilter.hxx +++ b/writerperfect/source/draw/FreehandImportFilter.hxx @@ -36,16 +36,6 @@ private: virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, OdgGenerator &rGenerator, utl::MediaDescriptor &) override; }; -OUString FreehandImportFilter_getImplementationName() -throw (css::uno::RuntimeException); - -css::uno::Sequence< OUString > SAL_CALL FreehandImportFilter_getSupportedServiceNames() -throw (css::uno::RuntimeException); - -css::uno::Reference< css::uno::XInterface > -SAL_CALL FreehandImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext) -throw (css::uno::Exception); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx index 6d96a0d23391..920589564aa6 100644 --- a/writerperfect/source/draw/MSPUBImportFilter.cxx +++ b/writerperfect/source/draw/MSPUBImportFilter.cxx @@ -16,8 +16,6 @@ #include "MSPUBImportFilter.hxx" -#include - using com::sun::star::uno::Reference; using com::sun::star::uno::Exception; using com::sun::star::uno::RuntimeException; @@ -47,7 +45,7 @@ throw (RuntimeException) return OUString("com.sun.star.comp.Draw.MSPUBImportFilter"); } -Sequence< OUString > SAL_CALL MSPUBImportFilter_getSupportedServiceNames() +Sequence< OUString > MSPUBImportFilter_getSupportedServiceNames() throw (RuntimeException) { Sequence < OUString > aRet(2); @@ -57,12 +55,6 @@ throw (RuntimeException) return aRet; } -Reference< XInterface > SAL_CALL MSPUBImportFilter_createInstance(const Reference< XComponentContext > &rContext) -throw(Exception) -{ - return static_cast(new MSPUBImportFilter(rContext)); -} - // XServiceInfo OUString SAL_CALL MSPUBImportFilter::getImplementationName() throw (RuntimeException, std::exception) @@ -80,4 +72,13 @@ throw (RuntimeException, std::exception) return MSPUBImportFilter_getSupportedServiceNames(); } +extern "C" +SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +com_sun_star_comp_Draw_MSPUBImportFilter_get_implementation( + css::uno::XComponentContext *const context, + const css::uno::Sequence &) +{ + return cppu::acquire(new MSPUBImportFilter(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/draw/MSPUBImportFilter.hxx b/writerperfect/source/draw/MSPUBImportFilter.hxx index 4394bae8f02f..c644ba07936a 100644 --- a/writerperfect/source/draw/MSPUBImportFilter.hxx +++ b/writerperfect/source/draw/MSPUBImportFilter.hxx @@ -36,16 +36,6 @@ private: virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, OdgGenerator &rGenerator, utl::MediaDescriptor &) override; }; -OUString MSPUBImportFilter_getImplementationName() -throw (css::uno::RuntimeException); - -css::uno::Sequence< OUString > SAL_CALL MSPUBImportFilter_getSupportedServiceNames() -throw (css::uno::RuntimeException); - -css::uno::Reference< css::uno::XInterface > -SAL_CALL MSPUBImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext) -throw (css::uno::Exception); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.cxx b/writerperfect/source/draw/MWAWDrawImportFilter.cxx index ed9947fdc4b1..deae4b5251c9 100644 --- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx +++ b/writerperfect/source/draw/MWAWDrawImportFilter.cxx @@ -99,7 +99,7 @@ throw (RuntimeException) return OUString("com.sun.star.comp.Draw.MWAWDrawImportFilter"); } -Sequence< OUString > SAL_CALL MWAWDrawImportFilter_getSupportedServiceNames() +Sequence< OUString > MWAWDrawImportFilter_getSupportedServiceNames() throw (RuntimeException) { Sequence < OUString > aRet(2); @@ -109,12 +109,6 @@ throw (RuntimeException) return aRet; } -Reference< XInterface > SAL_CALL MWAWDrawImportFilter_createInstance(const Reference< XComponentContext > &rContext) -throw(Exception) -{ - return static_cast(new MWAWDrawImportFilter(rContext)); -} - // XServiceInfo OUString SAL_CALL MWAWDrawImportFilter::getImplementationName() throw (RuntimeException, std::exception) @@ -132,4 +126,13 @@ throw (RuntimeException, std::exception) return MWAWDrawImportFilter_getSupportedServiceNames(); } +extern "C" +SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +com_sun_star_comp_Draw_MWAWDrawImportFilter_get_implementation( + css::uno::XComponentContext *const context, + const css::uno::Sequence &) +{ + return cppu::acquire(new MWAWDrawImportFilter(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.hxx b/writerperfect/source/draw/MWAWDrawImportFilter.hxx index 3b4650266778..0578be05d29d 100644 --- a/writerperfect/source/draw/MWAWDrawImportFilter.hxx +++ b/writerperfect/source/draw/MWAWDrawImportFilter.hxx @@ -40,16 +40,6 @@ private: virtual void doRegisterHandlers(OdgGenerator &rGenerator) override; }; -OUString MWAWDrawImportFilter_getImplementationName() -throw (css::uno::RuntimeException); - -css::uno::Sequence< OUString > SAL_CALL MWAWDrawImportFilter_getSupportedServiceNames() -throw (css::uno::RuntimeException); - -css::uno::Reference< css::uno::XInterface > -SAL_CALL MWAWDrawImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext) -throw (css::uno::Exception); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/draw/PageMakerImportFilter.cxx b/writerperfect/source/draw/PageMakerImportFilter.cxx index fe69182090c9..a644aeb4f7ed 100644 --- a/writerperfect/source/draw/PageMakerImportFilter.cxx +++ b/writerperfect/source/draw/PageMakerImportFilter.cxx @@ -47,7 +47,7 @@ throw (RuntimeException) return OUString("org.libreoffice.comp.Draw.PageMakerImportFilter"); } -Sequence< OUString > SAL_CALL PageMakerImportFilter_getSupportedServiceNames() +Sequence< OUString > PageMakerImportFilter_getSupportedServiceNames() throw (RuntimeException) { Sequence< OUString > aRet(2); @@ -57,12 +57,6 @@ throw (RuntimeException) return aRet; } -Reference< XInterface > SAL_CALL PageMakerImportFilter_createInstance(const Reference< XComponentContext > &rContext) -throw(Exception) -{ - return static_cast(new PageMakerImportFilter(rContext)); -} - // XServiceInfo OUString SAL_CALL PageMakerImportFilter::getImplementationName() throw (RuntimeException, std::exception) @@ -80,4 +74,13 @@ throw (RuntimeException, std::exception) return PageMakerImportFilter_getSupportedServiceNames(); } +extern "C" +SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +org_libreoffice_comp_Draw_PageMakerImportFilter_get_implementation( + css::uno::XComponentContext *const context, + const css::uno::Sequence &) +{ + return cppu::acquire(new PageMakerImportFilter(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/draw/PageMakerImportFilter.hxx b/writerperfect/source/draw/PageMakerImportFilter.hxx index f6ecc4c99d2c..edf6cf65ea89 100644 --- a/writerperfect/source/draw/PageMakerImportFilter.hxx +++ b/writerperfect/source/draw/PageMakerImportFilter.hxx @@ -36,16 +36,6 @@ private: virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, OdgGenerator &rGenerator, utl::MediaDescriptor &) override; }; -OUString PageMakerImportFilter_getImplementationName() -throw (css::uno::RuntimeException); - -css::uno::Sequence< OUString > SAL_CALL PageMakerImportFilter_getSupportedServiceNames() -throw (css::uno::RuntimeException); - -css::uno::Reference< css::uno::XInterface > -SAL_CALL PageMakerImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext) -throw (css::uno::Exception); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx index 923cca6da102..904ddddefa86 100644 --- a/writerperfect/source/draw/VisioImportFilter.cxx +++ b/writerperfect/source/draw/VisioImportFilter.cxx @@ -45,7 +45,7 @@ throw (RuntimeException) return OUString("com.sun.star.comp.Draw.VisioImportFilter"); } -Sequence< OUString > SAL_CALL VisioImportFilter_getSupportedServiceNames() +Sequence< OUString > VisioImportFilter_getSupportedServiceNames() throw (RuntimeException) { Sequence < OUString > aRet(2); @@ -55,12 +55,6 @@ throw (RuntimeException) return aRet; } -Reference< XInterface > SAL_CALL VisioImportFilter_createInstance(const Reference< XComponentContext > &rContext) -throw(Exception) -{ - return static_cast(new VisioImportFilter(rContext)); -} - // XServiceInfo OUString SAL_CALL VisioImportFilter::getImplementationName() throw (RuntimeException, std::exception) @@ -78,4 +72,13 @@ throw (RuntimeException, std::exception) return VisioImportFilter_getSupportedServiceNames(); } +extern "C" +SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +com_sun_star_comp_Draw_VisioImportFilter_get_implementation( + css::uno::XComponentContext *const context, + const css::uno::Sequence &) +{ + return cppu::acquire(new VisioImportFilter(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/draw/VisioImportFilter.hxx b/writerperfect/source/draw/VisioImportFilter.hxx index 391c9874b569..9f51616d855f 100644 --- a/writerperfect/source/draw/VisioImportFilter.hxx +++ b/writerperfect/source/draw/VisioImportFilter.hxx @@ -36,16 +36,6 @@ private: virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, OdgGenerator &rGenerator, utl::MediaDescriptor &) override; }; -OUString VisioImportFilter_getImplementationName() -throw (css::uno::RuntimeException); - -css::uno::Sequence< OUString > SAL_CALL VisioImportFilter_getSupportedServiceNames() -throw (css::uno::RuntimeException); - -css::uno::Reference< css::uno::XInterface > -SAL_CALL VisioImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext) -throw (css::uno::Exception); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/draw/WPGImportFilter.cxx b/writerperfect/source/draw/WPGImportFilter.cxx index 165c53df23c0..f4e6251f6d99 100644 --- a/writerperfect/source/draw/WPGImportFilter.cxx +++ b/writerperfect/source/draw/WPGImportFilter.cxx @@ -52,7 +52,7 @@ throw (RuntimeException) return OUString("com.sun.star.comp.Draw.WPGImportFilter"); } -Sequence< OUString > SAL_CALL WPGImportFilter_getSupportedServiceNames() +Sequence< OUString > WPGImportFilter_getSupportedServiceNames() throw (RuntimeException) { Sequence < OUString > aRet(2); @@ -62,12 +62,6 @@ throw (RuntimeException) return aRet; } -Reference< XInterface > SAL_CALL WPGImportFilter_createInstance(const Reference< XComponentContext > &rContext) -throw(Exception) -{ - return static_cast(new WPGImportFilter(rContext)); -} - // XServiceInfo OUString SAL_CALL WPGImportFilter::getImplementationName() throw (RuntimeException, std::exception) @@ -85,4 +79,13 @@ throw (RuntimeException, std::exception) return WPGImportFilter_getSupportedServiceNames(); } +extern "C" +SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +com_sun_star_comp_Draw_WPGImportFilter_get_implementation( + css::uno::XComponentContext *const context, + const css::uno::Sequence &) +{ + return cppu::acquire(new WPGImportFilter(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/draw/WPGImportFilter.hxx b/writerperfect/source/draw/WPGImportFilter.hxx index 6f4e93b0c2ff..f8b6f0866095 100644 --- a/writerperfect/source/draw/WPGImportFilter.hxx +++ b/writerperfect/source/draw/WPGImportFilter.hxx @@ -41,16 +41,6 @@ private: virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, OdgGenerator &rGenerator, utl::MediaDescriptor &) override; }; -OUString WPGImportFilter_getImplementationName() -throw (css::uno::RuntimeException); - -css::uno::Sequence< OUString > SAL_CALL WPGImportFilter_getSupportedServiceNames() -throw (css::uno::RuntimeException); - -css::uno::Reference< css::uno::XInterface > -SAL_CALL WPGImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext) -throw (css::uno::Exception); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/draw/wpftdraw.component b/writerperfect/source/draw/wpftdraw.component index efc56736efdd..b1054ffd6c2d 100644 --- a/writerperfect/source/draw/wpftdraw.component +++ b/writerperfect/source/draw/wpftdraw.component @@ -9,35 +9,43 @@ --> - + - + - + - + - + - + - + - + -- cgit