diff options
author | David Tardon <dtardon@redhat.com> | 2014-03-25 08:45:18 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-03-25 09:29:57 +0100 |
commit | 0a9cc5ce4d2d814587dba16ed8acc7eb38e347c8 (patch) | |
tree | 753c87c197dd778712437f6b9960f3c11217b1de /svx | |
parent | 1e188aa0043907c478989b3e863b2719af02d360 (diff) |
Revert "avoid infinite loop when setting vert. text dir."
The problem is already fixed by
33c310b6ff9feb277c001ce61db96864baedc3bc and
1a67b7cc3d5dc3dcd0de0e247f638c33d57dea1b .
This reverts commit 363119a9f2f0710a55530909330efb343d5a8bae.
Change-Id: Ieac14da9f37849cd51d14ed0035b3808b8dd77c0
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svdotext.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 32705458f282..8e89fb2b8e39 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1617,17 +1617,15 @@ void SdrTextObj::SetVerticalWriting(bool bVertical) case SDRTEXTHORZADJUST_BLOCK: aNewSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_BLOCK)); break; } + SetObjectItemSet(aNewSet); + pOutlinerParaObject = GetOutlinerParaObject(); if( pOutlinerParaObject ) { - // Set ParaObject orientation accordingly. This _must_ be - // done before applying the updated item set, otherwise we - // get stuck in a loop leading to eventual stack overflow. + // set ParaObject orientation accordingly pOutlinerParaObject->SetVertical(bVertical); } - SetObjectItemSet(aNewSet); - // restore object size SetSnapRect(aObjectRect); } |