diff options
| author | bulia byak <buliabyak@gmail.com> | 2007-12-30 07:46:30 +0000 |
|---|---|---|
| committer | buliabyak <buliabyak@users.sourceforge.net> | 2007-12-30 07:46:30 +0000 |
| commit | f689736d0d12bc8d8374f223288272529face714 (patch) | |
| tree | 6431a389d1986c28ad767b0fd4dbd50bd6e51927 /src | |
| parent | Strip out Pango markup from tooltips (fixes bug #167640) (diff) | |
| download | inkscape-f689736d0d12bc8d8374f223288272529face714.tar.gz inkscape-f689736d0d12bc8d8374f223288272529face714.zip | |
fix bug 168751 (sf1749738)
(bzr r4340)
Diffstat (limited to 'src')
| -rw-r--r-- | src/sp-text.cpp | 2 | ||||
| -rw-r--r-- | src/text-chemistry.cpp | 2 | ||||
| -rw-r--r-- | src/text-context.cpp | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/sp-text.cpp b/src/sp-text.cpp index 1c677edb2..1609afa92 100644 --- a/src/sp-text.cpp +++ b/src/sp-text.cpp @@ -194,7 +194,7 @@ sp_text_child_added (SPObject *object, Inkscape::XML::Node *rch, Inkscape::XML:: if (((SPObjectClass *) text_parent_class)->child_added) ((SPObjectClass *) text_parent_class)->child_added (object, rch, ref); - text->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_TEXT_CONTENT_MODIFIED_FLAG); + text->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_TEXT_CONTENT_MODIFIED_FLAG | SP_TEXT_LAYOUT_MODIFIED_FLAG); } static void diff --git a/src/text-chemistry.cpp b/src/text-chemistry.cpp index e1eaa47fb..ef5bd90bf 100644 --- a/src/text-chemistry.cpp +++ b/src/text-chemistry.cpp @@ -221,9 +221,9 @@ text_remove_from_path() if (!did) { sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("<b>No texts-on-paths</b> in the selection.")); } else { - selection->setList(g_slist_copy((GSList *) selection->itemList())); // reselect to update statusbar description sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_TEXT, _("Remove text from path")); + selection->setList(g_slist_copy((GSList *) selection->itemList())); // reselect to update statusbar description } } diff --git a/src/text-context.cpp b/src/text-context.cpp index f97bb26ac..b79dce6c9 100644 --- a/src/text-context.cpp +++ b/src/text-context.cpp @@ -1469,8 +1469,9 @@ sp_text_context_style_query(SPStyle *style, int property, SPTextContext *tc) SPObject const *pos_obj = 0; void *rawptr = 0; layout->getSourceOfCharacter(it, &rawptr); + if (!rawptr || !SP_IS_OBJECT(rawptr)) + continue; pos_obj = SP_OBJECT(rawptr); - if (pos_obj == 0) continue; while (SP_IS_STRING(pos_obj) && SP_OBJECT_PARENT(pos_obj)) { pos_obj = SP_OBJECT_PARENT(pos_obj); // SPStrings don't have style } |