summaryrefslogtreecommitdiffstats
path: root/src/document.cpp
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-07-13 20:16:51 +0000
committerTed Gould <ted@gould.cx>2010-07-13 20:16:51 +0000
commitef2d72d29fce61231bdd7888ab8330503158e9d6 (patch)
tree4685bfddef010181fdd87fc182016b994f2b69d9 /src/document.cpp
parentPulling in a more recent trunk (diff)
parentTranslations. Romanian nsh file update. (diff)
downloadinkscape-ef2d72d29fce61231bdd7888ab8330503158e9d6.tar.gz
inkscape-ef2d72d29fce61231bdd7888ab8330503158e9d6.zip
Upgrading to trunk
(bzr r8254.1.57)
Diffstat (limited to 'src/document.cpp')
-rw-r--r--src/document.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/document.cpp b/src/document.cpp
index 101c54e30..eff6d6e81 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -682,7 +682,7 @@ void SPDocument::fitToRect(Geom::Rect const &rect, bool with_margins)
margin_units = sp_unit_get_by_abbreviation(units_abbr);
}
if (margin_units == NULL) {
- margin_units = &sp_unit_get_by_id(SP_UNIT_PX);
+ margin_units = &px;
}
margin_top = getMarginLength(nv_repr, "fit-margin-top",
margin_units, &px, w, h, false);