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

[Lionel Elie Mamane]

 reportdesign/source/ui/inspection/GeometryHandler.cxx |    2 +-
 vcl/source/fontsubset/sft.cxx                         |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 24262b7cfe6607576a38e661553b56596d6164b4
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Feb 26 12:13:41 2013 +0100

    Don't abort when myPoints is empty
    
    Change-Id: I6bbb2a1cce1c89b94d027acf94fd712706bff422

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 3e41baf..e110c12 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -752,7 +752,8 @@ static int GetCompoundTTOutline(TrueTypeFont *ttf, sal_uInt32 glyphID, ControlPo
     pa = (ControlPoint*)calloc(np, sizeof(ControlPoint));
     assert(pa != 0);
 
-    memcpy( pa, &myPoints[0], np*sizeof(ControlPoint) );
+    if (np > 0)
+        memcpy( pa, &myPoints[0], np*sizeof(ControlPoint) );
 
     *pointArray = pa;
     return np;
commit 62061df8964692c4fd14b4b5fd28b1490820c177
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Feb 22 16:30:03 2013 +0100

    Compare strings with proper length
    
    Change-Id: If88f79a7f63edb254ad5356e9a0fccc5573af106

diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 90d10be..97b946b 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1431,7 +1431,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
     }
     else if (      PropertyName.equalsAsciiL(PROPERTY_FORMULA.ascii, PROPERTY_FORMULA.length)
                 || PropertyName.equalsAsciiL(PROPERTY_INITIALFORMULA.ascii, PROPERTY_INITIALFORMULA.length)
-                || PropertyName.equalsAsciiL(PROPERTY_DATAFIELD.ascii, PROPERTY_INITIALFORMULA.length)
+                || PropertyName.equalsAsciiL(PROPERTY_DATAFIELD.ascii, PROPERTY_DATAFIELD.length)
                 || PropertyName.equalsAsciiL(PROPERTY_CONDITIONALPRINTEXPRESSION.ascii, PROPERTY_CONDITIONALPRINTEXPRESSION.length))
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );