xmloff/xof: create instances with uno constructors
See tdf#74608 for motivation
Also, the following
OOO_IMPORTER( XMLMathSettingsImportOOO,
"com.sun.star.comp.Math.XMLSettingsImporter",
"com.sun.star.comp.Math.XMLOasisSettingsImporter" )
was in the xof.component file, but was not listed in the factory class.
I fixed that, but it means we might see some differences in import
behaviour when reading math documents
Change-Id: I025b800ded28746d19e43b37032a5b37faee9b59
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98198
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index e18af66..5f6b48e 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -45,7 +45,6 @@ core_factory_list = [
("libunordflo.a", "unordf_component_getFactory"),
("libunoxmllo.a", "unoxml_component_getFactory"),
("libutllo.a", "utl_component_getFactory"),
("libxoflo.a", "xof_component_getFactory"),
("libxstor.a", "xstor_component_getFactory"),
("libxmlfdlo.a", "xmlfd_component_getFactory"),
("libxmlfalo.a", "xmlfa_component_getFactory"),
@@ -302,6 +301,36 @@ core_constructor_list = [
# uui/util/uui.component
"com_sun_star_comp_uui_UUIInteractionHandler_get_implementation",
"com_sun_star_comp_uui_UUIInteractionRequestStringResolver_get_implementation",
# xmloff/source/transform/xof.component
"xmloff_XMLCalcContentImportOOO_get_implementation",
"xmloff_XMLCalcImportOOO_get_implementation",
"xmloff_XMLCalcMetaImportOOO_get_implementation",
"xmloff_XMLCalcSettingsImportOOO_get_implementation",
"xmloff_XMLCalcStylesImportOOO_get_implementation",
"xmloff_XMLChartContentImportOOO_get_implementation",
"xmloff_XMLChartImportOOO_get_implementation",
"xmloff_XMLChartStylesImportOOO_get_implementation",
"xmloff_XMLDrawContentImportOOO_get_implementation",
"xmloff_XMLDrawImportOOO_get_implementation",
"xmloff_XMLDrawMetaImportOOO_get_implementation",
"xmloff_XMLDrawSettingsImportOOO_get_implementation",
"xmloff_XMLDrawStylesImportOOO_get_implementation",
"xmloff_XMLImpressContentImportOOO_get_implementation",
"xmloff_XMLImpressImportOOO_get_implementation",
"xmloff_XMLImpressMetaImportOOO_get_implementation",
"xmloff_XMLImpressSettingsImportOOO_get_implementation",
"xmloff_XMLImpressStylesImportOOO_get_implementation",
"xmloff_XMLMathMetaImportOOO_get_implementation",
"xmloff_XMLMathSettingsImportOOO_get_implementation",
"xmloff_OOo2OasisTransformer_get_implementation",
"xmloff_Oasis2OOoTransformer_get_implementation",
"xmloff_XMLAutoTextEventImportOOO_get_implementation",
"xmloff_XMLWriterContentImportOOO_get_implementation",
"xmloff_XMLWriterImportOOO_get_implementation",
"xmloff_XMLWriterMetaImportOOO_get_implementation",
"xmloff_XMLWriterSettingsImportOOO_get_implementation",
"xmloff_XMLWriterStylesImportOOO_get_implementation",
"xmloff_XMLMetaImportOOO_get_implementation",
# xmloff/util/xo.component
"XMLMetaExportComponent_get_implementation",
"XMLMetaExportOOo_get_implementation",
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index a10776d..557935a 100644
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -85,7 +85,6 @@ $(eval $(call gb_Library_add_exception_objects,xof,\
xmloff/source/transform/TransformerBase \
xmloff/source/transform/TransformerContext \
xmloff/source/transform/TransformerTokenMap \
xmloff/source/transform/XMLFilterRegistration \
))
# vim: set noet sw=4 ts=4:
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 6211b99..58c100e 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -40,7 +40,6 @@
#include "PropertyActionsOOo.hxx"
#include "TransformerActions.hxx"
#include "OOo2Oasis.hxx"
#include "XMLFilterRegistration.hxx"
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
@@ -1999,38 +1998,21 @@ Sequence< css::uno::Type > SAL_CALL OOo2OasisTransformer::getTypes()
// Service registration
OUString OOo2OasisTransformer_getImplementationName() throw()
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
xmloff_OOo2OasisTransformer_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence<css::uno::Any> const&)
{
return "com.sun.star.comp.OOo2OasisTransformer";
}
Sequence< OUString > OOo2OasisTransformer_getSupportedServiceNames() throw()
{
return { OOo2OasisTransformer_getImplementationName() };
}
Reference< XInterface > OOo2OasisTransformer_createInstance(
const Reference< XMultiServiceFactory > & )
{
return static_cast<cppu::OWeakObject*>(new OOo2OasisTransformer(OOo2OasisTransformer_getImplementationName(), OUString()));
return cppu::acquire(new OOo2OasisTransformer("com.sun.star.comp.OOo2OasisTransformer", OUString()));
}
#define OOO_IMPORTER( className, implName, subServiceName ) \
OUString className##_getImplementationName() throw() \
{ \
return implName; \
} \
\
Sequence< OUString > className##_getSupportedServiceNames() throw()\
{ \
return { className##_getImplementationName() }; \
} \
\
Reference< XInterface > className##_createInstance( \
const Reference< XMultiServiceFactory > & ) \
{ \
return static_cast<cppu::OWeakObject*>(new OOo2OasisTransformer( implName, \
subServiceName )); \
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* \
xmloff_##className##_get_implementation( \
css::uno::XComponentContext* , css::uno::Sequence<css::uno::Any> const&) \
{ \
return cppu::acquire(new OOo2OasisTransformer( \
implName, \
subServiceName )); \
}
OOO_IMPORTER( XMLWriterImportOOO,
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index 4b5233f..f52427d6 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -20,6 +20,7 @@
#include <comphelper/base64.hxx>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <xmloff/nmspmap.hxx>
@@ -42,7 +43,6 @@
#include "AttrTransformerAction.hxx"
#include "TransformerActions.hxx"
#include "FamilyType.hxx"
#include "XMLFilterRegistration.hxx"
#include <comphelper/servicehelper.hxx>
#include "Oasis2OOo.hxx"
#include <cppuhelper/supportsservice.hxx>
@@ -1967,7 +1967,7 @@ sal_Int64 SAL_CALL Oasis2OOoTransformer::getSomething( const Sequence< sal_Int8
// XServiceInfo
OUString SAL_CALL Oasis2OOoTransformer::getImplementationName()
{
return Oasis2OOoTransformer_getImplementationName();
return "com.sun.star.comp.Oasis2OOoTransformer";
}
sal_Bool SAL_CALL Oasis2OOoTransformer::supportsService( const OUString& ServiceName )
@@ -1982,22 +1982,12 @@ Sequence< OUString > SAL_CALL Oasis2OOoTransformer::getSupportedServiceNames( )
// Service registration
OUString Oasis2OOoTransformer_getImplementationName() throw()
{
return "com.sun.star.comp.Oasis2OOoTransformer";
}
Sequence< OUString > Oasis2OOoTransformer_getSupportedServiceNames()
throw()
{
return { Oasis2OOoTransformer_getImplementationName() };
}
Reference< XInterface > Oasis2OOoTransformer_createInstance(
const Reference< XMultiServiceFactory > &)
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
xmloff_Oasis2OOoTransformer_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence<css::uno::Any> const&)
{
SAL_INFO("xmloff.transform", "Creating Oasis2OOoTransformer");
return static_cast<cppu::OWeakObject*>(new Oasis2OOoTransformer);
return cppu::acquire(new Oasis2OOoTransformer);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx
deleted file mode 100644
index 804c758..0000000
--- a/xmloff/source/transform/XMLFilterRegistration.cxx
+++ /dev/null
@@ -1,134 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <string.h>
#include <cppuhelper/factory.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <osl/diagnose.h>
#include "XMLFilterRegistration.hxx"
using namespace ::com::sun::star;
#define ENUMERATE_SERVICE( classname ) \
{ classname##_getImplementationName, classname##_getSupportedServiceNames, classname##_createInstance }
namespace
{
typedef OUString (* GetImplementationName)();
typedef uno::Sequence< OUString > (* GetSupportedServiceNames)();
typedef uno::Reference< ::uno::XInterface > (* CreateInstance)(
const uno::Reference< lang::XMultiServiceFactory >& );
struct ServiceDescriptor
{
GetImplementationName const getImplementationName;
GetSupportedServiceNames const getSupportedServiceNames;
CreateInstance const createInstance;
};
const ServiceDescriptor* getServiceDescriptors()
{
static const ServiceDescriptor aDescriptors[] =
{
ENUMERATE_SERVICE( OOo2OasisTransformer ),
ENUMERATE_SERVICE( Oasis2OOoTransformer ),
ENUMERATE_SERVICE( XMLAutoTextEventImportOOO ),
ENUMERATE_SERVICE( XMLMetaImportOOO ),
ENUMERATE_SERVICE( XMLMathSettingsImportOOO ),
ENUMERATE_SERVICE( XMLMathMetaImportOOO ),
ENUMERATE_SERVICE( XMLCalcSettingsImportOOO ),
ENUMERATE_SERVICE( XMLCalcMetaImportOOO ),
ENUMERATE_SERVICE( XMLCalcContentImportOOO ),
ENUMERATE_SERVICE( XMLCalcStylesImportOOO ),
ENUMERATE_SERVICE( XMLCalcImportOOO ),
ENUMERATE_SERVICE( XMLWriterSettingsImportOOO ),
ENUMERATE_SERVICE( XMLWriterMetaImportOOO ),
ENUMERATE_SERVICE( XMLWriterContentImportOOO ),
ENUMERATE_SERVICE( XMLWriterStylesImportOOO ),
ENUMERATE_SERVICE( XMLWriterImportOOO ),
ENUMERATE_SERVICE( XMLChartContentImportOOO ),
ENUMERATE_SERVICE( XMLChartStylesImportOOO ),
ENUMERATE_SERVICE( XMLChartImportOOO ),
ENUMERATE_SERVICE( XMLDrawSettingsImportOOO ),
ENUMERATE_SERVICE( XMLDrawMetaImportOOO ),
ENUMERATE_SERVICE( XMLDrawContentImportOOO ),
ENUMERATE_SERVICE( XMLDrawStylesImportOOO ),
ENUMERATE_SERVICE( XMLDrawImportOOO ),
ENUMERATE_SERVICE( XMLImpressSettingsImportOOO ),
ENUMERATE_SERVICE( XMLImpressMetaImportOOO ),
ENUMERATE_SERVICE( XMLImpressContentImportOOO ),
ENUMERATE_SERVICE( XMLImpressStylesImportOOO ),
ENUMERATE_SERVICE( XMLImpressImportOOO ),
{ nullptr, nullptr, nullptr }
};
return aDescriptors;
};
}
extern "C"
{
SAL_DLLPUBLIC_EXPORT void* xof_component_getFactory( const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = nullptr;
if( pServiceManager )
{
try
{
uno::Reference< lang::XMultiServiceFactory > xMSF( static_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
const sal_Int32 nImplNameLen = strlen( pImplName );
const ServiceDescriptor* pDescriptor = getServiceDescriptors();
while ( pDescriptor->getImplementationName )
{
if ( pDescriptor->getImplementationName().equalsAsciiL( pImplName, nImplNameLen ) )
{
uno::Reference< lang::XSingleServiceFactory > xFactory =
::cppu::createSingleFactory( xMSF,
pDescriptor->getImplementationName(),
pDescriptor->createInstance,
pDescriptor->getSupportedServiceNames()
);
if ( xFactory.is() )
{
xFactory->acquire();
pRet = xFactory.get();
break;
}
}
++pDescriptor;
}
}
catch( uno::Exception& )
{
OSL_FAIL( "xof::xof_component_getFactory: Exception!" );
}
}
return pRet;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/XMLFilterRegistration.hxx b/xmloff/source/transform/XMLFilterRegistration.hxx
deleted file mode 100644
index f06b0ed..0000000
--- a/xmloff/source/transform/XMLFilterRegistration.hxx
+++ /dev/null
@@ -1,203 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_XMLFILTERREGISTRATION_HXX
#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_XMLFILTERREGISTRATION_HXX
#include <sal/config.h>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
OUString OOo2OasisTransformer_getImplementationName() throw();
css::uno::Sequence< OUString > OOo2OasisTransformer_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > OOo2OasisTransformer_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString Oasis2OOoTransformer_getImplementationName() throw();
css::uno::Sequence< OUString > Oasis2OOoTransformer_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > Oasis2OOoTransformer_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLAutoTextEventImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLAutoTextEventImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLAutoTextEventImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLMetaImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLMathSettingsImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLMathSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLMathSettingsImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLMathMetaImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLMathMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLMathMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLCalcSettingsImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLCalcSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLCalcSettingsImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLCalcMetaImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLCalcMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLCalcMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLCalcContentImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLCalcContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLCalcContentImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLCalcStylesImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLCalcStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLCalcStylesImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLCalcImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLCalcImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLCalcImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLWriterSettingsImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLWriterSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLWriterSettingsImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLWriterMetaImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLWriterMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLWriterMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLWriterContentImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLWriterContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLWriterContentImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLWriterStylesImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLWriterStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLWriterStylesImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLWriterImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLWriterImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLWriterImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLChartContentImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLChartContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLChartContentImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLChartStylesImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLChartStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLChartStylesImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLChartImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLChartImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLChartImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLDrawSettingsImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLDrawSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLDrawSettingsImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLDrawMetaImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLDrawMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLDrawMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLDrawContentImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLDrawContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLDrawContentImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLDrawStylesImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLDrawStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLDrawStylesImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLDrawImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLDrawImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLDrawImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLImpressSettingsImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLImpressSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLImpressSettingsImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLImpressMetaImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLImpressMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLImpressMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLImpressContentImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLImpressContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLImpressContentImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLImpressStylesImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLImpressStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLImpressStylesImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString XMLImpressImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > XMLImpressImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > XMLImpressImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/xof.component b/xmloff/source/transform/xof.component
index 05ccc220..b7c5d3f5 100644
--- a/xmloff/source/transform/xof.component
+++ b/xmloff/source/transform/xof.component
@@ -18,92 +18,121 @@
-->
<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
prefix="xof" xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Calc.XMLContentImporter">
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Calc.XMLContentImporter"
constructor="xmloff_XMLCalcContentImportOOO_get_implementation">
<service name="com.sun.star.comp.Calc.XMLContentImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Calc.XMLImporter">
<implementation name="com.sun.star.comp.Calc.XMLImporter"
constructor="xmloff_XMLCalcImportOOO_get_implementation">
<service name="com.sun.star.comp.Calc.XMLImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Calc.XMLMetaImporter">
<implementation name="com.sun.star.comp.Calc.XMLMetaImporter"
constructor="xmloff_XMLCalcMetaImportOOO_get_implementation">
<service name="com.sun.star.comp.Calc.XMLMetaImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Calc.XMLSettingsImporter">
<implementation name="com.sun.star.comp.Calc.XMLSettingsImporter"
constructor="xmloff_XMLCalcSettingsImportOOO_get_implementation">
<service name="com.sun.star.comp.Calc.XMLSettingsImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Calc.XMLStylesImporter">
<implementation name="com.sun.star.comp.Calc.XMLStylesImporter"
constructor="xmloff_XMLCalcStylesImportOOO_get_implementation">
<service name="com.sun.star.comp.Calc.XMLStylesImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Chart.XMLContentImporter">
<implementation name="com.sun.star.comp.Chart.XMLContentImporter"
constructor="xmloff_XMLChartContentImportOOO_get_implementation">
<service name="com.sun.star.comp.Chart.XMLContentImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Chart.XMLImporter">
<implementation name="com.sun.star.comp.Chart.XMLImporter"
constructor="xmloff_XMLChartImportOOO_get_implementation">
<service name="com.sun.star.comp.Chart.XMLImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Chart.XMLStylesImporter">
<implementation name="com.sun.star.comp.Chart.XMLStylesImporter"
constructor="xmloff_XMLChartStylesImportOOO_get_implementation">
<service name="com.sun.star.comp.Chart.XMLStylesImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Draw.XMLContentImporter">
<implementation name="com.sun.star.comp.Draw.XMLContentImporter"
constructor="xmloff_XMLDrawContentImportOOO_get_implementation">
<service name="com.sun.star.comp.Draw.XMLContentImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Draw.XMLImporter">
<implementation name="com.sun.star.comp.Draw.XMLImporter"
constructor="xmloff_XMLDrawImportOOO_get_implementation">
<service name="com.sun.star.comp.Draw.XMLImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Draw.XMLMetaImporter">
<implementation name="com.sun.star.comp.Draw.XMLMetaImporter"
constructor="xmloff_XMLDrawMetaImportOOO_get_implementation">
<service name="com.sun.star.comp.Draw.XMLMetaImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Draw.XMLSettingsImporter">
<implementation name="com.sun.star.comp.Draw.XMLSettingsImporter"
constructor="xmloff_XMLDrawSettingsImportOOO_get_implementation">
<service name="com.sun.star.comp.Draw.XMLSettingsImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Draw.XMLStylesImporter">
<implementation name="com.sun.star.comp.Draw.XMLStylesImporter"
constructor="xmloff_XMLDrawStylesImportOOO_get_implementation">
<service name="com.sun.star.comp.Draw.XMLStylesImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Impress.XMLContentImporter">
<implementation name="com.sun.star.comp.Impress.XMLContentImporter"
constructor="xmloff_XMLImpressContentImportOOO_get_implementation">
<service name="com.sun.star.comp.Impress.XMLContentImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Impress.XMLImporter">
<implementation name="com.sun.star.comp.Impress.XMLImporter"
constructor="xmloff_XMLImpressImportOOO_get_implementation">
<service name="com.sun.star.comp.Impress.XMLImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Impress.XMLMetaImporter">
<implementation name="com.sun.star.comp.Impress.XMLMetaImporter"
constructor="xmloff_XMLImpressMetaImportOOO_get_implementation">
<service name="com.sun.star.comp.Impress.XMLMetaImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Impress.XMLSettingsImporter">
<implementation name="com.sun.star.comp.Impress.XMLSettingsImporter"
constructor="xmloff_XMLImpressSettingsImportOOO_get_implementation">
<service name="com.sun.star.comp.Impress.XMLSettingsImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Impress.XMLStylesImporter">
<implementation name="com.sun.star.comp.Impress.XMLStylesImporter"
constructor="xmloff_XMLImpressStylesImportOOO_get_implementation">
<service name="com.sun.star.comp.Impress.XMLStylesImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Math.XMLMetaImporter">
<implementation name="com.sun.star.comp.Math.XMLMetaImporter"
constructor="xmloff_XMLMathMetaImportOOO_get_implementation">
<service name="com.sun.star.comp.Math.XMLMetaImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Math.XMLSettingsImporter">
<implementation name="com.sun.star.comp.Math.XMLSettingsImporter"
constructor="xmloff_XMLMathSettingsImportOOO_get_implementation">
<service name="com.sun.star.comp.Math.XMLSettingsImporter"/>
</implementation>
<implementation name="com.sun.star.comp.OOo2OasisTransformer">
<implementation name="com.sun.star.comp.OOo2OasisTransformer"
constructor="xmloff_OOo2OasisTransformer_get_implementation">
<service name="com.sun.star.comp.OOo2OasisTransformer"/>
</implementation>
<implementation name="com.sun.star.comp.Oasis2OOoTransformer">
<implementation name="com.sun.star.comp.Oasis2OOoTransformer"
constructor="xmloff_Oasis2OOoTransformer_get_implementation">
<service name="com.sun.star.comp.Oasis2OOoTransformer"/>
</implementation>
<implementation name="com.sun.star.comp.Writer.XMLAutotextEventsImporter">
<implementation name="com.sun.star.comp.Writer.XMLAutotextEventsImporter"
constructor="xmloff_XMLAutoTextEventImportOOO_get_implementation">
<service name="com.sun.star.comp.Writer.XMLAutotextEventsImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Writer.XMLContentImporter">
<implementation name="com.sun.star.comp.Writer.XMLContentImporter"
constructor="xmloff_XMLWriterContentImportOOO_get_implementation">
<service name="com.sun.star.comp.Writer.XMLContentImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Writer.XMLImporter">
<implementation name="com.sun.star.comp.Writer.XMLImporter"
constructor="xmloff_XMLWriterImportOOO_get_implementation">
<service name="com.sun.star.comp.Writer.XMLImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Writer.XMLMetaImporter">
<implementation name="com.sun.star.comp.Writer.XMLMetaImporter"
constructor="xmloff_XMLWriterMetaImportOOO_get_implementation">
<service name="com.sun.star.comp.Writer.XMLMetaImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Writer.XMLSettingsImporter">
<implementation name="com.sun.star.comp.Writer.XMLSettingsImporter"
constructor="xmloff_XMLWriterSettingsImportOOO_get_implementation">
<service name="com.sun.star.comp.Writer.XMLSettingsImporter"/>
</implementation>
<implementation name="com.sun.star.comp.Writer.XMLStylesImporter">
<implementation name="com.sun.star.comp.Writer.XMLStylesImporter"
constructor="xmloff_XMLWriterStylesImportOOO_get_implementation">
<service name="com.sun.star.comp.Writer.XMLStylesImporter"/>
</implementation>
<implementation name="com.sun.star.document.XMLMetaImporter">
<implementation name="com.sun.star.document.XMLMetaImporter"
constructor="xmloff_XMLMetaImportOOO_get_implementation">
<service name="com.sun.star.document.XMLMetaImporter"/>
</implementation>
</component>
