diff options
| -rwxr-xr-x | solenv/bin/native-code.py | 1 | ||||
| -rw-r--r-- | xmloff/inc/facreg.hxx | 7 | ||||
| -rw-r--r-- | xmloff/source/core/facreg.cxx | 5 | ||||
| -rw-r--r-- | xmloff/source/draw/sdxmlimp.cxx | 23 | ||||
| -rw-r--r-- | xmloff/util/xo.component | 3 |
5 files changed, 12 insertions, 27 deletions
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index f7858cdd49d4..fc5e2f725c21 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -273,6 +273,7 @@ core_constructor_list = [ "com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation", "com_sun_star_comp_Impress_XMLOasisMetaImporter_get_implementation", "com_sun_star_comp_Impress_XMLOasisContentImporter_get_implementation", + "com_sun_star_comp_Impress_XMLOasisStylesImporter_get_implementation", "com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation", "com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation", "com_sun_star_comp_Draw_XMLOasisImporter_get_implementation", diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx index 8541b7842b17..7cb149cac9f1 100644 --- a/xmloff/inc/facreg.hxx +++ b/xmloff/inc/facreg.hxx @@ -33,13 +33,6 @@ namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } } -// impress oasis import -OUString XMLImpressStylesImportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> XMLImpressStylesImportOasis_getSupportedServiceNames() throw(); -/// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> XMLImpressStylesImportOasis_createInstance( - css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); - // impress OOo export OUString XMLImpressExportOOO_getImplementationName() throw(); css::uno::Sequence<OUString> XMLImpressExportOOO_getSupportedServiceNames() throw(); diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index cba072106f97..0190e6b0d818 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -56,10 +56,7 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi const sal_Int32 nImplNameLen = strlen( pImplName ); - // impress oasis import - SINGLEFACTORY( XMLImpressStylesImportOasis ) - - else SINGLEFACTORY( AnimationsImport ) + SINGLEFACTORY( AnimationsImport ) // impress OOo export else SINGLEFACTORY( XMLImpressExportOOO ) diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index d161d68d657b..5b5b1ad63ee2 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -260,20 +260,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL SdXMLFlatDocContext_Imp } } -#define SERVICE(classname,servicename,implementationname,draw,flags)\ -uno::Sequence< OUString > classname##_getSupportedServiceNames() throw()\ -{\ - return uno::Sequence< OUString > { servicename };\ -}\ -OUString classname##_getImplementationName() throw()\ -{\ - return OUString( implementationname );\ -}\ -uno::Reference< uno::XInterface > classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr)\ -{\ - return static_cast<cppu::OWeakObject*>(new SdXMLImport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags )); \ -} - extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_comp_Impress_XMLOasisImporter_get_implementation( uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/) @@ -324,7 +310,14 @@ com_sun_star_comp_Draw_XMLOasisSettingsImporter_get_implementation( new SdXMLImport(pCtx, "XMLDrawSettingsImportOasis", true, SvXMLImportFlags::SETTINGS)); } -SERVICE( XMLImpressStylesImportOasis, "com.sun.star.comp.Impress.XMLOasisStylesImporter", "XMLImpressStylesImportOasis", false, SvXMLImportFlags::STYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES ) +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* +com_sun_star_comp_Impress_XMLOasisStylesImporter_get_implementation( + uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/) +{ + return cppu::acquire(new SdXMLImport(pCtx, "XMLImpressStylesImportOasis", false, + SvXMLImportFlags::STYLES | SvXMLImportFlags::AUTOSTYLES + | SvXMLImportFlags::MASTERSTYLES)); +} extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_comp_Impress_XMLOasisContentImporter_get_implementation( diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component index abf03a6e9dfc..936b7b627103 100644 --- a/xmloff/util/xo.component +++ b/xmloff/util/xo.component @@ -155,7 +155,8 @@ constructor="com_sun_star_comp_Impress_XMLOasisStylesExporter_get_implementation"> <service name="com.sun.star.comp.Impress.XMLOasisStylesExporter"/> </implementation> - <implementation name="XMLImpressStylesImportOasis"> + <implementation name="XMLImpressStylesImportOasis" + constructor="com_sun_star_comp_Impress_XMLOasisStylesImporter_get_implementation"> <service name="com.sun.star.comp.Impress.XMLOasisStylesImporter"/> </implementation> <implementation name="XMLDrawStylesImportOasis" |