diff options
Diffstat (limited to 'sw/source/core/text/txtfld.cxx')
| -rw-r--r-- | sw/source/core/text/txtfld.cxx | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx index 071197498e6e..cc12ca9536e5 100644 --- a/sw/source/core/text/txtfld.cxx +++ b/sw/source/core/text/txtfld.cxx @@ -55,7 +55,6 @@ * SwTxtFormatter::NewFldPortion() *************************************************************************/ - static bool lcl_IsInBody( SwFrm *pFrm ) { if ( pFrm->IsInDocBody() ) @@ -70,7 +69,6 @@ static bool lcl_IsInBody( SwFrm *pFrm ) } } - SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, const SwTxtAttr *pHint ) const { @@ -419,7 +417,6 @@ SwLinePortion *SwTxtFormatter::NewExtraPortion( SwTxtFormatInfo &rInf ) * SwTxtFormatter::NewNumberPortion() *************************************************************************/ - SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const { if( rInf.IsNumDone() || rInf.GetTxtStart() != nStart @@ -478,9 +475,8 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const { const Font *pFmtFnt = rNumFmt.GetBulletFont(); - // // Build a new bullet font basing on the current paragraph font: - // + pNumFnt = new SwFont( &rInf.GetCharAttr(), pIDSA ); // #i53199# @@ -501,10 +497,9 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const pNumFnt->SetWeight( WEIGHT_NORMAL, SW_CTL ); } - // // Apply the explicit attributes from the character style // associated with the numering to the new bullet font. - // + if( pFmt ) pNumFnt->SetDiffFnt( pFmt, pIDSA ); @@ -544,9 +539,9 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const // vorliegt! if( !aTxt.isEmpty() ) { - // + // Build a new numbering font basing on the current paragraph font: - // + pNumFnt = new SwFont( &rInf.GetCharAttr(), pIDSA ); // #i53199# @@ -559,11 +554,9 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const pNumFnt->SetOverline( UNDERLINE_NONE ); } - - // // Apply the explicit attributes from the character style // associated with the numering to the new bullet font. - // + if( pFmt ) pNumFnt->SetDiffFnt( pFmt, pIDSA ); |