summaryrefslogtreecommitdiffstats
path: root/src/util/units.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-08-17 14:58:39 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-08-17 14:58:39 +0000
commit2286e96fb2d97298adf9920902babc522dc80b66 (patch)
tree35063233ff3676c4df7def81bf7a7adc4b235eef /src/util/units.cpp
parentClone Original -> Fill Between Many (diff)
parentUpdate to trunk r13525 (diff)
downloadinkscape-2286e96fb2d97298adf9920902babc522dc80b66.tar.gz
inkscape-2286e96fb2d97298adf9920902babc522dc80b66.zip
Update to experimental r13483
(bzr r13090.1.105)
Diffstat (limited to 'src/util/units.cpp')
-rw-r--r--src/util/units.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/util/units.cpp b/src/util/units.cpp
index d2053f60b..eb4a313e0 100644
--- a/src/util/units.cpp
+++ b/src/util/units.cpp
@@ -291,11 +291,15 @@ Quantity UnitTable::parseQuantity(Glib::ustring const &q) const
std::istringstream tmp_v(match_info.fetch(0));
tmp_v >> value;
}
+ int start_pos, end_pos;
+ match_info.fetch_pos(0, end_pos, start_pos);
+ end_pos = q.size() - start_pos;
+ Glib::ustring u = q.substr(start_pos, end_pos);
// Extract unit abbreviation
Glib::ustring abbr;
Glib::RefPtr<Glib::Regex> unit_regex = Glib::Regex::create("[A-z%]+");
- if (unit_regex->match(q, match_info)) {
+ if (unit_regex->match(u, match_info)) {
abbr = match_info.fetch(0);
}