diff options
author | Armin Le Grand <alg@apache.org> | 2012-10-05 13:02:31 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-19 20:07:34 +0100 |
commit | acccf7a13fd0f87e5aecdc7d5412726a76dba275 (patch) | |
tree | 6149cce866e804fcff36c8442f40f5a814ef30e8 | |
parent | 38d02291f32d0f605a4046a96fd6c90abd935f6b (diff) |
Resolves: #i119885# corrected AutoGrowHeight setting...
when importing PPT text boxes
(cherry picked from commit 887c740e39ec1d00366228aae49ef62087a6feb2)
Change-Id: I27e6cd8c0d1f1a34fe0c17529451641e1de9953c
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 8b7ea081be6e..f69d0dca885c 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1045,13 +1045,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 ) ); |