diff options
author | Armin Le Grand <alg@apache.org> | 2013-05-29 13:10:27 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-30 14:47:07 +0100 |
commit | b2a12a87963b3404af71d9afaf70271010c11c6d (patch) | |
tree | aa74c8063e791efb7c437364060cd1ea4e4a76d8 /xmloff | |
parent | Resolves: #i122380# Use quick help text as accessible name... (diff) | |
download | core-b2a12a87963b3404af71d9afaf70271010c11c6d.tar.gz core-b2a12a87963b3404af71d9afaf70271010c11c6d.zip |
Resolves: #i121507# Added comma to whitespace list
(cherry picked from commit c9e446d6f79908ed4af06e7940788e91b924b793)
Change-Id: I790bfada597e276f9f9e1d07f7208db6d1059f0f
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/draw/ximpcustomshape.cxx | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 5dd0f00ef5e9..64ac91b9c881 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; } |