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

INTEGRATION: CWS geordi2q14 (1.10.46); FILE MERGED

Browse source 
2004/01/29 17:44:53 hr 1.10.46.1: #111934#: merge CWS ooo111fix2
This commit is contained in:
Jens-Heiner Rechtien 2004-02-02 18:21:12 +00:00
parent 03b8c5dc6f
commit 76004f6580
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/source/zippackage/ZipPackageEntry.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: ZipPackageEntry.hxx,v $
*
* $Revision: 1.10 $
* $Revision: 1.11 $
*
* last change: $Author: hr $ $Date: 2003-07-16 17:36:59 $
* last change: $Author: hr $ $Date: 2004-02-02 19:21:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -88,13 +88,6 @@
class ZipPackageFolder;
#if defined( MACOSX ) && ( __GNUC__ < 3 )
class ZipPackageEntry : public com::sun::star::container::XNamed,
public com::sun::star::container::XChild,
public com::sun::star::lang::XUnoTunnel,
public com::sun::star::beans::XPropertySet,
public com::sun::star::lang::XServiceInfo
#else
class ZipPackageEntry : public cppu::WeakImplHelper5
<
com::sun::star::container::XNamed,
@ -103,7 +96,6 @@ class ZipPackageEntry : public cppu::WeakImplHelper5
com::sun::star::beans::XPropertySet,
com::sun::star::lang::XServiceInfo
>
#endif
{
protected:
bool mbIsFolder:1;
@ -126,15 +118,6 @@ public:
{
xParent.clear();
}
#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) = 0;
virtual void SAL_CALL acquire( )
throw() = 0;
virtual void SAL_CALL release( )
throw() = 0;
#endif
// XNamed
virtual ::rtl::OUString SAL_CALL getName( )
throw(::com::sun::star::uno::RuntimeException);