diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-09-30 23:49:43 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-09-30 23:49:43 +0000 |
| commit | dfe4295847a74b7bbded4bca6693b862c002e7e5 (patch) | |
| tree | 7b7c37fa4d286eb837ccc04593f4c133943e2f23 /src/extension/internal/svg.cpp | |
| parent | Revert "c++11 refactor: std::auto_ptr -> std::unique_ptr" (diff) | |
| download | inkscape-dfe4295847a74b7bbded4bca6693b862c002e7e5.tar.gz inkscape-dfe4295847a74b7bbded4bca6693b862c002e7e5.zip | |
Improve calls to document_units
Diffstat (limited to 'src/extension/internal/svg.cpp')
| -rw-r--r-- | src/extension/internal/svg.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp index d392d6bf0..8a5db2005 100644 --- a/src/extension/internal/svg.cpp +++ b/src/extension/internal/svg.cpp @@ -39,7 +39,6 @@ #include "xml/attribute-record.h" #include "xml/simple-document.h" -#include "object/sp-namedview.h" #include "object/sp-image.h" #include "object/sp-root.h" #include "util/units.h" @@ -225,11 +224,7 @@ Svg::open (Inkscape::Extension::Input *mod, const gchar *uri) if (prefs->getBool("/options/onimport", false) && import_mode_svg.compare("include") != 0) { bool embed = ( import_mode_svg.compare( "embed" ) == 0 ); SPDocument * ret = SPDocument::createNewDoc(uri, TRUE); - SPNamedView *nv = sp_document_namedview(doc, nullptr); - Glib::ustring display_unit = nv->display_units->abbr; - if (display_unit.empty()) { - display_unit = "px"; - } + Glib::ustring display_unit = doc->getDisplayUnit()->abbr.c_str(); double width = ret->getWidth().value(display_unit); double height = ret->getHeight().value(display_unit); // Create image node |