diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-04-26 23:27:03 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-04-26 23:27:03 +0000 |
| commit | cf159c3d0415a1a761eb7ca760256cd224927d3c (patch) | |
| tree | 03cfd9a7f543ec07377c96ed23b9f5b0626a6e2a /src/display/nr-style.cpp | |
| parent | Redesign of the BSpline LPE widgets (diff) | |
| parent | Clean up of style code: Patch from suv: SPStyle: struct -> class (diff) | |
| download | inkscape-cf159c3d0415a1a761eb7ca760256cd224927d3c.tar.gz inkscape-cf159c3d0415a1a761eb7ca760256cd224927d3c.zip | |
update to trunk
(bzr r11950.1.336)
Diffstat (limited to 'src/display/nr-style.cpp')
| -rw-r--r-- | src/display/nr-style.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/display/nr-style.cpp b/src/display/nr-style.cpp index 125d0c6d6..3d2d36483 100644 --- a/src/display/nr-style.cpp +++ b/src/display/nr-style.cpp @@ -201,8 +201,7 @@ void NRStyle::set(SPStyle *style) if( style->text_decoration_color.set || style->text_decoration_color.inherit || - style->text_decoration_color.currentcolor || - style->text_decoration_color.colorSet){ + style->text_decoration_color.currentcolor ){ text_decoration_color.set(style->text_decoration_color.value.color); text_decoration_useColor = true; } |
