summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2012-11-21 12:55:14 +0000
committerArmin Le Grand <alg@apache.org>2012-11-21 12:55:14 +0000
commit7f5c944133e09208ae55a2846915b311554ac4a3 (patch)
tree32fa4fa28935e599df60f5fe23ed4e2fde5c22b3
parent202a345c32488dfc0ca6640f80dc2392a62911bc (diff)
Had to remove revision 1411685, looking for a better solution
Notes
Notes: ignore: reverted
-rw-r--r--svx/inc/svx/svdoashp.hxx3
-rw-r--r--svx/source/svdraw/svdoashp.cxx2
-rw-r--r--svx/source/unodraw/unoshap2.cxx7
3 files changed, 2 insertions, 10 deletions
diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index 06efa70552c1..13422b4834e6 100644
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -135,9 +135,6 @@ protected:
String aName;
public:
- bool bPurposeFlipX;
- bool bPurposeFlipY;
-
sal_Bool UseNoFillStyle() const;
sal_Bool IsMirroredX() const;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 6c42c3c91de4..95a640eb4d32 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -3299,13 +3299,11 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix,
if((bool)IsMirroredX() != bMirrorX)
{
SetMirroredX(bMirrorX);
- bPurposeFlipX = !bPurposeFlipX;
}
if((bool)IsMirroredY() != bMirrorY)
{
SetMirroredY(bMirrorY);
- bPurposeFlipY = !bPurposeFlipY;
}
}
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 17882c17608d..36144e6cc0d5 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -2098,7 +2098,6 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c
{
bMirroredX = ( ((SdrObjCustomShape*)pObject)->IsMirroredX() );
bMirroredY = ( ((SdrObjCustomShape*)pObject)->IsMirroredY() );
- ((SdrObjCustomShape*)pObject)->bPurposeFlipX = ((SdrObjCustomShape*)pObject)->bPurposeFlipY = false;
}
SvxShape::setPropertyValue( aPropertyName, aValue );
@@ -2127,8 +2126,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c
pObject->NbcMirror( aTop, aBottom );
// NbcMirroring is flipping the current mirror state,
// so we have to set the correct state again
- if(((SdrObjCustomShape*)pObject)->bPurposeFlipX)
- ((SdrObjCustomShape*)pObject)->SetMirroredX( bMirroredX ? sal_False : sal_True );
+ ((SdrObjCustomShape*)pObject)->SetMirroredX( bMirroredX ? sal_False : sal_True );
}
if ( bNeedsMirrorY )
{
@@ -2137,8 +2135,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c
pObject->NbcMirror( aLeft, aRight );
// NbcMirroring is flipping the current mirror state,
// so we have to set the correct state again
- if(((SdrObjCustomShape*)pObject)->bPurposeFlipY)
- ((SdrObjCustomShape*)pObject)->SetMirroredY( bMirroredY ? sal_False : sal_True );
+ ((SdrObjCustomShape*)pObject)->SetMirroredY( bMirroredY ? sal_False : sal_True );
}
if( pListCopy )