[Libreoffice-commits] core.git: xmlscript/source xmlscript/util
xmlscript/source/inc/unoservices.hxx |9 --
xmlscript/source/misc/unoservices.cxx|5 ---
xmlscript/source/xmlflat_imexp/xmlbas_import.cxx | 30 ---
xmlscript/util/xmlscript.component |3 +-
4 files changed, 13 insertions(+), 34 deletions(-)
New commits:
commit 2dc8f1b25c157a597905fb33f1527244baf977f3
Author: Yeliz TaneroÄlu
Date: Sun May 1 13:33:41 2016 +0300
tdf#74608 Constructor function for XMLOasisBasicImporter
Change-Id: Iec1c875f6aa34c37ac26a5dac008db547e8965ca
Reviewed-on: https://gerrit.libreoffice.org/24551
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/xmlscript/source/inc/unoservices.hxx
b/xmlscript/source/inc/unoservices.hxx
index 61e10d9..bdeea6a 100644
--- a/xmlscript/source/inc/unoservices.hxx
+++ b/xmlscript/source/inc/unoservices.hxx
@@ -57,15 +57,6 @@ OUString SAL_CALL getImplementationName_XMLBasicImporter();
css::uno::Reference SAL_CALL create_XMLBasicImporter(
css::uno::Reference const & xContext);
-
-css::uno::Sequence SAL_CALL
-getSupportedServiceNames_XMLOasisBasicImporter();
-
-OUString SAL_CALL getImplementationName_XMLOasisBasicImporter();
-
-css::uno::Reference SAL_CALL
create_XMLOasisBasicImporter(
-css::uno::Reference const & xContext);
-
}
#endif
diff --git a/xmlscript/source/misc/unoservices.cxx
b/xmlscript/source/misc/unoservices.cxx
index 87eb33e..204d4de 100644
--- a/xmlscript/source/misc/unoservices.cxx
+++ b/xmlscript/source/misc/unoservices.cxx
@@ -42,11 +42,6 @@ namespace xmlscript
getSupportedServiceNames_XMLBasicImporter,
::cppu::createSingleComponentFactory,
nullptr, 0
},
-{
-create_XMLOasisBasicImporter,
getImplementationName_XMLOasisBasicImporter,
-getSupportedServiceNames_XMLOasisBasicImporter,
::cppu::createSingleComponentFactory,
-nullptr, 0
-},
{ nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
};
}
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
index 81d7cbd..35cdec0 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
@@ -510,17 +510,6 @@ void BasicImport::setDocumentLocator( const Reference<
xml::sax::XLocator >& /*x
return aNames;
}
-OUString getImplementationName_XMLOasisBasicImporter()
-{
-return OUString( "com.sun.star.comp.xmlscript.XMLOasisBasicImporter" );
-}
-
-Sequence< OUString > getSupportedServiceNames_XMLOasisBasicImporter()
-{
-Sequence< OUString > aNames {
"com.sun.star.document.XMLOasisBasicImporter" };
-return aNames;
-}
-
// XMLBasicImporterBase
XMLBasicImporterBase::XMLBasicImporterBase( const Reference<
XComponentContext >& rxContext, bool bOasis )
@@ -679,12 +668,13 @@ void BasicImport::setDocumentLocator( const Reference<
xml::sax::XLocator >& /*x
OUString XMLOasisBasicImporter::getImplementationName( ) throw
(RuntimeException, std::exception)
{
-return getImplementationName_XMLOasisBasicImporter();
+return OUString( "com.sun.star.comp.xmlscript.XMLOasisBasicImporter" );
}
Sequence< OUString > XMLOasisBasicImporter::getSupportedServiceNames( )
throw (RuntimeException, std::exception)
{
-return getSupportedServiceNames_XMLOasisBasicImporter();
+Sequence< OUString > aNames {
"com.sun.star.document.XMLOasisBasicImporter" };
+return aNames;
}
// component operations
@@ -695,12 +685,14 @@ void BasicImport::setDocumentLocator( const Reference<
xml::sax::XLocator >& /*x
return static_cast< lang::XTypeProvider * >( new XMLBasicImporter(
xContext ) );
}
-Reference< XInterface > SAL_CALL create_XMLOasisBasicImporter(
-Reference< XComponentContext > const & xContext )
-{
-return static_cast< lang::XTypeProvider * >( new
XMLOasisBasicImporter( xContext ) );
-}
-
} // namespace xmlscript
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_xmlscript_XMLOasisBasicImporter(
+css::uno::XComponentContext *context,
+css::uno::Sequence const &)
+{
+return cppu::acquire(new xmlscript::XMLOasisBasicImporter(context));
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlscript/util/xmlscript.component
b/xmlscript/util/xmlscript.component
index 298d874..e212b9b 100644
--- a/xmlscript/util/xmlscript.component
+++ b/xmlscript/util/xmlscript.component
@@ -32,7 +32,8 @@
constructor="com_sun_star_comp_xmlscript_XMLOasisBasicExporter">
-
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlscript/source xmlscript/util
xmlscript/source/inc/unoservices.hxx |8 -
xmlscript/source/misc/unoservices.cxx|5 ---
xmlscript/source/xmlflat_imexp/xmlbas_export.cxx | 31 ---
xmlscript/util/xmlscript.component |3 +-
4 files changed, 14 insertions(+), 33 deletions(-)
New commits:
commit b8c04ea449750b39ab5dc64f91f74688fd9a4d3a
Author: Yeliz TaneroÄlu
Date: Sat Apr 30 15:56:22 2016 +0300
tdf#74608 Constructor function for XMLOasisBasicExporter
Change-Id: If5409621f515918e715e3c0b71ec1b3d6fd1ef92
Reviewed-on: https://gerrit.libreoffice.org/24518
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/xmlscript/source/inc/unoservices.hxx
b/xmlscript/source/inc/unoservices.hxx
index 6ac388a..61e10d9 100644
--- a/xmlscript/source/inc/unoservices.hxx
+++ b/xmlscript/source/inc/unoservices.hxx
@@ -51,14 +51,6 @@ css::uno::Reference SAL_CALL
create_XMLBasicExporter(
css::uno::Reference const & xContext);
css::uno::Sequence SAL_CALL
-getSupportedServiceNames_XMLOasisBasicExporter();
-
-OUString SAL_CALL getImplementationName_XMLOasisBasicExporter();
-
-css::uno::Reference SAL_CALL
create_XMLOasisBasicExporter(
-css::uno::Reference const & xContext);
-
-css::uno::Sequence SAL_CALL
getSupportedServiceNames_XMLBasicImporter();
OUString SAL_CALL getImplementationName_XMLBasicImporter();
diff --git a/xmlscript/source/misc/unoservices.cxx
b/xmlscript/source/misc/unoservices.cxx
index 8d89cef..87eb33e 100644
--- a/xmlscript/source/misc/unoservices.cxx
+++ b/xmlscript/source/misc/unoservices.cxx
@@ -38,11 +38,6 @@ namespace xmlscript
nullptr, 0
},
{
-create_XMLOasisBasicExporter,
getImplementationName_XMLOasisBasicExporter,
-getSupportedServiceNames_XMLOasisBasicExporter,
::cppu::createSingleComponentFactory,
-nullptr, 0
-},
-{
create_XMLBasicImporter, getImplementationName_XMLBasicImporter,
getSupportedServiceNames_XMLBasicImporter,
::cppu::createSingleComponentFactory,
nullptr, 0
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
index 4f6c49e..4250644 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
@@ -52,17 +52,6 @@ namespace xmlscript
return aNames;
}
-OUString getImplementationName_XMLOasisBasicExporter()
-{
-return OUString( "com.sun.star.comp.xmlscript.XMLOasisBasicExporter" );
-}
-
-Sequence< OUString > getSupportedServiceNames_XMLOasisBasicExporter()
-{
-Sequence< OUString > aNames {
"com.sun.star.document.XMLOasisBasicExporter" };
-return aNames;
-}
-
// XMLBasicExporterBase
XMLBasicExporterBase::XMLBasicExporterBase( bool bOasis )
@@ -399,12 +388,13 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence<
beans::PropertyValue >& /
OUString XMLOasisBasicExporter::getImplementationName( ) throw
(RuntimeException, std::exception)
{
-return getImplementationName_XMLOasisBasicExporter();
+return OUString( "com.sun.star.comp.xmlscript.XMLOasisBasicExporter" );
}
Sequence< OUString > XMLOasisBasicExporter::getSupportedServiceNames( )
throw (RuntimeException, std::exception)
{
-return getSupportedServiceNames_XMLOasisBasicExporter();
+Sequence< OUString > aNames {
"com.sun.star.document.XMLOasisBasicExporter" };
+return aNames;
}
// component operations
@@ -415,12 +405,15 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence<
beans::PropertyValue >& /
return static_cast< lang::XTypeProvider * >( new XMLBasicExporter );
}
-Reference< XInterface > SAL_CALL create_XMLOasisBasicExporter(
-Reference< XComponentContext > const & )
-{
-return static_cast< lang::XTypeProvider * >( new XMLOasisBasicExporter
);
-}
-
} // namespace xmlscript
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_xmlscript_XMLOasisBasicExporter(
+css::uno::XComponentContext *,
+css::uno::Sequence const &)
+{
+
+return cppu::acquire(new xmlscript::XMLOasisBasicExporter());
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlscript/util/xmlscript.component
b/xmlscript/util/xmlscript.component
index 79b518a..298d874 100644
--- a/xmlscript/util/xmlscript.component
+++ b/xmlscript/util/xmlscript.component
@@ -28,7 +28,8 @@
-
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
