diff options
| author | David Tardon <dtardon@redhat.com> | 2011-01-25 13:20:00 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-01-25 14:45:50 +0100 |
| commit | fb7934efa28b18d13d88d2df87f3cf1a3fb043b8 (patch) | |
| tree | 17baf373cdfff7646e2b82fa9be0f25af68b9175 /xmloff/source | |
| parent | 82d327237e9db22eb5b3e2253554c0bccb0bdac6 (diff) | |
check for exact pos. of the inner "-"
Diffstat (limited to 'xmloff/source')
| -rw-r--r-- | xmloff/source/draw/ximpcustomshape.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 74d75f2253a6..a17eef0f1aa3 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -317,6 +317,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter if ( bNumberRequired ) { sal_Int32 nStartIndex = nIndex; + sal_Int32 nEIndex = 0; // index of "E" in double sal_Bool bE = sal_False; // set if a double is including a "E" statement sal_Bool bDot = sal_False; // set if there is a dot included @@ -344,9 +345,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter if ( bMustBePositiveWholeNumbered ) bValid = sal_False; else - { - bValid = ( nStartIndex == nIndex ) || bE; - } + bValid = ( nStartIndex == nIndex ) || ( bE && ( nEIndex + 1 == nIndex ) ); } break; @@ -358,7 +357,10 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter else { if ( !bE ) + { bE = sal_True; + nEIndex = nIndex; + } else bEnd = sal_True; } |