diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2014-09-21 16:40:50 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2014-10-02 16:19:36 +0200 |
| commit | baa06b23845cd266e2b9d456ce08b7c0b67ec00f (patch) | |
| tree | 7ff37ebe65de926b23191f3b3751d092e2dac9c2 | |
| parent | 3c6f3290955cfaeaff4d1e38cb1b9d125eac4d61 (diff) | |
fix typo
Change-Id: I08eff921ab2de64e5734807963c542818456dd8e
| -rw-r--r-- | sw/source/core/inc/frmtool.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/frmtool.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/tabfrm.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index 1fdaee5a32aa..8df9df179ac7 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -120,7 +120,7 @@ extern bool bSetCompletePaintOnInvalidate; // for table settings via keyboard long CalcRowRstHeight( SwLayoutFrm *pRow ); -long CalcHeightWidthFlys( const SwFrm *pFrm ); +long CalcHeightWithFlys( const SwFrm *pFrm ); SwPageFrm *InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper, bool bOdd, bool bFirst, bool bInsertEmpty, bool bFtn, diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index ceacf4a17121..76a06b783396 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -3137,7 +3137,7 @@ static SwTwips lcl_CalcCellRstHeight( SwLayoutFrm *pCell ) else if( pLow->IsSctFrm() && ((SwSectionFrm*)pLow)->IsUndersized() ) nLow += ((SwSectionFrm*)pLow)->Undersize(); nFlyAdd = std::max( 0L, nFlyAdd - nLow ); - nFlyAdd = std::max( nFlyAdd, ::CalcHeightWidthFlys( pLow ) ); + nFlyAdd = std::max( nFlyAdd, ::CalcHeightWithFlys( pLow ) ); nHeight += nLow; pLow = pLow->GetNext(); } while ( pLow ); diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index a946293af21c..5ca1929904a6 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -3577,7 +3577,7 @@ void SwRowFrm::MakeAll() SwLayoutFrm::MakeAll(); } -long CalcHeightWidthFlys( const SwFrm *pFrm ) +long CalcHeightWithFlys( const SwFrm *pFrm ) { SWRECTFN( pFrm ) long nHeight = 0; @@ -3739,7 +3739,7 @@ static SwTwips lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell, if ( _bConsiderObjs ) { nFlyAdd = std::max( 0L, nFlyAdd - nLowHeight ); - nFlyAdd = std::max( nFlyAdd, ::CalcHeightWidthFlys( pLow ) ); + nFlyAdd = std::max( nFlyAdd, ::CalcHeightWithFlys( pLow ) ); } } |