merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0575-svx-ppt-tablerow-height-fix.diff
blob34b0a0f9c0dc83976657ae33deebf78d6bc53f4b
1 Simpler fix for the table row height import bug
3 From: Thorsten Behrens <thb@openoffice.org>
6 ---
8 svx/source/table/cell.cxx | 2 +-
9 1 files changed, 1 insertions(+), 1 deletions(-)
12 diff --git svx/source/table/cell.cxx svx/source/table/cell.cxx
13 index 25cdf7c..86955d1 100644
14 --- svx/source/table/cell.cxx
15 +++ svx/source/table/cell.cxx
16 @@ -608,7 +608,7 @@ sal_Int32 Cell::getMinimumHeight()
17 pEditOutliner->SetMaxAutoPaperSize(aSize);
18 nMinimumHeight = pEditOutliner->GetTextHeight()+1;
20 - else /*if ( hasText() )*/
21 + else if( hasText() )
23 Outliner& rOutliner=rTableObj.ImpGetDrawOutliner();
24 rOutliner.SetPaperSize(aSize);