summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorAndre Fischer <af@apache.org>2014-01-17 15:45:31 +0000
committerAndre Fischer <af@apache.org>2014-01-17 15:45:31 +0000
commitbb94c19d2c7df1c468d38b7744e0d34e8ac27a99 (patch)
treee85b2f8081776de241e1a861da715d51e5e74ac3 /svx
parent93ab293354bb322a7d57b7eaf21bcd2479453e87 (diff)
105491: Switched update of vertical flag and setting the item set to avoid infinite recursion.
Notes
Notes: merged as: 285d62c554956d44a66128f57952de492037ffde
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdoashp.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index a82c5cc27602..771f158a33fe 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2598,10 +2598,10 @@ void SdrObjCustomShape::SetVerticalWriting( sal_Bool bVertical )
case SDRTEXTHORZADJUST_BLOCK: aNewSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_BLOCK)); break;
}
- SetObjectItemSet( aNewSet );
pOutlinerParaObject = GetOutlinerParaObject();
if ( pOutlinerParaObject )
pOutlinerParaObject->SetVertical(bVertical);
+ SetObjectItemSet( aNewSet );
// restore object size
SetSnapRect(aObjectRect);