diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-04-09 10:45:20 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-04-09 10:45:20 +0000 |
| commit | f0c6ea33bcb5a03352f6276bac82d56c39c3f5fe (patch) | |
| tree | 28159b96674a5c003fb36948ff04f3eaae3ec864 /src/text-editing.cpp | |
| parent | Refactor of end anchors. (diff) | |
| parent | Make extension tests compatible with VPATH builds. (diff) | |
| download | inkscape-f0c6ea33bcb5a03352f6276bac82d56c39c3f5fe.tar.gz inkscape-f0c6ea33bcb5a03352f6276bac82d56c39c3f5fe.zip | |
update to trunk
(bzr r11950.1.326)
Diffstat (limited to 'src/text-editing.cpp')
| -rw-r--r-- | src/text-editing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/text-editing.cpp b/src/text-editing.cpp index cae123616..47964880c 100644 --- a/src/text-editing.cpp +++ b/src/text-editing.cpp @@ -776,7 +776,7 @@ sp_te_delete (SPItem *item, Inkscape::Text::Layout::iterator const &start, bool has_text_decoration = false; gchar const *root_style = (item)->getRepr()->attribute("style"); - if(strstr(root_style,"text-decoration"))has_text_decoration = true; + if(root_style && strstr(root_style,"text-decoration"))has_text_decoration = true; if (start_item == end_item) { // the quick case where we're deleting stuff all from the same string @@ -2035,7 +2035,7 @@ void sp_te_apply_style(SPItem *text, Inkscape::Text::Layout::iterator const &sta roundtrippability. */ bool has_text_decoration = false; gchar const *root_style = (text)->getRepr()->attribute("style"); - if(strstr(root_style,"text-decoration"))has_text_decoration = true; + if(root_style && strstr(root_style,"text-decoration")) has_text_decoration = true; while (tidy_xml_tree_recursively(common_ancestor, has_text_decoration)){}; // if we only modified subobjects this won't have been automatically sent |