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

[Tor Lillqvist]

 patches/dev300/selection-crash-svx-svdmrkv.diff         |    4 ++--
 patches/dev300/svx-honour-customshape-capabilities.diff |   13 ++-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

New commits:
commit 804aff07aad962d201d2aa5e3d51da554eb01ce2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Apr 13 10:58:25 2011 +0300

    Change ULONG to sal_uIntPtr, ugh... but that is what the surrounding code uses

diff --git a/patches/dev300/selection-crash-svx-svdmrkv.diff b/patches/dev300/selection-crash-svx-svdmrkv.diff
index 5f112ac..f8488cc 100644
--- a/patches/dev300/selection-crash-svx-svdmrkv.diff
+++ b/patches/dev300/selection-crash-svx-svdmrkv.diff
@@ -5,8 +5,8 @@
      SortMarkedObjects();
      bMrkPntDirty=sal_True;
 +    //remove empty maked SdrObject
-+    ULONG nMarkAnz=GetMarkedObjectCount();
-+    for (ULONG nMarkNum=nMarkAnz; nMarkNum>0;)
++    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
++    for (sal_uIntPtr nMarkNum=nMarkAnz; nMarkNum>0;)
 +    {
 +        nMarkNum--;
 +        SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
commit 1b47da15dbc5e03893601256bb57db6b4c21576b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Apr 13 10:55:32 2011 +0300

    Change FALSE to sal_False

diff --git a/patches/dev300/svx-honour-customshape-capabilities.diff b/patches/dev300/svx-honour-customshape-capabilities.diff
index a9e9df4..6d6a148 100644
--- a/patches/dev300/svx-honour-customshape-capabilities.diff
+++ b/patches/dev300/svx-honour-customshape-capabilities.diff
@@ -1,9 +1,3 @@
----
- svx/source/svdraw/svdoashp.cxx |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git svx/source/svdraw/svdoashp.cxx svx/source/svdraw/svdoashp.cxx
-index 6beb3db..82066f9 100644
 --- svx/source/svdraw/svdoashp.cxx
 +++ svx/source/svdraw/svdoashp.cxx
 @@ -1669,6 +1669,11 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
@@ -12,12 +6,9 @@ index 6beb3db..82066f9 100644
                  }
 +
 +                if( !rInfo.bShearAllowed )
-+                    rInfo.bShearAllowed=FALSE;
++                    rInfo.bShearAllowed=sal_False;
 +                if( !aInfo.bEdgeRadiusAllowed )
-+                    rInfo.bEdgeRadiusAllowed=FALSE;
++                    rInfo.bEdgeRadiusAllowed=sal_False;
              }
          }
      }
--- 
-1.7.0.1
-