diff options
author | David Tardon <dtardon@redhat.com> | 2014-01-16 16:37:57 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-01-16 16:40:00 +0100 |
commit | c20db8735e3f30cf61940e8c1da739efcb00ae22 (patch) | |
tree | 9bb0d0d7224f9180f4a17650c305251099ec894d /package/inc | |
parent | css::packages::Packages is a wrong choice (diff) | |
download | core-c20db8735e3f30cf61940e8c1da739efcb00ae22.tar.gz core-c20db8735e3f30cf61940e8c1da739efcb00ae22.zip |
Revert "impl. enumeration for ZipPackage"
This reverts commit 5b2cca80eeb2c8ee210820cc8ed95e5d69214807.
Also reverts commit 86a5053df0d755d10121d65c533f3d327340a0fd.
Diffstat (limited to 'package/inc')
-rw-r--r-- | package/inc/ZipPackage.hxx | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx index 1a0bb308a4a5..3631799c59e9 100644 --- a/package/inc/ZipPackage.hxx +++ b/package/inc/ZipPackage.hxx @@ -19,9 +19,8 @@ #ifndef _ZIP_PACKAGE_HXX #define _ZIP_PACKAGE_HXX -#include <cppuhelper/implbase8.hxx> +#include <cppuhelper/implbase7.hxx> #include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/util/XChangesBatch.hpp> @@ -64,13 +63,12 @@ enum InitialisationMode e_IMode_XStream }; -class ZipPackage : public cppu::WeakImplHelper8 +class ZipPackage : public cppu::WeakImplHelper7 < com::sun::star::lang::XInitialization, com::sun::star::lang::XSingleServiceFactory, com::sun::star::lang::XUnoTunnel, com::sun::star::lang::XServiceInfo, - com::sun::star::container::XEnumerationAccess, com::sun::star::container::XHierarchicalNameAccess, com::sun::star::util::XChangesBatch, com::sun::star::beans::XPropertySet @@ -143,14 +141,6 @@ public: // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() - throw(::com::sun::star::uno::RuntimeException); - // XElementType - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() - throw(::com::sun::star::uno::RuntimeException); // XHierarchicalNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByHierarchicalName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); |