[Libreoffice] [PATCH] Fixes fdo#41245

Hi,

This patch resolve issue fdo#41245, I checked the with some PPT files, it
seems to be good but I'm not sure.

Thanks in advance for reviewing

-- 
Arnaud Versini

From c5afa463c8f6d613bebf7b0c7290e8ca903edc4f Mon Sep 17 00:00:00 2001
From: Arnaud Versini <arnaud.versini@gmail.com>
Date: Tue, 25 Oct 2011 19:49:34 +0200
Subject: [PATCH] Fix fdo#41245 : Auto fit text VIEWING too small in PPT

---
 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 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) );
                 }
 
-- 
1.7.5.4