openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1412102 - in /incubator/ooo/trunk/main/svx: inc/svx/svdoashp.hxx source/svdraw/svdoashp.cxx source/unodraw/unoshap2.cxx
Date Wed, 21 Nov 2012 13:55:14 GMT
Author: alg
Date: Wed Nov 21 13:55:14 2012
New Revision: 1412102

URL: http://svn.apache.org/viewvc?rev=1412102&view=rev
Log:
Had to remove revision 1411685, looking for a better solution

Modified:
    incubator/ooo/trunk/main/svx/inc/svx/svdoashp.hxx
    incubator/ooo/trunk/main/svx/source/svdraw/svdoashp.cxx
    incubator/ooo/trunk/main/svx/source/unodraw/unoshap2.cxx

Modified: incubator/ooo/trunk/main/svx/inc/svx/svdoashp.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/inc/svx/svdoashp.hxx?rev=1412102&r1=1412101&r2=1412102&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/inc/svx/svdoashp.hxx (original)
+++ incubator/ooo/trunk/main/svx/inc/svx/svdoashp.hxx Wed Nov 21 13:55:14 2012
@@ -135,9 +135,6 @@ protected:
 	String		aName;
 
 public:
-    bool bPurposeFlipX;
-    bool bPurposeFlipY;
-
 	sal_Bool UseNoFillStyle() const;
 
 	sal_Bool IsMirroredX() const;

Modified: incubator/ooo/trunk/main/svx/source/svdraw/svdoashp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/svdraw/svdoashp.cxx?rev=1412102&r1=1412101&r2=1412102&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/svdraw/svdoashp.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/svdraw/svdoashp.cxx Wed Nov 21 13:55:14 2012
@@ -3299,13 +3299,11 @@ void SdrObjCustomShape::TRSetBaseGeometr
         if((bool)IsMirroredX() != bMirrorX)
         {
             SetMirroredX(bMirrorX);
-            bPurposeFlipX = !bPurposeFlipX;
         }
 
         if((bool)IsMirroredY() != bMirrorY)
         {
             SetMirroredY(bMirrorY);
-            bPurposeFlipY = !bPurposeFlipY;
         }
     }
 

Modified: incubator/ooo/trunk/main/svx/source/unodraw/unoshap2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/unodraw/unoshap2.cxx?rev=1412102&r1=1412101&r2=1412102&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/unodraw/unoshap2.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/unodraw/unoshap2.cxx Wed Nov 21 13:55:14 2012
@@ -2098,7 +2098,6 @@ void SAL_CALL SvxCustomShape::setPropert
 	{
 		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::setPropert
 			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::setPropert
 			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 )



Mime
View raw message