diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2016-03-18 10:23:29 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2016-03-18 10:23:29 +0000 |
| commit | a714c688d60a3a62114591984f57f26cd41dbed9 (patch) | |
| tree | 3ad1c84aaf1097272b8ee2d4fca5db70f9c4edd3 /src/desktop-style.cpp | |
| parent | Revert 14707 (diff) | |
| download | inkscape-a714c688d60a3a62114591984f57f26cd41dbed9.tar.gz inkscape-a714c688d60a3a62114591984f57f26cd41dbed9.zip | |
Reverting 14701.
(bzr r14716.1.2)
Diffstat (limited to 'src/desktop-style.cpp')
| -rw-r--r-- | src/desktop-style.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index d10c75cd8..7f9670af3 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -1049,7 +1049,6 @@ objects_query_fontnumbers (const std::vector<SPItem*> &objects, SPStyle *style_r double letterspacing_prev = 0; double wordspacing_prev = 0; double linespacing_prev = 0; - int linespacing_unit = 0; int texts = 0; int no_size = 0; @@ -1106,11 +1105,6 @@ objects_query_fontnumbers (const std::vector<SPItem*> &objects, SPStyle *style_r linespacing_current = style->line_height.computed; linespacing_normal = false; } - if (linespacing_unit == 0) { - linespacing_unit = style->line_height.unit; - } else if (linespacing_unit != style->line_height.unit) { - linespacing_unit = SP_CSS_UNIT_PERCENT; - } linespacing += linespacing_current; if ((size_prev != 0 && style->font_size.computed != size_prev) || @@ -1154,7 +1148,7 @@ objects_query_fontnumbers (const std::vector<SPItem*> &objects, SPStyle *style_r style_res->line_height.normal = linespacing_normal; style_res->line_height.computed = linespacing; style_res->line_height.value = linespacing; - style_res->line_height.unit = linespacing_unit; + style_res->line_height.unit = SP_CSS_UNIT_PERCENT; if (texts > 1) { if (different) { |