diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-05-27 10:39:45 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-06-01 14:03:05 +0200 |
| commit | 7121ec16634c4a6ce586b61869aceb40cc7375d4 (patch) | |
| tree | e8efd1688f0e9e1d01db4766a166ccee7d9cdac6 /svx/source | |
| parent | 545eb73fbfb4dde67ffd7988a450aef47f5b3375 (diff) | |
Related bnc#822625: Cache minimum height for table cells.
Change-Id: I35e295347a046376289f5d4fd5468860d0b8f0ae
(cherry picked from commit 5792e76cb5beb630c135f57b74f57d74dd2dc2b0)
Diffstat (limited to 'svx/source')
| -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 d4f199bf07e6..7e04db74f313 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -358,6 +358,7 @@ Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) th , mbMerged( sal_False ) , mnRowSpan( 1 ) , mnColSpan( 1 ) +, mnCachedMinHeight( -1 ) , mxTable( rTableObj.getTable() ) { if( rTableObj.GetModel() ) @@ -524,6 +525,7 @@ void Cell::setMerged() void Cell::notifyModified() { + mnCachedMinHeight = -1; if( mxTable.is() ) mxTable->setModified( sal_True ); } @@ -680,8 +682,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 ); @@ -692,7 +696,7 @@ sal_Int32 Cell::getMinimumHeight() if(pEditOutliner) { pEditOutliner->SetMaxAutoPaperSize(aSize); - nMinimumHeight = pEditOutliner->GetTextHeight()+1; + mnCachedMinHeight = pEditOutliner->GetTextHeight()+1; } else /*if ( hasText() )*/ { @@ -705,12 +709,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 1b26b1cf9a80..ba2c6f6ad862 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -222,6 +222,7 @@ private: ::sal_Bool mbMerged; ::sal_Int32 mnRowSpan; ::sal_Int32 mnColSpan; + ::sal_Int32 mnCachedMinHeight; Rectangle maCellRect; |