diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-11-26 01:10:30 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-11-26 01:10:30 +0000 |
| commit | 6c87088ed548a3da4388ea95bba82aea798c901a (patch) | |
| tree | e4269aab0a32957163935ec6b828b25d00613d68 /src/ui/widget | |
| parent | Update to trunk r13750 (diff) | |
| parent | Add CMake file to find LCMS2 (diff) | |
| download | inkscape-6c87088ed548a3da4388ea95bba82aea798c901a.tar.gz inkscape-6c87088ed548a3da4388ea95bba82aea798c901a.zip | |
Update to trunk r13766
(bzr r13341.5.24)
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/page-sizer.cpp | 4 | ||||
| -rw-r--r-- | src/ui/widget/selected-style.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp index 32e357c57..b775b3c49 100644 --- a/src/ui/widget/page-sizer.cpp +++ b/src/ui/widget/page-sizer.cpp @@ -313,8 +313,8 @@ PageSizer::PageSizer(Registry & _wr) _wr.setUpdating (true); if (nv->page_size_units) { _dimensionUnits.setUnit(nv->page_size_units->abbr); - } else if (nv->doc_units) { - _dimensionUnits.setUnit(nv->doc_units->abbr); + } else if (nv->display_units) { + _dimensionUnits.setUnit(nv->display_units->abbr); } _wr.setUpdating (false); diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index d22c59aa4..aebef2c4e 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -498,7 +498,7 @@ SelectedStyle::setDesktop(SPDesktop *desktop) this ) )); - _sw_unit = sp_desktop_namedview(desktop)->doc_units; + _sw_unit = sp_desktop_namedview(desktop)->display_units; // Set the doc default unit active in the units list gint length = g_slist_length(_unit_mis); |