diff options
| author | Joachim Lingner <jl@openoffice.org> | 2010-06-07 10:13:44 +0200 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2010-06-07 10:13:44 +0200 |
| commit | 4edc7f8eac625e30719fec69bd9b26dd9356657c (patch) | |
| tree | eb75be1da94db899a53afb6ed788e017bd783b41 /svx/source/svdraw/svdoashp.cxx | |
| parent | 88581862df4e46ee0f6515267ffeb46a53d1ba53 (diff) | |
| parent | f8e7afbac976ca862a801b9648fd95b2107757b2 (diff) | |
jl152 merge with DEV300_m80
Diffstat (limited to 'svx/source/svdraw/svdoashp.cxx')
| -rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 58e0b7bdb425..6ab27c85aaf0 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -700,7 +700,10 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) for ( i = 0; i < nCount; i++ ) { if ( seqAdjustmentValues[ i ].State != com::sun::star::beans::PropertyState_DIRECT_VALUE ) + { seqAdjustmentValues[ i ].Value <<= pDefData[ i ]; + seqAdjustmentValues[ i ].State = com::sun::star::beans::PropertyState_DIRECT_VALUE; + } } } aPropVal.Name = sAdjustmentValues; @@ -2075,7 +2078,7 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded() sal_Int32 nXDiff = aBoundRect.Left() - aRect.Left(); sal_Int32 nYDiff = aBoundRect.Top() - aRect.Top(); - if (nShearWink&&(bMirroredX&&!bMirroredY)||(bMirroredY&&!bMirroredX)) + if (nShearWink&&((bMirroredX&&!bMirroredY)||(bMirroredY&&!bMirroredX))) { nShearWink = -nShearWink; fTan = -fTan; |