diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2016-06-08 08:35:36 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2016-06-08 08:35:36 +0000 |
| commit | 2120743f09f27892a714a6cfdc162a59a4ad0f0a (patch) | |
| tree | 16c50fb8c5f56cd2115be6547930efa45d8fce70 /src | |
| parent | Store rest of string in Inkscape version ('pre' 'devel'). (diff) | |
| download | inkscape-2120743f09f27892a714a6cfdc162a59a4ad0f0a.tar.gz inkscape-2120743f09f27892a714a6cfdc162a59a4ad0f0a.zip | |
Remove unused svg-units variable.
(bzr r14963)
Diffstat (limited to 'src')
| -rw-r--r-- | src/sp-namedview.cpp | 36 | ||||
| -rw-r--r-- | src/sp-namedview.h | 1 |
2 files changed, 18 insertions, 19 deletions
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index 06e068c42..850163720 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -59,25 +59,25 @@ static gboolean sp_str_to_bool(const gchar *str); static gboolean sp_nv_read_opacity(const gchar *str, guint32 *color); SPNamedView::SPNamedView() : SPObjectGroup(), snap_manager(this) { - this->zoom = 0; - this->guidecolor = 0; - this->guidehicolor = 0; - this->views.clear(); - this->borderlayer = 0; - this->page_size_units = NULL; - this->window_x = 0; - this->cy = 0; - this->window_y = 0; - this->svg_units = unit_table.getUnit("px"); // legacy behavior: if no viewbox present, default to 'px' units + + this->zoom = 0; + this->guidecolor = 0; + this->guidehicolor = 0; + this->views.clear(); + this->borderlayer = 0; + this->page_size_units = NULL; + this->window_x = 0; + this->cy = 0; + this->window_y = 0; this->display_units = NULL; - this->page_size_units = NULL; - this->pagecolor = 0; - this->cx = 0; - this->pageshadow = 0; - this->window_width = 0; - this->window_height = 0; - this->window_maximized = 0; - this->bordercolor = 0; + this->page_size_units = NULL; + this->pagecolor = 0; + this->cx = 0; + this->pageshadow = 0; + this->window_width = 0; + this->window_height = 0; + this->window_maximized = 0; + this->bordercolor = 0; this->editable = TRUE; this->showguides = TRUE; diff --git a/src/sp-namedview.h b/src/sp-namedview.h index ca85153b4..d8ac1a77e 100644 --- a/src/sp-namedview.h +++ b/src/sp-namedview.h @@ -64,7 +64,6 @@ public: std::vector<Inkscape::CanvasGrid *> grids; bool grids_visible; - Inkscape::Util::Unit const *svg_units; // Units used for the values in SVG Inkscape::Util::Unit const *display_units; // Units used for the UI (*not* the same as units of SVG coordinates) Inkscape::Util::Unit const *page_size_units; // Only used in "Custom size" part of Document Properties dialog |