summaryrefslogtreecommitdiffstats
path: root/src/desktop-style.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2014-09-23 13:54:19 +0000
committertavmjong-free <tavmjong@free.fr>2014-09-23 13:54:19 +0000
commit7eee00aa64d59585d3b1c0e411551384a0a137a2 (patch)
tree2cd7525df81987407e8157ab29f71138d632dfd9 /src/desktop-style.cpp
parentExtensions. Fix for Bug #1372200 (Comment within <script> element in INX file... (diff)
downloadinkscape-7eee00aa64d59585d3b1c0e411551384a0a137a2.tar.gz
inkscape-7eee00aa64d59585d3b1c0e411551384a0a137a2.zip
Fix for #1334792. Correct inheritance for 'line-height' property.
(bzr r13564)
Diffstat (limited to 'src/desktop-style.cpp')
-rw-r--r--src/desktop-style.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index f6347e5c0..bfd662c9a 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -1011,8 +1011,8 @@ objects_query_fontnumbers (GSList *objects, SPStyle *style_res)
} else if (style->line_height.unit == SP_CSS_UNIT_PERCENT || style->font_size.computed == 0) {
linespacing_current = style->line_height.value;
linespacing_normal = false;
- } else { // we need % here
- linespacing_current = style->line_height.computed / style->font_size.computed;
+ } else {
+ linespacing_current = style->line_height.computed;
linespacing_normal = false;
}
linespacing += linespacing_current;