From 78005ad417dde6dddab40efacb757b1d6b0c03d0 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Sat, 5 Dec 2015 15:40:56 +0100
Subject: Handle units in the 'x', 'y', 'dx', and 'dy' text and tspan
 attributes.

Fixed bugs:
  - https://launchpad.net/bugs/1522478
  - https://launchpad.net/bugs/262528
  - https://launchpad.net/bugs/168845

(bzr r14505)
---
 src/sp-rect.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/sp-rect.cpp')

diff --git a/src/sp-rect.cpp b/src/sp-rect.cpp
index e17d7373c..2ba9a7023 100644
--- a/src/sp-rect.cpp
+++ b/src/sp-rect.cpp
@@ -61,13 +61,13 @@ void SPRect::set(unsigned key, gchar const *value) {
     switch (key) {
         case SP_ATTR_X:
             this->x.readOrUnset(value);
-            this->x.update( ex, em, w );
+            this->x.update( em, ex, w );
             this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
             break;
 
         case SP_ATTR_Y:
             this->y.readOrUnset(value);
-            this->y.update( ex, em, h );
+            this->y.update( em, ex, h );
             this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
             break;
 
@@ -75,7 +75,7 @@ void SPRect::set(unsigned key, gchar const *value) {
             if (!this->width.read(value) || this->width.value < 0.0) {
             	this->width.unset();
             }
-            this->width.update( ex, em, w );
+            this->width.update( em, ex, w );
             this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
             break;
 
@@ -83,7 +83,7 @@ void SPRect::set(unsigned key, gchar const *value) {
             if (!this->height.read(value) || this->height.value < 0.0) {
             	this->height.unset();
             }
-            this->height.update( ex, em, h );
+            this->height.update( em, ex, h );
             this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
             break;
 
@@ -91,7 +91,7 @@ void SPRect::set(unsigned key, gchar const *value) {
             if (!this->rx.read(value) || this->rx.value <= 0.0) {
             	this->rx.unset();
             }
-            this->rx.update( ex, em, w );
+            this->rx.update( em, ex, w );
             this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
             break;
 
@@ -99,7 +99,7 @@ void SPRect::set(unsigned key, gchar const *value) {
             if (!this->ry.read(value) || this->ry.value <= 0.0) {
             	this->ry.unset();
             }
-            this->ry.update( ex, em, h );
+            this->ry.update( em, ex, h );
             this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
             break;
 
-- 
cgit v1.2.3