[Libreoffice-commits] .: Branch 'libreoffice-3-4' - svx/source

[Petr Mladek]

 svx/source/svdraw/svdoashp.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 9a74979cafb52b6bd024a5bf8e14c99c1d6703b7
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 22 17:33:22 2011 +0200

    svx-honour-customshape-capabilities.diff (bnc#395372)
    
    this bug started to be visible after enabling wordwrap
    in shapes (bnc#171052)

diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 5fdd50c..9e7ab56 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1668,6 +1668,16 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
                 {
                     rInfo.bCanConvToContour = aInfo.bCanConvToContour;
                 }
+
+                if(rInfo.bShearAllowed != aInfo.bShearAllowed)
+                {
+                    rInfo.bShearAllowed = aInfo.bShearAllowed;
+                }
+
+                if(rInfo.bEdgeRadiusAllowed != aInfo.bEdgeRadiusAllowed)
+                {
+                    rInfo.bEdgeRadiusAllowed = aInfo.bEdgeRadiusAllowed;
+                }
             }
         }
     }