diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-05-27 10:39:45 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-05-28 08:47:12 +0200 |
| commit | 1d0447c2d1b2ce41edf2972b72ba1d59349ef62e (patch) | |
| tree | 7a715242ca337cdebd5917010b9568fe13e84c80 /svx | |
| parent | f9231916051b1760d0051c319945896c84257562 (diff) | |
Related bnc#822625: Cache minimum height for table cells.
Change-Id: I35e295347a046376289f5d4fd5468860d0b8f0ae
(cherry picked from commit 5792e76cb5beb630c135f57b74f57d74dd2dc2b0)
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/table/cell.cxx | 14 | ||||
| -rw-r--r-- | svx/source/table/cell.hxx | 1 |
2 files changed, 10 insertions, 5 deletions
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 3ab9b683006f..e0f85c2f5f77 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -359,6 +359,7 @@ Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) th , mbMerged( false ) , mnRowSpan( 1 ) , mnColSpan( 1 ) +, mnCachedMinHeight( -1 ) , mxTable( rTableObj.getTable() ) { if( rTableObj.GetModel() ) @@ -525,6 +526,7 @@ void Cell::setMerged() void Cell::notifyModified() { + mnCachedMinHeight = -1; if( mxTable.is() ) mxTable->setModified( sal_True ); } @@ -681,8 +683,10 @@ sal_Int32 Cell::getMinimumHeight() if( !mpProperties ) return 0; + if( mnCachedMinHeight != -1 ) + return mnCachedMinHeight; + SdrTableObj& rTableObj = dynamic_cast< SdrTableObj& >( GetObject() ); - sal_Int32 nMinimumHeight = 0; Rectangle aTextRect; TakeTextAnchorRect( aTextRect ); @@ -693,7 +697,7 @@ sal_Int32 Cell::getMinimumHeight() if(pEditOutliner) { pEditOutliner->SetMaxAutoPaperSize(aSize); - nMinimumHeight = pEditOutliner->GetTextHeight()+1; + mnCachedMinHeight = pEditOutliner->GetTextHeight()+1; } else /*if ( hasText() )*/ { @@ -706,12 +710,12 @@ sal_Int32 Cell::getMinimumHeight() { rOutliner.SetText(*GetOutlinerParaObject()); } - nMinimumHeight=rOutliner.GetTextHeight()+1; + mnCachedMinHeight=rOutliner.GetTextHeight()+1; rOutliner.Clear(); } - nMinimumHeight += GetTextUpperDistance() + GetTextLowerDistance(); - return nMinimumHeight; + mnCachedMinHeight += GetTextUpperDistance() + GetTextLowerDistance(); + return mnCachedMinHeight; } diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index c5a00788b1c4..2927a871afa8 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -226,6 +226,7 @@ private: bool mbMerged; ::sal_Int32 mnRowSpan; ::sal_Int32 mnColSpan; + ::sal_Int32 mnCachedMinHeight; Rectangle maCellRect; |