[Libreoffice-commits] .: Branch 'libreoffice-3-4-4' - filter/source

[Petr Mladek]

 filter/source/msfilter/svdfppt.cxx |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit a9eec7d971e04974de188e7fc64710428027528d
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date:   Tue Oct 25 19:49:34 2011 +0200

    Fix fdo#41245 : Auto fit text VIEWING too small in PPT
    
    Signed-off-by: Thorsten Behrens <tbehrens at suse.com>
    Signed-off-by: Jan Holesovsky <kendy at suse.cz>
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index b773a08..760e726 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) );
                 }