summaryrefslogtreecommitdiff
path: root/chart2/source
diff options
context:
space:
mode:
authorJean-Tiare Le Bigot <admin@jtlebi.fr>2016-10-18 23:36:51 +0200
committerjan iversen <jani@documentfoundation.org>2016-10-22 17:34:28 +0000
commit27a4fb657fad157d26d07934ecd0cce578a99f38 (patch)
treee436190449cec7f6cb95286e7a552dcf0cec3646 /chart2/source
parent010ffbf7ddab8c0592a8ed5d71a16bc1fe28a678 (diff)
chart2: fix unserialization of empty cells
Change-Id: Ib7e5c8c4db6cac7ef1255246eea13325cf7cca69 Reviewed-on: https://gerrit.libreoffice.org/30030 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
Diffstat (limited to 'chart2/source')
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx11
1 files changed, 2 insertions, 9 deletions
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 32dd3c715ab2..7bcb65f0e997 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -533,10 +533,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co
{
// Opening quote.
bAllNumeric = false;
- ++p;
- if (p == pEnd)
- break;
- pElem = p;
+ pElem = nullptr;
}
else
{
@@ -552,11 +549,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co
break;
}
}
- else if (bInQuote)
- {
- // Do nothing.
- }
- else if (*p == ';')
+ else if (*p == ';' and !bInQuote)
{
// element separator.
if (pElem)