diff options
| author | Arnaud Versini <arnaud.versini@gmail.com> | 2011-10-25 19:49:34 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2011-11-01 09:24:16 +0100 |
| commit | 14e76658d05343eaf8c7d9dd20402ee267cbd957 (patch) | |
| tree | f02d5c69ad8cd2e4b6619fed23de2323684b9f66 | |
| parent | a4108bd7dbd13bac424af2947ecab2d38128826a (diff) | |
Fix fdo#41245 : Auto fit text VIEWING too small in PPT
Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index b773a0882..760e726b7 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1088,12 +1088,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) ); } |