strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS geordi2q14 (1.29.46); FILE MERGED

Browse source 
2004/01/29 17:44:51 hr 1.29.46.1: #111934#: merge CWS ooo111fix2
This commit is contained in:
Jens-Heiner Rechtien 2004-02-02 18:20:55 +00:00
parent b000e6d467
commit 03b8c5dc6f
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
package/inc/ZipPackageFolder.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: ZipPackageFolder.hxx,v $
*
* $Revision: 1.29 $
* $Revision: 1.30 $
*
* last change: $Author: hr $ $Date: 2003-07-16 17:36:50 $
* last change: $Author: hr $ $Date: 2004-02-02 19:20:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -89,19 +89,12 @@ class ZipOutputStream;
struct ZipEntry;
typedef void* rtlRandomPool;
#if defined( MACOSX ) && ( __GNUC__ < 3 )
class ZipPackageFolder : public ZipPackageEntry,
public ::cppu::OWeakObject,
public ::com::sun::star::container::XNameContainer,
public ::com::sun::star::container::XEnumerationAccess
#else
class ZipPackageFolder : public cppu::ImplInheritanceHelper2
<
ZipPackageEntry,
::com::sun::star::container::XNameContainer,
::com::sun::star::container::XEnumerationAccess
>
#endif
{
static com::sun::star::uno::Sequence < sal_Int8 > aImplementationId;
protected:
@ -125,16 +118,6 @@ public:
throw(::com::sun::star::uno::RuntimeException);
void releaseUpwardRef();
#if defined( MACOSX ) && ( __GNUC__ < 3 )
// XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType )
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL acquire( )
throw();
virtual void SAL_CALL release( )
throw();
#endif
// XNameContainer
virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);