diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-10-13 18:20:26 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-10-13 18:20:26 +0000 |
| commit | 8e30821fa53134256a47dc977e607b1949eeec33 (patch) | |
| tree | d51ef233932502ef56d563ac8497483878691628 /src/preferences.cpp | |
| parent | Update to trunk (diff) | |
| parent | we don't have nondocked dialogs, so rewrite restoring dialogs on startup via ... (diff) | |
| download | inkscape-8e30821fa53134256a47dc977e607b1949eeec33.tar.gz inkscape-8e30821fa53134256a47dc977e607b1949eeec33.zip | |
Update to trunk
(bzr r11950.1.181)
Diffstat (limited to 'src/preferences.cpp')
| -rw-r--r-- | src/preferences.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/preferences.cpp b/src/preferences.cpp index 0dc6f1ec4..0dcebbb90 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -785,9 +785,8 @@ double Preferences::_extractDouble(Entry const &v, Glib::ustring const &requeste if (unit.length() == 0) { // no unit specified, don't do conversion return val; - } else { - return val * (unit_table.getUnit(unit).factor / unit_table.getUnit(requested_unit).factor); } + return val * (unit_table.getUnit(unit)->factor / unit_table.getUnit(requested_unit)->factor); /// \todo rewrite using Quantity class, so the standard code handles unit conversion } Glib::ustring Preferences::_extractString(Entry const &v) |