summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2011-01-25 13:20:00 +0100
committerDavid Tardon <dtardon@redhat.com>2011-01-25 14:45:50 +0100
commit6173c9154f2ed642f0bec2b68b9d303ac6b54662 (patch)
tree4e4de4161f7325aeecf208d6002af8953afcf934
parent8e20cb9937a16d49b36b6557d483d2de84e78cf8 (diff)
check for exact pos. of the inner "-"
-rw-r--r--xmloff/source/draw/ximpcustomshape.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index e9365f614e..d85cb49545 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;
}