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

[kripton]

 xmloff/inc/facreg.hxx                      |    7 -------
 xmloff/source/core/facreg.cxx              |    3 ---
 xmloff/source/meta/MetaExportComponent.cxx |   10 +++++++++-
 xmloff/util/xo.component                   |    3 ++-
 4 files changed, 11 insertions(+), 12 deletions(-)

New commits:
commit 94699cdec88ae181548d108b4a96f97be1f6c365
Author: kripton <yeliztaneroglu at gmail.com>
Date:   Thu Nov 5 00:42:28 2015 +0300

    tdf#74608 xmloff: Constructor feature for XMLMetaExportComponent
    
    Change-Id: I3edde1291e9dec21420238edb5a05f25849ebfff
    Reviewed-on: https://gerrit.libreoffice.org/19792
    Reviewed-by: Matúš Kukan <matus at libreoffice.org>
    Tested-by: Matúš Kukan <matus at libreoffice.org>

diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index d6f6f0a..fac39c2 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -283,13 +283,6 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Content_createIn
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
     throw (css::uno::Exception);
 
-// meta export
-OUString SAL_CALL XMLMetaExportComponent_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLMetaExportComponent_getSupportedServiceNames() throw();
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLMetaExportComponent_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
-
 // meta export OOo
 OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLMetaExportOOO_getSupportedServiceNames() throw();
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index c9dbf27..c050b10 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -125,9 +125,6 @@ XMLOFF_DLLPUBLIC void * SAL_CALL xo_component_getFactory( const sal_Char * pImpl
         else SINGLEFACTORY( SchXMLExport_Styles )
         else SINGLEFACTORY( SchXMLExport_Content )
 
-        // meta import/export
-        else SINGLEFACTORY( XMLMetaExportComponent )
-
         // meta import/export OOo
         else SINGLEFACTORY( XMLMetaExportOOO )
 
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index 53ce1d6..7e5d78f 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -53,7 +53,15 @@ XMLMetaExportComponent::~XMLMetaExportComponent()
 {
 }
 
-void SAL_CALL XMLMetaExportComponent::setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+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
     {
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index efc9118..273b591 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -140,7 +140,8 @@
     <service name="com.sun.star.comp.Draw.XMLOasisStylesImporter"/>
     <service name="com.sun.star.comp.Impress.XMLOasisStylesImporter"/>
   </implementation>
-  <implementation name="XMLMetaExportComponent">
+  <implementation name="XMLMetaExportComponent"
+      constructor="XMLMetaExportComponent_get_implementation">
     <service name="com.sun.star.document.XMLOasisMetaExporter"/>
   </implementation>
   <implementation name="XMLMetaExportOOo">