mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "impl. enumeration for ZipPackage"

Browse Source 
This reverts commit 5b2cca80eeb2c8ee210820cc8ed95e5d69214807.
Also reverts commit 86a5053df0d755d10121d65c533f3d327340a0fd.
This commit is contained in:
David Tardon 2014-01-16 16:37:57 +01:00
parent 04a9214fbf
commit c20db8735e
2 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/inc/ZipPackage.hxx
View File

@ -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);

25
package/source/zippackage/ZipPackage.cxx
View File

@ -66,7 +66,6 @@
#include <osl/time.h>
#include "com/sun/star/io/XAsyncOutputMonitor.hpp"
#include <cassert>
#include <cstring>
#include <memory>
#include <vector>
@ -778,30 +777,6 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments )
}
}
::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL ZipPackage::createEnumeration()
throw( RuntimeException )
{
assert(m_pRootFolder);
return m_pRootFolder->createEnumeration();
}
::com::sun::star::uno::Type SAL_CALL ZipPackage::getElementType()
throw( RuntimeException )
{
assert(m_pRootFolder);
return m_pRootFolder->getElementType();
}
sal_Bool SAL_CALL ZipPackage::hasElements()
throw( RuntimeException )
{
assert(m_pRootFolder);
return m_pRootFolder->hasElements();
}
Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName )
throw( NoSuchElementException, RuntimeException )
{