diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-11-17 22:27:50 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-11-17 22:27:50 +0000 |
| commit | df29620f545c2eaf2ddb845f8d1d10b443e512be (patch) | |
| tree | c5a3abfbf1bba71c5e0e6ad0f0fea3186f915ff9 /src/document.cpp | |
| parent | adding knot improvements pointed by su_v (diff) | |
| parent | fix a bug in fillet/chamfer on apply on non shapes (diff) | |
| download | inkscape-df29620f545c2eaf2ddb845f8d1d10b443e512be.tar.gz inkscape-df29620f545c2eaf2ddb845f8d1d10b443e512be.zip | |
update to trunk
(bzr r13682.1.14)
Diffstat (limited to 'src/document.cpp')
| -rw-r--r-- | src/document.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/document.cpp b/src/document.cpp index e5b827937..f5269eab3 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -713,11 +713,9 @@ void SPDocument::fitToRect(Geom::Rect const &rect, bool with_margins) double const old_height = getHeight().value("px"); Inkscape::Util::Unit const *nv_units = unit_table.getUnit("px"); + if (root->height.unit) + nv_units = unit_table.getUnit(root->height.unit); SPNamedView *nv = sp_document_namedview(this, NULL); - if (nv != NULL) { - if (nv->getAttribute("units")) - nv_units = unit_table.getUnit(nv->getAttribute("units")); - } /* in px */ double margin_top = 0.0; |