commit 887c740e39ec1d00366228aae49ef62087a6feb2
author Armin Le Grand <alg@apache.org> Fri Oct 05 13:02:31 2012 +0000
committer Armin Le Grand <alg@apache.org> Fri Oct 05 13:02:31 2012 +0000
tree f9d6946e96472d597b9f6a6584169356d7ffa888
parent 1f0b83f0e62094257a1c69ff18969f07422772dc

#119885# corrected AutoGrowHeight setting when importing PPT text boxes

filter/source/msfilter/svdfppt.cxx

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index dc7997e..4386e12 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1170,13 +1170,17 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
                    }
                    if ( bVerticalText )
                    {
                        bAutoGrowWidth = bFitShapeToText;   // bFitShapeToText; can't be used, because we cut the text if it is too height,
                        bAutoGrowWidth = bFitShapeToText;
                        bAutoGrowHeight = sal_False;
                    }
                    else
                    {
                        bAutoGrowWidth = sal_False;
                        bAutoGrowHeight = sal_True;         // bFitShapeToText; can't be used, because we cut the text if it is too height,

                        // #119885# re-activationg bFitShapeToText here, could not find deeper explanations
                        // for it (it was from 2005). Keeping the old commeht here for reference
                        // old comment: // bFitShapeToText; can't be used, because we cut the text if it is too height,
                        bAutoGrowHeight = bFitShapeToText;
                    }
                }
                pTObj->SetMergedItem( SvxFrameDirectionItem( bVerticalText ? FRMDIR_VERT_TOP_RIGHT : FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR ) );