diff options
Diffstat (limited to 'sw/source/core/edit/edfmt.cxx')
| -rw-r--r-- | sw/source/core/edit/edfmt.cxx | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx index d65fe3b3eb32..40d716e6cc17 100644 --- a/sw/source/core/edit/edfmt.cxx +++ b/sw/source/core/edit/edfmt.cxx @@ -52,13 +52,8 @@ SwCharFormat* SwEditShell::GetCurCharFormat() const return pFormat; } -void SwEditShell::FillByEx(SwCharFormat* pCharFormat, bool bReset) +void SwEditShell::FillByEx(SwCharFormat* pCharFormat) { - if ( bReset ) - { - pCharFormat->ResetAllFormatAttr(); - } - SwPaM* pPam = GetCursor(); const SwContentNode* pCNd = pPam->GetContentNode(); if( pCNd->IsTextNode() ) @@ -120,11 +115,9 @@ OUString SwEditShell::GetUniqueTableName() const return GetDoc()->GetUniqueTableName(); } -SwCharFormat* SwEditShell::MakeCharFormat( const OUString& rName, - SwCharFormat* pDerivedFrom ) +SwCharFormat* SwEditShell::MakeCharFormat( const OUString& rName ) { - if( !pDerivedFrom ) - pDerivedFrom = GetDoc()->GetDfltCharFormat(); + SwCharFormat* pDerivedFrom = GetDoc()->GetDfltCharFormat(); return GetDoc()->MakeCharFormat( rName, pDerivedFrom ); } @@ -150,9 +143,9 @@ bool SwEditShell::IsUsed( const SwModify& rModify ) const return mpDoc->IsUsed( rModify ); } -const SwFlyFrameFormat* SwEditShell::FindFlyByName( const OUString& rName, sal_uInt8 nNdTyp ) const +const SwFlyFrameFormat* SwEditShell::FindFlyByName( const OUString& rName ) const { - return mpDoc->FindFlyByName(rName, nNdTyp); + return mpDoc->FindFlyByName(rName); } SwCharFormat* SwEditShell::FindCharFormatByName( const OUString& rName ) const |