[Libreoffice-commits] core.git: xmloff/source

[Armin Le Grand]

 xmloff/source/draw/ximpcustomshape.cxx |   21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

New commits:
commit b2a12a87963b3404af71d9afaf70271010c11c6d
Author: Armin Le Grand <alg at apache.org>
Date:   Wed May 29 13:10:27 2013 +0000

    Resolves: #i121507# Added comma to whitespace list
    
    (cherry picked from commit c9e446d6f79908ed4af06e7940788e91b924b793)
    
    Change-Id: I790bfada597e276f9f9e1d07f7208db6d1059f0f

diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 5dd0f00..64ac91b 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -418,9 +418,24 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter
         }
     }
     if ( bValid )
-    {   // skipping white spaces
-        while( ( nIndex < rParaString.getLength() ) && rParaString[ nIndex ] == (sal_Unicode)' ' )
-            nIndex++;
+    {
+        // skipping white spaces and commas (#i121507#)
+        const sal_Unicode aSpace(sal_Unicode(' '));
+        const sal_Unicode aCommata(sal_Unicode(','));
+
+        while(nIndex < rParaString.getLength())
+        {
+            const sal_Unicode aCandidate(rParaString[nIndex]);
+
+            if(aSpace == aCandidate || aCommata == aCandidate)
+            {
+                nIndex++;
+            }
+            else
+            {
+                break;
+            }
+        }
     }
     return bValid;
 }