From 632414c7cdd5f8992c6d6439d25128b82e93d499 Mon Sep 17 00:00:00 2001 From: Matthew Petroff Date: Mon, 2 Sep 2013 15:51:04 -0400 Subject: Fix bug that added transforms to new objects. (bzr r12475.1.11) --- src/text-context.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/text-context.cpp') diff --git a/src/text-context.cpp b/src/text-context.cpp index 719a82156..1ba1bb68b 100644 --- a/src/text-context.cpp +++ b/src/text-context.cpp @@ -477,6 +477,7 @@ static void sp_text_context_setup_text(SPTextContext *tc) text_item->transform = SP_ITEM(ec->desktop->currentLayer())->i2doc_affine().inverse(); text_item->updateRepr(); + text_item->doWriteTransform(text_item->getRepr(), text_item->transform, NULL, true); DocumentUndo::done(sp_desktop_document(ec->desktop), SP_VERB_CONTEXT_TEXT, _("Create text")); } -- cgit v1.2.3 From 56dda4fb505028b68abac775b005cef65bce3477 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 21 Sep 2013 21:18:07 +0200 Subject: Fixed segfault on copying text. Fixed bugs: - https://launchpad.net/bugs/1228509 (bzr r12569) --- src/text-context.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/text-context.cpp') diff --git a/src/text-context.cpp b/src/text-context.cpp index 10973b7aa..f12ce6aa6 100644 --- a/src/text-context.cpp +++ b/src/text-context.cpp @@ -1390,8 +1390,11 @@ SPCSSAttr *sp_text_get_style_at_cursor(SPEventContext const *ec) return NULL; SPObject const *obj = sp_te_object_at_position(tc->text, tc->text_sel_end); - if (obj) - return take_style_from_item(SP_ITEM(obj)); + + if (obj) { + return take_style_from_item(const_cast(obj)); + } + return NULL; } -- cgit v1.2.3