summaryrefslogtreecommitdiffstats
path: root/src/text-editing.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebronyat-signgmaildotcom>2014-04-06 22:22:07 +0000
committerLiam P. White <inkscapebronyat-signgmaildotcom>2014-04-06 22:22:07 +0000
commit15f9682879d6860d8c84a1cb79a4a34e0848a1bc (patch)
tree3b94cd60e7b9add96b85fe3da1d8a3b26c2d9cf1 /src/text-editing.cpp
parentProperly allow effect stacking with knotholders (and add extra LPE functional... (diff)
parentnoop: improve code style in sp-lpe-item.cpp (diff)
downloadinkscape-15f9682879d6860d8c84a1cb79a4a34e0848a1bc.tar.gz
inkscape-15f9682879d6860d8c84a1cb79a4a34e0848a1bc.zip
Updaet to trunk
(bzr r13090.1.49)
Diffstat (limited to 'src/text-editing.cpp')
-rw-r--r--src/text-editing.cpp4
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