xmloff/inc/xmlversion.hxx | 13 ------------- xmloff/source/core/facreg.cxx | 5 ----- xmloff/source/meta/xmlversion.cxx | 29 ++++++++--------------------- xmloff/util/xo.component | 3 ++- 4 files changed, 10 insertions(+), 40 deletions(-)
New commits: commit 1790ff71bd0772a37ad6ab7885cdbe2752dfdadf Author: Matúš Kukan <matus.ku...@collabora.com> Date: Wed Jan 29 09:02:24 2014 +0100 xo: Constructor feature for XMLVersionListPersistence. Change-Id: I04429d95622f0b5a5988fa3dc3bac16d55aa1b3f diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx index 0bf3113..3f81f11 100644 --- a/xmloff/inc/xmlversion.hxx +++ b/xmloff/inc/xmlversion.hxx @@ -124,19 +124,6 @@ public: virtual void SAL_CALL store( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Sequence< ::com::sun::star::util::RevisionTag >& List ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); }; -::com::sun::star::uno::Sequence< OUString > SAL_CALL - XMLVersionListPersistence_getSupportedServiceNames() - throw(); - -OUString SAL_CALL XMLVersionPersistence_getImplementationName() - throw(); - -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - XMLVersionListPersistence_createInstance( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & ) - throw( ::com::sun::star::uno::Exception ); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 141ef860..9d0067f 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -114,9 +114,6 @@ SERVICE( SchXMLExport ); SERVICE( SchXMLExport_Styles ); SERVICE( SchXMLExport_Content ); -// version list import/export -SERVICE( XMLVersionListPersistence ); - // meta export SERVICE( XMLMetaExportComponent ); @@ -241,8 +238,6 @@ XMLOFF_DLLPUBLIC void * SAL_CALL xo_component_getFactory( const sal_Char * pImpl else SINGLEFACTORY( XMLMetaExportComponent ) else SINGLEFACTORY( XMLMetaImportComponent ) - else SINGLEFACTORY( XMLVersionListPersistence ) - // meta import/export OOo else SINGLEFACTORY( XMLMetaExportOOO ) diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index 98fda5d..46e36c3 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -427,27 +427,6 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con return aVersions; } -uno::Sequence< OUString > SAL_CALL XMLVersionListPersistence_getSupportedServiceNames() - throw() -{ - const OUString aServiceName( - "com.sun.star.document.DocumentRevisionListPersistence" ); - const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; -} - -OUString SAL_CALL XMLVersionListPersistence_getImplementationName() throw() -{ - return OUString( "XMLVersionListPersistence" ); -} - -uno::Reference< uno::XInterface > SAL_CALL XMLVersionListPersistence_createInstance( - const uno::Reference< lang::XMultiServiceFactory > &) - throw( uno::Exception ) -{ - return (cppu::OWeakObject*)new XMLVersionListPersistence; -} - uno::Sequence< OUString > SAL_CALL XMLVersionImExportOOO_getSupportedServiceNames() throw() { @@ -469,4 +448,12 @@ uno::Reference< uno::XInterface > SAL_CALL XMLVersionImExportOOO_createInstance( return (cppu::OWeakObject*)new XMLVersionListPersistence; } +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +XMLVersionListPersistence_get_implementation( + css::uno::XComponentContext *, + css::uno::Sequence<css::uno::Any> const &) +{ + return cppu::acquire(new XMLVersionListPersistence()); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component index 13ae97794..ad180f6 100644 --- a/xmloff/util/xo.component +++ b/xmloff/util/xo.component @@ -149,7 +149,8 @@ <implementation name="XMLMetaImportComponent"> <service name="com.sun.star.document.XMLOasisMetaImporter"/> </implementation> - <implementation name="XMLVersionListPersistence"> + <implementation name="XMLVersionListPersistence" + constructor="XMLVersionListPersistence_get_implementation"> <service name="com.sun.star.document.DocumentRevisionListPersistence"/> </implementation> <implementation name="com.sun.star.comp.Writer.XMLAutotextEventsExporter">
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits