filter/source/msfilter/svdfppt.cxx | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 812aff65ad0661fed9687a429c763dc8f2144a0c
Author: Arnaud Versini <arnaud.vers...@gmail.com>
Date: Tue Oct 25 19:49:34 2011 +0200
Fix fdo#41245 : Auto fit text VIEWING too small in PPT
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index bb1e8b3..fc987b8 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1073,12 +1073,10 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt,
DffObjData& rObjData, voi
}
pTObj->SetMergedItem( SvxFrameDirectionItem( bVerticalText ?
FRMDIR_VERT_TOP_RIGHT : FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR ) );
- if (bAutoFit)
+ //Autofit text only if there is no auto grow height and width
+ //See fdo#41245
+ if (bAutoFit && !bAutoGrowHeight && !bAutoGrowWidth)
{
- // disable both, defeats purpose of autofit
- // otherwise
- bAutoGrowHeight = sal_False;
- bAutoGrowWidth = sal_False;
pTObj->SetMergedItem(
SdrTextFitToSizeTypeItem(SDRTEXTFIT_AUTOFIT) );
}
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
