summaryrefslogtreecommitdiffstats
path: root/src/ui/widget/page-sizer.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2014-11-24 21:38:54 +0000
committerJabiertxof <jtx@jtx.marker.es>2014-11-24 21:38:54 +0000
commit5497de6e39d4fc31a6824eb9f9e638635de4521b (patch)
treed1e5d867d3b9f618846bdfe65e147b23df8ed58a /src/ui/widget/page-sizer.cpp
parentFixing bend from clipboard to trunk 0.92 (diff)
parentFix a bug in pen/cil modes triangle in/out (diff)
downloadinkscape-5497de6e39d4fc31a6824eb9f9e638635de4521b.tar.gz
inkscape-5497de6e39d4fc31a6824eb9f9e638635de4521b.zip
update to trunk
(bzr r12588.1.37)
Diffstat (limited to 'src/ui/widget/page-sizer.cpp')
-rw-r--r--src/ui/widget/page-sizer.cpp4
1 files changed, 2 insertions, 2 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);