diff options
| author | Matthew Petroff <matthew@mpetroff.net> | 2013-09-01 17:34:44 +0000 |
|---|---|---|
| committer | Matthew Petroff <matthew@mpetroff.net> | 2013-09-01 17:34:44 +0000 |
| commit | 1f3abbeb859b4a4c83a7822b39ce36eb39b7a3dd (patch) | |
| tree | e68ccf09e7383d472a562569bd6b682fb58d8e0c /src/util/units.cpp | |
| parent | Fix compilation warnings in libuemf (diff) | |
| download | inkscape-1f3abbeb859b4a4c83a7822b39ce36eb39b7a3dd.tar.gz inkscape-1f3abbeb859b4a4c83a7822b39ce36eb39b7a3dd.zip | |
Fix grids with comma as decimal separator [Bug #1216306].
Fixed bugs:
- https://launchpad.net/bugs/1216306
(bzr r12498)
Diffstat (limited to 'src/util/units.cpp')
| -rw-r--r-- | src/util/units.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/util/units.cpp b/src/util/units.cpp index 7bc910fcc..3fdd77916 100644 --- a/src/util/units.cpp +++ b/src/util/units.cpp @@ -227,9 +227,10 @@ Quantity UnitTable::getQuantity(Glib::ustring const& q) const // Extract value double value = 0; - Glib::RefPtr<Glib::Regex> value_regex = Glib::Regex::create("[-+]*[\\d+]*\\.*[\\d+]*[eE]*[-+]*\\d+"); + Glib::RefPtr<Glib::Regex> value_regex = Glib::Regex::create("[-+]*[\\d+]*[\\.,]*[\\d+]*[eE]*[-+]*\\d+"); if (value_regex->match(q, match_info)) { - value = atof(match_info.fetch(0).c_str()); + std::istringstream tmp_v(match_info.fetch(0)); + tmp_v >> value; } // Extract unit abbreviation |