summaryrefslogtreecommitdiffstats
path: root/src/document.cpp
diff options
context:
space:
mode:
authorAlvin Penner <penner@vaxxine.com>2014-11-24 23:22:58 +0000
committerapenner <penner@vaxxine.com>2014-11-24 23:22:58 +0000
commit6c4685e18a2672ceb73c6f5d0bd03914ffa746f9 (patch)
treeeb8305e8715bdc964d44813ddb61aae6a04063e9 /src/document.cpp
parentFix a bug in pen/cil modes triangle in/out (diff)
downloadinkscape-6c4685e18a2672ceb73c6f5d0bd03914ffa746f9.tar.gz
inkscape-6c4685e18a2672ceb73c6f5d0bd03914ffa746f9.zip
fix bug in rev 13632 when page size units = 'm'. (Bug 1395637)
Fixed bugs: - https://launchpad.net/bugs/1395637 (bzr r13753)
Diffstat (limited to 'src/document.cpp')
-rw-r--r--src/document.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/document.cpp b/src/document.cpp
index 3715d8e6e..f69e830ff 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -636,6 +636,7 @@ void SPDocument::setWidth(const Inkscape::Util::Quantity &width)
if (*width.unit == *unit_table.getUnit("m")) {
root->width.value = width.value("cm");
root->width.unit = SVGLength::CM;
+ old_converted = Inkscape::Util::Quantity::convert(old_converted, "m", "cm");
} else {
root->width.value = width.quantity;
root->width.unit = (SVGLength::Unit) width.unit->svgUnit();
@@ -677,6 +678,7 @@ void SPDocument::setHeight(const Inkscape::Util::Quantity &height)
if (*height.unit == *unit_table.getUnit("m")) {
root->height.value = height.value("cm");
root->height.unit = SVGLength::CM;
+ old_converted = Inkscape::Util::Quantity::convert(old_converted, "m", "cm");
} else {
root->height.value = height.quantity;
root->height.unit = (SVGLength::Unit) height.unit->svgUnit();