diff options
Diffstat (limited to 'svx/source/table/cell.cxx')
-rw-r--r-- | svx/source/table/cell.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 6b0fc19e78dd..0407bbe6b163 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -359,7 +359,6 @@ Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) th , mbMerged( false ) , mnRowSpan( 1 ) , mnColSpan( 1 ) -, mnCachedMinHeight( -1 ) , mxTable( rTableObj.getTable() ) { if( rTableObj.GetModel() ) @@ -526,7 +525,6 @@ void Cell::setMerged() void Cell::notifyModified() { - mnCachedMinHeight = -1; if( mxTable.is() ) mxTable->setModified( sal_True ); } @@ -683,10 +681,8 @@ 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 ); @@ -697,7 +693,7 @@ sal_Int32 Cell::getMinimumHeight() if(pEditOutliner) { pEditOutliner->SetMaxAutoPaperSize(aSize); - mnCachedMinHeight = pEditOutliner->GetTextHeight()+1; + nMinimumHeight = pEditOutliner->GetTextHeight()+1; } else /*if ( hasText() )*/ { @@ -710,12 +706,12 @@ sal_Int32 Cell::getMinimumHeight() { rOutliner.SetText(*GetOutlinerParaObject()); } - mnCachedMinHeight=rOutliner.GetTextHeight()+1; + nMinimumHeight=rOutliner.GetTextHeight()+1; rOutliner.Clear(); } - mnCachedMinHeight += GetTextUpperDistance() + GetTextLowerDistance(); - return mnCachedMinHeight; + nMinimumHeight += GetTextUpperDistance() + GetTextLowerDistance(); + return nMinimumHeight; } |