summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorAndre Fischer <af@apache.org>2014-01-17 15:45:31 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-01-17 17:11:16 +0000
commit285d62c554956d44a66128f57952de492037ffde (patch)
tree659688dd839de0473d6e7cc9064fa867f36ae3ed /svx
parent75934fc178ed90b56d77eb1efebed5bdac8427b6 (diff)
105491: Switched update of vertical flag and setting the item set to avoid infinite recursion.
(cherry picked from commit bb94c19d2c7df1c468d38b7744e0d34e8ac27a99)
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 783f0463e304..7e213b7e91b4 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2298,10 +2298,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);