You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2011/08/29 01:36:28 UTC

svn commit: r1162611 - /incubator/ooo/trunk/main/comphelper/inc/comphelper/oslfile2streamwrap.hxx

Author: mst
Date: Sun Aug 28 23:36:28 2011
New Revision: 1162611

URL: http://svn.apache.org/viewvc?rev=1162611&view=rev
Log:
comphelper: OSLOutputStreamWrapper:

 remove re-implementation of XInterface
 (symbols are somehow not exported with GCC 4.6, and it seems to be
 unnecessary)

Modified:
    incubator/ooo/trunk/main/comphelper/inc/comphelper/oslfile2streamwrap.hxx

Modified: incubator/ooo/trunk/main/comphelper/inc/comphelper/oslfile2streamwrap.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/comphelper/inc/comphelper/oslfile2streamwrap.hxx?rev=1162611&r1=1162610&r2=1162611&view=diff
==============================================================================
--- incubator/ooo/trunk/main/comphelper/inc/comphelper/oslfile2streamwrap.hxx (original)
+++ incubator/ooo/trunk/main/comphelper/inc/comphelper/oslfile2streamwrap.hxx Sun Aug 28 23:36:28 2011
@@ -57,14 +57,6 @@ public:
 	OSLInputStreamWrapper(::osl::File* pStream, sal_Bool bOwner=sal_False);
 	virtual ~OSLInputStreamWrapper();
 
-// UNO Anbindung
-	virtual void			SAL_CALL acquire() throw()
-		{ InputStreamWrapper_Base::acquire(); }
-	virtual void			SAL_CALL release() throw()
-		{ InputStreamWrapper_Base::release(); }
-	virtual ::com::sun::star::uno::Any	SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException)
-		{ return InputStreamWrapper_Base::queryInterface(_rType); }
-
 // stario::XInputStream
 	virtual sal_Int32	SAL_CALL	readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
 	virtual sal_Int32	SAL_CALL	readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
@@ -87,14 +79,6 @@ class COMPHELPER_DLLPUBLIC OSLOutputStre
 public:
 	OSLOutputStreamWrapper(::osl::File& _rFile) :rFile(_rFile) { }
 
-// UNO Anbindung
-	virtual void			SAL_CALL acquire() throw()
-		{ OutputStreamWrapper_Base::acquire(); }
-	virtual void			SAL_CALL release() throw()
-		{ OutputStreamWrapper_Base::release(); }
-	virtual ::com::sun::star::uno::Any	SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException)
-		{ return OutputStreamWrapper_Base::queryInterface(_rType); }
-
 // stario::XOutputStream
 	virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
 	virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);



Re: svn commit: r1162611 - /incubator/ooo/trunk/main/comphelper/inc/comphelper/oslfile2streamwrap.hxx

Posted by Eike Rathke <oo...@erack.de>.
Hi Michael,

On Sunday, 2011-08-28 23:36:28 -0000, mst@apache.org wrote:

> URL: http://svn.apache.org/viewvc?rev=1162611&view=rev
> Log:
> comphelper: OSLOutputStreamWrapper:
> 
>  remove re-implementation of XInterface
>  (symbols are somehow not exported with GCC 4.6, and it seems to be
>  unnecessary)

Same here? -fPIC vs -fpic? Really remove forwarding to the base class?

  Eike

-- 
 PGP/OpenPGP/GnuPG encrypted mail preferred in all private communication.
 Key ID: 0x293C05FD - 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD