[Libreoffice-commits] core.git: 2 commits - svx/source

[Radek Doulik]

 svx/source/svdraw/svdoashp.cxx |    5 -----
 svx/source/svdraw/svdorect.cxx |    2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 9d073bcba10b9cbcd56ad58cf5b19bbb129567a8
Author: Radek Doulik <rodo at novell.com>
Date:   Fri Apr 5 14:45:18 2013 +0200

    revert that change and to it at custom shapes level
    
    to allow primitive rectangles still be used
    
    Revert "disable round corners for rectangle shape. fixes fdo#39907"
    
    This reverts commit 0c7bbbe9da7602f5d72aecd481f6d26d9af217f0.

diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 2e0feac..a60894e 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -184,7 +184,7 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
 
     rInfo.bShearAllowed     =bNoTextFrame;
-    rInfo.bEdgeRadiusAllowed=sal_False;
+    rInfo.bEdgeRadiusAllowed=sal_True;
 
     bool bCanConv=!HasText() || ImpCanConvTextToCurve();
     if (bCanConv && !bNoTextFrame && !HasText()) {
commit e59a5cad25a93e190957120dc7b42fe9c34a13e1
Author: Radek Doulik <rodo at novell.com>
Date:   Fri Apr 5 14:43:55 2013 +0200

    do not allow bEdgeRadiusAllowed to be set to true
    
      - as it cannot be exported to ODF
      - fixes fdo#39907
    
    Change-Id: Ic5d3f60d588698e48da600bd13df9e1e4fae17cd

diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 7bc80fd..fe89dae 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1409,11 +1409,6 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
                 {
                     rInfo.bShearAllowed = aInfo.bShearAllowed;
                 }
-
-                if(rInfo.bEdgeRadiusAllowed != aInfo.bEdgeRadiusAllowed)
-                {
-                    rInfo.bEdgeRadiusAllowed = aInfo.bEdgeRadiusAllowed;
-                }
             }
         }
     }