diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2015-11-24 09:49:17 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2015-11-24 09:49:17 +0000 |
| commit | bbaac37a5345ff1e8e8f75edf39e260ae516ac84 (patch) | |
| tree | 7f0cf0b0fa58bd8dd4835c515ff31dff805dff3c /src/display/nr-style.cpp | |
| parent | Change context from gradient to mesh. (diff) | |
| parent | Remove unintended change that added C++11 flag. (diff) | |
| download | inkscape-bbaac37a5345ff1e8e8f75edf39e260ae516ac84.tar.gz inkscape-bbaac37a5345ff1e8e8f75edf39e260ae516ac84.zip | |
Merge 'writing-modes' branch.
(bzr r14487)
Diffstat (limited to 'src/display/nr-style.cpp')
| -rw-r--r-- | src/display/nr-style.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/display/nr-style.cpp b/src/display/nr-style.cpp index 1740785e2..8b82a1dff 100644 --- a/src/display/nr-style.cpp +++ b/src/display/nr-style.cpp @@ -68,7 +68,6 @@ NRStyle::NRStyle() , tspan_width(0) , ascender(0) , descender(0) - , line_gap(0) , underline_thickness(0) , underline_position(0) , line_through_thickness(0) @@ -330,7 +329,6 @@ void NRStyle::set(SPStyle *style, SPStyle *context_style) tspan_width = style->text_decoration_data.tspan_width; ascender = style->text_decoration_data.ascender; descender = style->text_decoration_data.descender; - line_gap = style->text_decoration_data.line_gap; underline_thickness = style->text_decoration_data.underline_thickness; underline_position = style->text_decoration_data.underline_position; line_through_thickness = style->text_decoration_data.line_through_thickness; |