ooo-build r13356 - in trunk: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Tue Jul 22 21:32:09 2008
New Revision: 13356
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13356&view=rev

Log:
	* patches/dev300/apply:
	* patches/dev300/svx-honour-customshape-capabilities.diff:
	delegate decision about which UI interactions are possible to the
	custom shape sub-shapes.



Added:
   trunk/patches/dev300/svx-honour-customshape-capabilities.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jul 22 21:32:09 2008
@@ -452,6 +452,7 @@
 # use basic (advanced) shapes for rectangle/ellipse on draw/impress's toolbars. make shapes wrap words by default, n#171052, rodo
 sd-toolbar-advanced-shapes.diff, n#171052, rodo
 svx-shapes-default-word-wrap-enable.diff, n#171052, rodo
+svx-honour-customshape-capabilities.diff, n#395372, thorsten
 
 # fix check box rendering issue - n#80447
 check-buttons-rendering-fix.diff, michael

Added: trunk/patches/dev300/svx-honour-customshape-capabilities.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/svx-honour-customshape-capabilities.diff	Tue Jul 22 21:32:09 2008
@@ -0,0 +1,25 @@
+--- svx/source/svdraw/svdoashp.orig	2008-07-22 23:22:38.000000000 +0200
++++ svx/source/svdraw/svdoashp.cxx	2008-07-22 23:25:49.000000000 +0200
+@@ -1660,8 +1660,8 @@
+ 	rInfo.bMirror90Allowed  =TRUE;
+ 	rInfo.bTransparenceAllowed = FALSE;
+ 	rInfo.bGradientAllowed = FALSE;
+-	rInfo.bShearAllowed     =FALSE;
+-	rInfo.bEdgeRadiusAllowed=FALSE;
++	rInfo.bShearAllowed     =TRUE;
++	rInfo.bEdgeRadiusAllowed=TRUE;
+ 	rInfo.bNoContortion     =TRUE;
+ 
+ 	// #i37011#
+@@ -1698,6 +1698,11 @@
+ 				{
+ 					rInfo.bCanConvToContour = aInfo.bCanConvToContour;
+ 				}
++
++                if( !rInfo.bShearAllowed )
++                    rInfo.bShearAllowed=FALSE;
++                if( !aInfo.bEdgeRadiusAllowed )
++                    rInfo.bEdgeRadiusAllowed=FALSE;
+ 			}
+ 		}
+ 	}