INTEGRATION: CWS warnings01 (1.8.36); FILE MERGED

2005/11/29 15:10:44 sb 1.8.36.4: #i53898# Made code warning-free.
2005/09/22 20:29:20 sb 1.8.36.3: RESYNC: (1.8-1.9); FILE MERGED
2005/09/07 14:14:54 sb 1.8.36.2: #i53898# Made code warning-free.
2005/09/01 08:14:28 sb 1.8.36.1: #i53898# Made code warning-free.
This commit is contained in:
Jens-Heiner Rechtien
2006-06-19 23:17:40 +00:00
parent 0ce87641f4
commit d0ebece73e

View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: odata.cxx,v $ * $RCSfile: odata.cxx,v $
* *
* $Revision: 1.9 $ * $Revision: 1.10 $
* *
* last change: $Author: rt $ $Date: 2005-09-07 18:30:46 $ * last change: $Author: hr $ $Date: 2006-06-20 00:17:40 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -509,7 +509,7 @@ Sequence< OUString > ODataInputStream::getSupportedServiceNames(void) throw ()
* *
****/ ****/
Reference< XInterface > SAL_CALL ODataInputStream_CreateInstance( const Reference < XComponentContext > & rSMgr ) throw( Exception) Reference< XInterface > SAL_CALL ODataInputStream_CreateInstance( const Reference < XComponentContext > & ) throw( Exception)
{ {
ODataInputStream *p = new ODataInputStream; ODataInputStream *p = new ODataInputStream;
return Reference< XInterface > ( (OWeakObject * ) p ); return Reference< XInterface > ( (OWeakObject * ) p );
@@ -916,7 +916,7 @@ Sequence< OUString > ODataOutputStream::getSupportedServiceNames(void) throw ()
Reference< XInterface > SAL_CALL ODataOutputStream_CreateInstance( const Reference < XComponentContext > & rSMgr ) throw(Exception) Reference< XInterface > SAL_CALL ODataOutputStream_CreateInstance( const Reference < XComponentContext > & ) throw(Exception)
{ {
ODataOutputStream *p = new ODataOutputStream; ODataOutputStream *p = new ODataOutputStream;
Reference< XInterface > xService = *p; Reference< XInterface > xService = *p;
@@ -1156,7 +1156,7 @@ void OObjectOutputStream::connectToMarkable(void)
} }
// find the markable stream ! // find the markable stream !
Reference< XInterface > rTry = m_output; Reference< XInterface > rTry(m_output);
while( sal_True ) { while( sal_True ) {
if( ! rTry.is() ) if( ! rTry.is() )
{ {
@@ -1225,7 +1225,7 @@ sal_Int32 OObjectOutputStream::offsetToMark(sal_Int32 nMark)
Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance( const Reference < XComponentContext > & rCtx ) Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance( const Reference < XComponentContext > & )
throw(Exception) throw(Exception)
{ {
OObjectOutputStream *p = new OObjectOutputStream; OObjectOutputStream *p = new OObjectOutputStream;
@@ -1314,9 +1314,9 @@ class OObjectInputStream :
{ {
public: public:
OObjectInputStream( const Reference < XComponentContext > &r) OObjectInputStream( const Reference < XComponentContext > &r)
: m_bValidMarkable(sal_False) : m_rSMgr( r->getServiceManager() )
, m_rCxt( r ) , m_rCxt( r )
, m_rSMgr( r->getServiceManager() ) , m_bValidMarkable(sal_False)
{ {
g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
} }
@@ -1526,7 +1526,7 @@ void OObjectInputStream::connectToMarkable()
} }
// find the markable stream ! // find the markable stream !
Reference< XInterface > rTry = m_input; Reference< XInterface > rTry(m_input);
while( sal_True ) { while( sal_True ) {
if( ! rTry.is() ) if( ! rTry.is() )
{ {