Attachment #7557 for issue #16694

View | Details | Raw Unified | Return to issue 16694
Collapse All | Expand All

Lines 89-95 Link Here

(-)inc/ZipPackageFolder.hxx (-2 / +2 lines)
89	struct ZipEntry;	89	struct ZipEntry;
90	typedef void* rtlRandomPool;	90	typedef void* rtlRandomPool;
91		91
92	#ifdef MACOSX	92	#if defined( MACOSX ) && ( __GNUC__ < 3 )
93	class ZipPackageFolder : public ZipPackageEntry,	93	class ZipPackageFolder : public ZipPackageEntry,
94	public ::cppu::OWeakObject,	94	public ::cppu::OWeakObject,
95	public ::com::sun::star::container::XNameContainer,	95	public ::com::sun::star::container::XNameContainer,
Lines 125-131 Link Here
125	throw(::com::sun::star::uno::RuntimeException);	125	throw(::com::sun::star::uno::RuntimeException);
126	void releaseUpwardRef();	126	void releaseUpwardRef();
127		127
128	#ifdef MACOSX	128	#if defined( MACOSX ) && ( __GNUC__ < 3 )
129	// XInterface	129	// XInterface
130	virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType )	130	virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType )
131	throw(::com::sun::star::uno::RuntimeException);	131	throw(::com::sun::star::uno::RuntimeException);

Lines 88-94 Link Here

(-)source/zippackage/ZipPackageEntry.hxx (-2 / +2 lines)
88		88
89	class ZipPackageFolder;	89	class ZipPackageFolder;
90		90
91	#ifdef MACOSX	91	#if defined( MACOSX ) && ( __GNUC__ < 3 )
92	class ZipPackageEntry : public com::sun::star::container::XNamed,	92	class ZipPackageEntry : public com::sun::star::container::XNamed,
93	public com::sun::star::container::XChild,	93	public com::sun::star::container::XChild,
94	public com::sun::star::lang::XUnoTunnel,	94	public com::sun::star::lang::XUnoTunnel,
Lines 126-132 Link Here
126	{	126	{
127	xParent.clear();	127	xParent.clear();
128	}	128	}
129	#ifdef MACOSX	129	#if defined( MACOSX ) && ( __GNUC__ < 3 )
130	// XInterface	130	// XInterface
131	virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType )	131	virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType )
132	throw(::com::sun::star::uno::RuntimeException) = 0;	132	throw(::com::sun::star::uno::RuntimeException) = 0;





Sequence < sal_Int8 > ZipPackageFolder::aImplementationId = Sequence < sal_Int8 > ();

#if defined( MACOSX ) && ( __GNUC__ < 3 )
#include <cppuhelper/typeprovider.hxx>
static ::cppu::OImplementationId * pId = 0;
#endif

	aEntry.nOffset		= -1;
	if ( !aImplementationId.getLength() )
        {
#if defined( MACOSX ) && ( __GNUC__ < 3 )
                if (! pId)
                {
                        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );

    rDest.nExtraLen			= rSource.nExtraLen;
}

#if defined( MACOSX ) && ( __GNUC__ < 3 )
Any SAL_CALL ZipPackageFolder::queryInterface( const Type& rType ) 
	throw(RuntimeException)
{





Sequence < sal_Int8 > ZipPackageStream::aImplementationId = Sequence < sal_Int8 > ();

#if defined( MACOSX ) && ( __GNUC__ < 3 )
#include <cppuhelper/typeprovider.hxx>
static ::cppu::OImplementationId * pId = 0;
#endif


	if ( !aImplementationId.getLength() )
        {
#if defined( MACOSX ) && ( __GNUC__ < 3 )
            if (! pId)
            {
                    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );

	aEntry.nExtraLen = rInEntry.nExtraLen;
}

#if defined( MACOSX ) && ( __GNUC__ < 3 )
	//XInterface
Any SAL_CALL ZipPackageStream::queryInterface( const Type& rType ) 
	throw(RuntimeException)

Lines 80-86 Link Here

(-)source/zippackage/ZipPackageStream.hxx (-2 / +2 lines)
80		80
81	class ZipPackage;	81	class ZipPackage;
82	struct ZipEntry;	82	struct ZipEntry;
83	#ifdef MACOSX	83	#if defined( MACOSX ) && ( __GNUC__ < 3 )
84	class ZipPackageStream : public ZipPackageEntry,	84	class ZipPackageStream : public ZipPackageEntry,
85	public ::cppu::OWeakObject,	85	public ::cppu::OWeakObject,
86	public ::com::sun::star::io::XActiveDataSink	86	public ::com::sun::star::io::XActiveDataSink
Lines 154-160 Link Here
154	return aImplementationId;	154	return aImplementationId;
155	}	155	}
156		156
157	#ifdef MACOSX	157	#if defined( MACOSX ) && ( __GNUC__ < 3 )
158	// XInterface	158	// XInterface
159	virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType )	159	virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType )
160	throw(::com::sun::star::uno::RuntimeException);	160	throw(::com::sun::star::uno::RuntimeException);

Return to issue 16694

Lines 120-126 Link Here

(-)source/zippackage/ZipPackageFolder.cxx (-3 / +3 lines)
120		120
121	Sequence < sal_Int8 > ZipPackageFolder::aImplementationId = Sequence < sal_Int8 > ();	121	Sequence < sal_Int8 > ZipPackageFolder::aImplementationId = Sequence < sal_Int8 > ();
122		122
123	#ifdef MACOSX	123	#if defined( MACOSX ) && ( __GNUC__ < 3 )
124	#include <cppuhelper/typeprovider.hxx>	124	#include <cppuhelper/typeprovider.hxx>
125	static ::cppu::OImplementationId * pId = 0;	125	static ::cppu::OImplementationId * pId = 0;
126	#endif	126	#endif
Lines 138-144 Link Here
138	aEntry.nOffset = -1;	138	aEntry.nOffset = -1;
139	if ( !aImplementationId.getLength() )	139	if ( !aImplementationId.getLength() )
140	{	140	{
141	#ifdef MACOSX	141	#if defined( MACOSX ) && ( __GNUC__ < 3 )
142	if (! pId)	142	if (! pId)
143	{	143	{
144	::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );	144	::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
Lines 174-180 Link Here
174	rDest.nExtraLen = rSource.nExtraLen;	174	rDest.nExtraLen = rSource.nExtraLen;
175	}	175	}
176		176
177	#ifdef MACOSX	177	#if defined( MACOSX ) && ( __GNUC__ < 3 )
178	Any SAL_CALL ZipPackageFolder::queryInterface( const Type& rType )	178	Any SAL_CALL ZipPackageFolder::queryInterface( const Type& rType )
179	throw(RuntimeException)	179	throw(RuntimeException)
180	{	180	{

Lines 85-91 Link Here

(-)source/zippackage/ZipPackageStream.cxx (-3 / +3 lines)
85		85
86	Sequence < sal_Int8 > ZipPackageStream::aImplementationId = Sequence < sal_Int8 > ();	86	Sequence < sal_Int8 > ZipPackageStream::aImplementationId = Sequence < sal_Int8 > ();
87		87
88	#ifdef MACOSX	88	#if defined( MACOSX ) && ( __GNUC__ < 3 )
89	#include <cppuhelper/typeprovider.hxx>	89	#include <cppuhelper/typeprovider.hxx>
90	static ::cppu::OImplementationId * pId = 0;	90	static ::cppu::OImplementationId * pId = 0;
91	#endif	91	#endif
Lines 113-119 Link Here
113		113
114	if ( !aImplementationId.getLength() )	114	if ( !aImplementationId.getLength() )
115	{	115	{
116	#ifdef MACOSX	116	#if defined( MACOSX ) && ( __GNUC__ < 3 )
117	if (! pId)	117	if (! pId)
118	{	118	{
119	::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );	119	::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
Lines 149-155 Link Here
149	aEntry.nExtraLen = rInEntry.nExtraLen;	149	aEntry.nExtraLen = rInEntry.nExtraLen;
150	}	150	}
151		151
152	#ifdef MACOSX	152	#if defined( MACOSX ) && ( __GNUC__ < 3 )
153	//XInterface	153	//XInterface
154	Any SAL_CALL ZipPackageStream::queryInterface( const Type& rType )	154	Any SAL_CALL ZipPackageStream::queryInterface( const Type& rType )
155	throw(RuntimeException)	155	throw(RuntimeException)