diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 11:12:36 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 11:12:36 +0000 |
| commit | 7da9e7967d0f91d726980cbbc8d21b68cc255c84 (patch) | |
| tree | 72bc5aa279b46700033133d1c74e1bf9b4c198f8 | |
| parent | 308abaad91d783bb0b57695d9a20982c3617353d (diff) | |
INTEGRATION: CWS warnings01 (1.9.18); FILE MERGED
2005/09/22 19:00:35 sb 1.9.18.3: RESYNC: (1.9-1.10); FILE MERGED
2005/09/08 08:48:32 sb 1.9.18.2: #i53898# Made code warning-free.
2005/09/01 12:15:31 sb 1.9.18.1: #i53898# Made code warning-free.
| -rw-r--r-- | ucbhelper/source/provider/contenthelper.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx index f3b53f3d3df1..90bff4789960 100644 --- a/ucbhelper/source/provider/contenthelper.cxx +++ b/ucbhelper/source/provider/contenthelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: contenthelper.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2005-09-09 16:37:01 $ + * last change: $Author: hr $ $Date: 2006-06-19 12:12:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -228,8 +228,8 @@ ContentImplHelper::ContentImplHelper( sal_Bool bRegisterAtProvider ) : m_pImpl( new ContentImplHelper_Impl ), m_xSMgr( rxSMgr ), - m_xProvider( rxProvider ), m_xIdentifier( Identifier ), + m_xProvider( rxProvider ), m_nCommandId( 0 ) { if ( bRegisterAtProvider ) @@ -968,7 +968,7 @@ Reference< XInterface > SAL_CALL ContentImplHelper::getParent() //========================================================================= // virtual void SAL_CALL ContentImplHelper::setParent( - const Reference< XInterface >& Parent ) + const Reference< XInterface >& ) throw( NoSupportException, RuntimeException ) { throw NoSupportException(); @@ -1057,7 +1057,7 @@ void ContentImplHelper::notifyPropertiesChange( OInterfaceIteratorHelper aIter( *pPropsContainer ); while ( aIter.hasMoreElements() ) { - PropertyEventSequence* pEvents = NULL; + PropertyEventSequence* p = NULL; XPropertiesChangeListener* pListener = static_cast< XPropertiesChangeListener * >( @@ -1067,14 +1067,14 @@ void ContentImplHelper::notifyPropertiesChange( if ( it == aListeners.end() ) { // Not in map - create and insert new entry. - pEvents = new PropertyEventSequence( nCount ); - aListeners[ pListener ] = pEvents; + p = new PropertyEventSequence( nCount ); + aListeners[ pListener ] = p; } else - pEvents = (*it).second; + p = (*it).second; - if ( pEvents ) - pEvents->append( rEvent ); + if ( p ) + p->append( rEvent ); } } } |