diff options
| author | sj <sj@openoffice.org> | 2010-02-25 16:02:38 +0100 |
|---|---|---|
| committer | sj <sj@openoffice.org> | 2010-02-25 16:02:38 +0100 |
| commit | f3a5d49d085e66b64b2b4b6205c035c4680159b6 (patch) | |
| tree | 250a796aaba7d6d772b502ae359f37625d9e072b | |
| parent | 3c550e9f7bdd8c9f1f75f4148f516ddc94290f92 (diff) | |
impress188: #i108608# applied patch (fixed ambiguousness)
| -rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 85ca4c4ff09a..63f302ecb0f9 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -1674,11 +1674,11 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const } } -void SdrObjCustomShape::SetModel(SdrModel* pNewModel)
-{
- SdrTextObj::SetModel(pNewModel);
- mXRenderedCustomShape.clear();
-}
+void SdrObjCustomShape::SetModel(SdrModel* pNewModel) +{ + SdrTextObj::SetModel(pNewModel); + mXRenderedCustomShape.clear(); +} UINT16 SdrObjCustomShape::GetObjIdentifier() const { @@ -2078,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; |