summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Owens <doctormo@gmail.com>2018-09-26 19:30:39 +0000
committerMartin Owens <doctormo@gmail.com>2018-09-26 19:30:39 +0000
commitea0019e97ddcd3f7ddeda2f3c51fa2f0ce00ab3b (patch)
tree180f5b630455b50acf5922005d6197967f48dbe1 /src
parentRename unit to unit_out for less confusion (diff)
parentMove URL toString to a more useful place and some minor fixes (diff)
downloadinkscape-ea0019e97ddcd3f7ddeda2f3c51fa2f0ce00ab3b.tar.gz
inkscape-ea0019e97ddcd3f7ddeda2f3c51fa2f0ce00ab3b.zip
Merge into remote
Diffstat (limited to 'src')
-rw-r--r--src/style-internal.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/style-internal.cpp b/src/style-internal.cpp
index fd2ead300..cad82b7a8 100644
--- a/src/style-internal.cpp
+++ b/src/style-internal.cpp
@@ -311,7 +311,7 @@ const Glib::ustring SPILength::get_value() const
case SP_CSS_UNIT_NONE:
break;
case SP_CSS_UNIT_PX:
- unit = "px";
+ unit_out = "px";
break;
case SP_CSS_UNIT_PT:
case SP_CSS_UNIT_PC: