[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                                    |    2 --
 patches/dev300/svx-honour-customshape-capabilities.diff |   14 --------------
 2 files changed, 16 deletions(-)

New commits:
commit bfdee21e18fdd3b540fd51897592ef75356c5204
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 22 17:35:46 2011 +0200

    pushed svx-honour-customshape-capabilities.diff into git (bnc#395372)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ca9dc3e..6f2d661 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -166,8 +166,6 @@ speed-sal-fewer-lstats.diff, i#89730, jholesov
 #FIXME src680: font_list_box_cjk.diff, i#73003, Fong Lin
 
 [ Fixes ]
-svx-honour-customshape-capabilities.diff, n#395372, thorsten
-
 # Fix for n#113235
 wizards-source-importwizard-filesmodul-xba.diff, i#56633, noelpwer
 
diff --git a/patches/dev300/svx-honour-customshape-capabilities.diff b/patches/dev300/svx-honour-customshape-capabilities.diff
deleted file mode 100644
index 6d6a148..0000000
--- a/patches/dev300/svx-honour-customshape-capabilities.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- svx/source/svdraw/svdoashp.cxx
-+++ svx/source/svdraw/svdoashp.cxx
-@@ -1669,6 +1669,11 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
-                 {
-                     rInfo.bCanConvToContour = aInfo.bCanConvToContour;
-                 }
-+
-+                if( !rInfo.bShearAllowed )
-+                    rInfo.bShearAllowed=sal_False;
-+                if( !aInfo.bEdgeRadiusAllowed )
-+                    rInfo.bEdgeRadiusAllowed=sal_False;
-             }
-         }
-     }