mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin: cstylecast

Browse Source 
Change-Id: I28443b688f8ab752162846e5cea661f26d269cad
This commit is contained in:
Noel Grandin
2014-09-26 15:35:11 +02:00
parent 0ecf6afbd1
commit a2320eaf39
6 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
UnoControls/source/base/basecontainercontrol.cxx
View File

@@ -266,7 +266,7 @@ void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Re
// Send event // Send event
while ( aIterator.hasMoreElements() ) while ( aIterator.hasMoreElements() )
{ {
((XContainerListener*)aIterator.next())->elementInserted (aEvent); static_cast<XContainerListener*>(aIterator.next())->elementInserted (aEvent);
} }
} }
} }
@@ -313,7 +313,7 @@ void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl >
while ( aIterator.hasMoreElements() ) while ( aIterator.hasMoreElements() )
{ {
((XContainerListener*)aIterator.next())->elementRemoved (aEvent); static_cast<XContainerListener*>(aIterator.next())->elementRemoved (aEvent);
} }
} }
// Break "for" ! // Break "for" !

2
UnoControls/source/base/multiplexer.cxx
View File

@@ -48,7 +48,7 @@ namespace unocontrols{
{ \ { \
if( aIterator.hasMoreElements() ) \ if( aIterator.hasMoreElements() ) \
{ \ { \
INTERFACE * pListener = (INTERFACE *)aIterator.next(); \ INTERFACE * pListener = static_cast<INTERFACE *>(aIterator.next()); \
try \ try \
{ \ { \
pListener->METHOD( aLocalEvent ); \ pListener->METHOD( aLocalEvent ); \

2
sot/source/sdstor/stgcache.cxx
View File

@@ -308,7 +308,7 @@ void StgCache::Close()
{ {
if( bFile ) if( bFile )
{ {
((SvFileStream*) pStrm)->Close(); static_cast<SvFileStream*>(pStrm)->Close();
SetError( pStrm->GetError() ); SetError( pStrm->GetError() );
} }
} }

30
sot/source/sdstor/stgdir.cxx
View File

@@ -96,7 +96,7 @@ short StgDirEntry::Compare( const StgAvlNode* p ) const
short nResult = -1; short nResult = -1;
if ( p ) if ( p )
{ {
const StgDirEntry* pEntry = (const StgDirEntry*) p; const StgDirEntry* pEntry = static_cast<const StgDirEntry*>(p);
nResult = aEntry.Compare( pEntry->aEntry ); nResult = aEntry.Compare( pEntry->aEntry );
} }
return nResult; return nResult;
@@ -114,11 +114,13 @@ void StgDirEntry::Enum( sal_Int32& n )
nEntry = n++; nEntry = n++;
if( pLeft ) if( pLeft )
{ {
((StgDirEntry*) pLeft)->Enum( n ); nLeft = ((StgDirEntry*) pLeft)->nEntry; static_cast<StgDirEntry*>(pLeft)->Enum( n );
nLeft = static_cast<StgDirEntry*>(pLeft)->nEntry;
} }
if( pRight ) if( pRight )
{ {
((StgDirEntry*) pRight)->Enum( n ); nRight = ((StgDirEntry*) pRight)->nEntry; static_cast<StgDirEntry*>(pRight)->Enum( n );
nRight = static_cast<StgDirEntry*>(pRight)->nEntry;
} }
if( pDown ) if( pDown )
{ {
@@ -135,9 +137,9 @@ void StgDirEntry::Enum( sal_Int32& n )
void StgDirEntry::DelTemp( bool bForce ) void StgDirEntry::DelTemp( bool bForce )
{ {
if( pLeft ) if( pLeft )
((StgDirEntry*) pLeft)->DelTemp( false ); static_cast<StgDirEntry*>(pLeft)->DelTemp( false );
if( pRight ) if( pRight )
((StgDirEntry*) pRight)->DelTemp( false ); static_cast<StgDirEntry*>(pRight)->DelTemp( false );
if( pDown ) if( pDown )
{ {
// If the storage is dead, of course all elements are dead, too // If the storage is dead, of course all elements are dead, too
@@ -173,10 +175,10 @@ bool StgDirEntry::Store( StgDirStrm& rStrm )
// Do not store the current (maybe not commited) entry // Do not store the current (maybe not commited) entry
aSave.Store( pEntry ); aSave.Store( pEntry );
if( pLeft ) if( pLeft )
if( !((StgDirEntry*) pLeft)->Store( rStrm ) ) if( !static_cast<StgDirEntry*>(pLeft)->Store( rStrm ) )
return false; return false;
if( pRight ) if( pRight )
if( !((StgDirEntry*) pRight)->Store( rStrm ) ) if( !static_cast<StgDirEntry*>(pRight)->Store( rStrm ) )
return false; return false;
if( pDown ) if( pDown )
if( !pDown->Store( rStrm ) ) if( !pDown->Store( rStrm ) )
@@ -213,10 +215,10 @@ bool StgDirEntry::StoreStreams( StgIo& rIo )
if( !StoreStream( rIo ) ) if( !StoreStream( rIo ) )
return false; return false;
if( pLeft ) if( pLeft )
if( !((StgDirEntry*) pLeft)->StoreStreams( rIo ) ) if( !static_cast<StgDirEntry*>(pLeft)->StoreStreams( rIo ) )
return false; return false;
if( pRight ) if( pRight )
if( !((StgDirEntry*) pRight)->StoreStreams( rIo ) ) if( !static_cast<StgDirEntry*>(pRight)->StoreStreams( rIo ) )
return false; return false;
if( pDown ) if( pDown )
if( !pDown->StoreStreams( rIo ) ) if( !pDown->StoreStreams( rIo ) )
@@ -230,9 +232,9 @@ void StgDirEntry::RevertAll()
{ {
aEntry = aSave; aEntry = aSave;
if( pLeft ) if( pLeft )
((StgDirEntry*) pLeft)->RevertAll(); static_cast<StgDirEntry*>(pLeft)->RevertAll();
if( pRight ) if( pRight )
((StgDirEntry*) pRight)->RevertAll(); static_cast<StgDirEntry*>(pRight)->RevertAll();
if( pDown ) if( pDown )
pDown->RevertAll(); pDown->RevertAll();
} }
@@ -243,9 +245,9 @@ bool StgDirEntry::IsDirty()
{ {
if( bDirty || bInvalid ) if( bDirty || bInvalid )
return true; return true;
if( pLeft && ((StgDirEntry*) pLeft)->IsDirty() ) if( pLeft && static_cast<StgDirEntry*>(pLeft)->IsDirty() )
return true; return true;
if( pRight && ((StgDirEntry*) pRight)->IsDirty() ) if( pRight && static_cast<StgDirEntry*>(pRight)->IsDirty() )
return true; return true;
if( pDown && pDown->IsDirty() ) if( pDown && pDown->IsDirty() )
return true; return true;
@@ -985,7 +987,7 @@ StgDirEntry* StgDirStrm::Find( StgDirEntry& rStg, const OUString& rName )
} }
// Look in the directory attached to the entry // Look in the directory attached to the entry
StgDirEntry aTest( aEntry ); StgDirEntry aTest( aEntry );
return (StgDirEntry*) rStg.pDown->Find( &aTest ); return static_cast<StgDirEntry*>( rStg.pDown->Find( &aTest ) );
} }
else else
return NULL; return NULL;

2
sot/source/sdstor/stgio.cxx
View File

@@ -357,7 +357,7 @@ sal_uLong StgIo::ValidateFATs()
bool bRet1 = !pV->IsError(), bRet2 = true ; bool bRet1 = !pV->IsError(), bRet2 = true ;
delete pV; delete pV;
SvFileStream *pFileStrm = ( SvFileStream *) GetStrm(); SvFileStream *pFileStrm = static_cast<SvFileStream *>( GetStrm() );
if ( !pFileStrm ) if ( !pFileStrm )
return FAT_INMEMORYERROR; return FAT_INMEMORYERROR;

14
sot/source/sdstor/ucbstorage.cxx
View File

@@ -2018,9 +2018,9 @@ void UCBStorage_Impl::GetProps( sal_Int32& nProps, Sequence < Sequence < Propert
aPath += m_aName; aPath += m_aName;
aPath += "/"; aPath += "/";
aProps[0].Name = "MediaType"; aProps[0].Name = "MediaType";
aProps[0].Value <<= (OUString ) m_aContentType; aProps[0].Value <<= m_aContentType;
aProps[1].Name = "FullPath"; aProps[1].Name = "FullPath";
aProps[1].Value <<= (OUString ) aPath; aProps[1].Value <<= aPath;
rSequence[ nProps++ ] = aProps; rSequence[ nProps++ ] = aProps;
if ( m_bIsRoot ) if ( m_bIsRoot )
@@ -2041,9 +2041,9 @@ void UCBStorage_Impl::GetProps( sal_Int32& nProps, Sequence < Sequence < Propert
OUString aElementPath( aPath ); OUString aElementPath( aPath );
aElementPath += pElement->m_aName; aElementPath += pElement->m_aName;
aProps[0].Name = "MediaType"; aProps[0].Name = "MediaType";
aProps[0].Value <<= (OUString ) pElement->GetContentType(); aProps[0].Value <<= pElement->GetContentType();
aProps[1].Name = "FullPath"; aProps[1].Name = "FullPath";
aProps[1].Value <<= (OUString ) aElementPath; aProps[1].Value <<= aElementPath;
rSequence[ nProps++ ] = aProps; rSequence[ nProps++ ] = aProps;
} }
} }
@@ -2202,7 +2202,7 @@ sal_Int16 UCBStorage_Impl::Commit()
// name ( title ) of the element was changed // name ( title ) of the element was changed
nLocalRet = COMMIT_RESULT_SUCCESS; nLocalRet = COMMIT_RESULT_SUCCESS;
Any aAny; Any aAny;
aAny <<= (OUString) pElement->m_aName; aAny <<= pElement->m_aName;
pContent->setPropertyValue("Title", aAny ); pContent->setPropertyValue("Title", aAny );
} }
@@ -2211,7 +2211,7 @@ sal_Int16 UCBStorage_Impl::Commit()
// mediatype of the element was changed // mediatype of the element was changed
nLocalRet = COMMIT_RESULT_SUCCESS; nLocalRet = COMMIT_RESULT_SUCCESS;
Any aAny; Any aAny;
aAny <<= (OUString) pElement->GetContentType(); aAny <<= pElement->GetContentType();
pContent->setPropertyValue("MediaType", aAny ); pContent->setPropertyValue("MediaType", aAny );
} }
@@ -2258,7 +2258,7 @@ sal_Int16 UCBStorage_Impl::Commit()
// commit the media type to the JAR file // commit the media type to the JAR file
// clipboard format and ClassId will be retrieved from the media type when the file is loaded again // clipboard format and ClassId will be retrieved from the media type when the file is loaded again
Any aType; Any aType;
aType <<= (OUString) m_aContentType; aType <<= m_aContentType;
m_pContent->setPropertyValue("MediaType", aType ); m_pContent->setPropertyValue("MediaType", aType );
if ( m_bIsLinked ) if ( m_bIsLinked )