[Libreoffice-commits] core.git: 2 commits - lotuswordpro/source lotuswordpro/util xmloff/source

[Stephan Bergmann]

 lotuswordpro/source/filter/LotusWordProImportFilter.cxx |   30 +++-------------
 lotuswordpro/source/filter/LotusWordProImportFilter.hxx |   13 ------
 lotuswordpro/util/lwpfilter.component                   |    2 -
 xmloff/source/meta/MetaExportComponent.cxx              |   16 ++++----
 4 files changed, 15 insertions(+), 46 deletions(-)

New commits:
commit 18f1eb7b0c3536817572eeb481591418a7eab3da
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jan 21 19:59:41 2016 +0100

    Clean up
    
    after ea6fdbaeeb51ad695f1c3754b796b7273eb4baad "tdf#74608 lotuswordpro:
    Constructor feature for LotusWordProImportFilter"
    
    Change-Id: I24179fd670bbaa92713cb69bd306930e90a8e698

diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index 7fe4cc9..90017a5 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -189,33 +189,11 @@ void SAL_CALL LotusWordProImportFilter::initialize( const Sequence< Any >& aArgu
     }
 }
 
-OUString LotusWordProImportFilter_getImplementationName ()
-    throw (RuntimeException)
-{
-    return OUString ( "com.sun.star.comp.Writer.LotusWordProImportFilter" );
-}
-
-Sequence< OUString > SAL_CALL LotusWordProImportFilter_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;
-}
-
-uno::Reference< XInterface > SAL_CALL LotusWordProImportFilter_createInstance( const uno::Reference< XMultiServiceFactory > & rSMgr)
-    throw( Exception )
-{
-    return static_cast<cppu::OWeakObject*>(new LotusWordProImportFilter( comphelper::getComponentContext(rSMgr) ));
-}
-
 // XServiceInfo
 OUString SAL_CALL LotusWordProImportFilter::getImplementationName(  )
     throw (RuntimeException, std::exception)
 {
-    return LotusWordProImportFilter_getImplementationName();
+    return OUString ( "com.sun.star.comp.Writer.LotusWordProImportFilter" );
 }
 sal_Bool SAL_CALL LotusWordProImportFilter::supportsService( const OUString& rServiceName )
     throw (RuntimeException, std::exception)
@@ -225,7 +203,11 @@ sal_Bool SAL_CALL LotusWordProImportFilter::supportsService( const OUString& rSe
 Sequence< OUString > SAL_CALL LotusWordProImportFilter::getSupportedServiceNames(  )
     throw (RuntimeException, std::exception)
 {
-    return LotusWordProImportFilter_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;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
index 0babf81..ae7a608 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
@@ -87,19 +87,6 @@ public:
 
 };
 
-OUString LotusWordProImportFilter_getImplementationName()
-    throw ( css::uno::RuntimeException );
-
-bool SAL_CALL LotusWordProImportFilter_supportsService( const OUString& ServiceName )
-    throw ( css::uno::RuntimeException );
-
-css::uno::Sequence< OUString > SAL_CALL LotusWordProImportFilter_getSupportedServiceNames(  )
-    throw ( css::uno::RuntimeException );
-
-css::uno::Reference< css::uno::XInterface >
-SAL_CALL LotusWordProImportFilter_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
-    throw ( css::uno::Exception );
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/util/lwpfilter.component b/lotuswordpro/util/lwpfilter.component
index bd007fb..b442404 100644
--- a/lotuswordpro/util/lwpfilter.component
+++ b/lotuswordpro/util/lwpfilter.component
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    prefix="lotuswordpro" xmlns="http://openoffice.org/2010/uno-components">
+    xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.Writer.LotusWordProImportFilter"
       constructor="LotusWordProImportFilter_get_implementation">
     <service name="com.sun.star.document.ImportFilter"/>
commit adbad2a5575af87b3e5565de9d0b35d6e10a9c8a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jan 21 19:20:23 2016 +0100

    Move XMLMetaExportComponent_get_implementation to a more reasonable place
    
    Change-Id: Iaf3dc5351453b4aee8ffc1e7fb1bc670c45c507f

diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index e2cf7a0..cef777e 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -53,14 +53,6 @@ XMLMetaExportComponent::~XMLMetaExportComponent()
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-XMLMetaExportComponent_get_implementation(
-    css::uno::XComponentContext *context,
-    css::uno::Sequence<css::uno::Any> const &)
-{
-    return cppu::acquire(new XMLMetaExportComponent(context, "XMLMetaExportComponent", SvXMLExportFlags::META|SvXMLExportFlags::OASIS));
-}
-
 void SAL_CALL XMLMetaExportComponent::setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
 {
     try
@@ -194,6 +186,14 @@ uno::Sequence< OUString > SAL_CALL XMLMetaExportOOO_getSupportedServiceNames()
     return uno::Sequence< OUString > { "com.sun.star.document.XMLMetaExporter" };
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+XMLMetaExportComponent_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new XMLMetaExportComponent(context, "XMLMetaExportComponent", SvXMLExportFlags::META|SvXMLExportFlags::OASIS));
+}
+
 OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw()
 {
     return OUString( "XMLMetaExportOOo" );