# HG changeset patch
# User Andre Heinecke <andre.heinecke@intevation.de>
# Date 1472207072 -7200
# Node ID 4d65e654abf75573077ee1a2eedecfe25b6e5c35
# Parent  797435c1bbebdec9580311a1728261b9362a8a49
Converter: Handle empty percent strings again

diff -r 797435c1bbeb -r 4d65e654abf7 src/converter.cpp
--- a/src/converter.cpp	Fri Aug 26 12:22:50 2016 +0200
+++ b/src/converter.cpp	Fri Aug 26 12:24:32 2016 +0200
@@ -230,7 +230,7 @@
                 bool ok;
                 QString percentStr = choiceMatch.captured("percent");
                 double percent;
-                if (percentStr.isNull()) {
+                if (percentStr.isEmpty()) {
                     percent = 0;
                     ok = true;
                 } else {
@@ -238,6 +238,9 @@
                 }
                 if (!ok) {
                     mErrors << "Unparsable number in string: " + choiceMatch.captured();
+                    percent = 0;
+                    percentStr = QString();
+                    /* PercentStr was not a number. */
                 }
                 makeBar(html, percent, doc);
                 xlsx.write(row, 2, percent == 0 ? QVariant() : percent);