Kaydet (Commit) acccf7a1 authored tarafından Armin Le Grand's avatar Armin Le Grand Kaydeden (comit) Caolán McNamara

Resolves: #i119885# corrected AutoGrowHeight setting...

when importing PPT text boxes

(cherry picked from commit 887c740e)

Change-Id: I27e6cd8c0d1f1a34fe0c17529451641e1de9953c
üst 38d02291
...@@ -1045,13 +1045,17 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi ...@@ -1045,13 +1045,17 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
} }
if ( bVerticalText ) if ( bVerticalText )
{ {
bAutoGrowWidth = bFitShapeToText; // bFitShapeToText; can't be used, because we cut the text if it is too height, bAutoGrowWidth = bFitShapeToText;
bAutoGrowHeight = sal_False; bAutoGrowHeight = sal_False;
} }
else else
{ {
bAutoGrowWidth = sal_False; 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 ) ); pTObj->SetMergedItem( SvxFrameDirectionItem( bVerticalText ? FRMDIR_VERT_TOP_RIGHT : FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment