Skip to content

C
core
Kaydet (Commit) 4eaf7792 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

cppcheck: cstyleCast, these cast's are unnecessary anyway 

and make both uses the same pattern

Change-Id: Ia4170b29ad948af08bfb842a7e28dd7550eb27bf
üst f13cf243
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 9 deletions
sw/source/filter/ww8/wrtw8sty.cxx
Dosyayı görüntüle @ 4eaf7792
...@@ -2208,14 +2208,12 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp, ...@@ -2208,14 +2208,12 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp,
} }
} }
} }
else if( i < aSpareFmts.size() ) else if (i < aSpareFmts.size() && aSpareFmts[i])
{ {
if( const SwFrmFmt* pFmt = (const SwFrmFmt*)aSpareFmts[ i ] ) const SwFrmFmt& rFmt = *aSpareFmts[i];
{ const SwNodeIndex* pNdIdx = rFmt.GetCntnt().GetCntntIdx();
const SwNodeIndex* pNdIdx = pFmt->GetCntnt().GetCntntIdx(); rWrt.WriteSpecialText( pNdIdx->GetIndex() + 1,
rWrt.WriteSpecialText( pNdIdx->GetIndex() + 1, pNdIdx->GetNode().EndOfSectionIndex(), nTTyp );
pNdIdx->GetNode().EndOfSectionIndex(), nTTyp );
}
} }
// CR at end of one textbox text ( otherwise WW gpft :-( ) // CR at end of one textbox text ( otherwise WW gpft :-( )
...@@ -2458,9 +2456,9 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp, ...@@ -2458,9 +2456,9 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
} }
if( NULL == pObj ) if( NULL == pObj )
{ {
if( i < aSpareFmts.size() && aSpareFmts[ i ] ) if (i < aSpareFmts.size() && aSpareFmts[i])
{ {
const SwFrmFmt& rFmt = *(const SwFrmFmt*)aSpareFmts[ i ]; const SwFrmFmt& rFmt = *aSpareFmts[i];
const SwFmtChain* pChn = &rFmt.GetChain(); const SwFmtChain* pChn = &rFmt.GetChain();
while( pChn->GetNext() ) while( pChn->GetNext() )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment