From 45bdb1d8bdfe52de31ca28a2a26d4d1204bb9961 Mon Sep 17 00:00:00 2001
From: buliabyak <>
Date: Sat, 28 Sep 2013 11:04:26 -0300
Subject: on hiding, texts must _clearFlow to release arena items, otherwise
 they leak

(bzr r12608)
---
 src/sp-text.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/sp-text.cpp')

diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index 72a5996d1..c515828a4 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -318,7 +318,12 @@ Inkscape::DrawingItem* SPText::show(Inkscape::Drawing &drawing, unsigned key, un
 
 
 void SPText::hide(unsigned int key) {
-//	SPItem::onHide(key);
+    for (SPItemView* v = this->display; v != NULL; v = v->next) {
+        if (v->key == key) {
+            Inkscape::DrawingGroup *g = dynamic_cast<Inkscape::DrawingGroup *>(v->arenaitem);
+            this->_clearFlow(g);
+        }
+    }
 }
 
 const char* SPText::displayName() {
-- 
cgit v1.2.3


From 87d93e27330577c2fd632dbaccbd3103884aa590 Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
Date: Tue, 1 Oct 2013 15:25:44 +0200
Subject: Comprehensive fix for the issues with disappearing filtered objects.
 Fixes #304407 and possibly a few other bugs. Revert incorrect _item_bbox
 changes from r12528.

Fixed bugs:
  - https://launchpad.net/bugs/304407

(bzr r12648)
---
 src/sp-text.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/sp-text.cpp')

diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index c515828a4..c431f52da 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -135,12 +135,9 @@ void SPText::remove_child(Inkscape::XML::Node *rch) {
 
 
 void SPText::update(SPCtx *ctx, guint flags) {
-    SPItem::update(ctx, flags);
-
-    guint cflags = (flags & SP_OBJECT_MODIFIED_CASCADE);
-
+    unsigned childflags = (flags & SP_OBJECT_MODIFIED_CASCADE);
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
-    	cflags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
+    	childflags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
     }
 
     // Create temporary list of children
@@ -157,14 +154,17 @@ void SPText::update(SPCtx *ctx, guint flags) {
         SPObject *child = reinterpret_cast<SPObject*>(l->data); // We just built this list, so cast is safe.
         l = g_slist_remove (l, child);
 
-        if (cflags || (child->uflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
+        if (childflags || (child->uflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             /* fixme: Do we need transform? */
-            child->updateDisplay(ctx, cflags);
+            child->updateDisplay(ctx, childflags);
         }
 
         sp_object_unref(child, this);
     }
 
+    // update ourselves after updating children
+    SPItem::update(ctx, flags);
+
     if (flags & ( SP_OBJECT_STYLE_MODIFIED_FLAG |
                   SP_OBJECT_CHILD_MODIFIED_FLAG |
                   SP_TEXT_LAYOUT_MODIFIED_FLAG   ) )
-- 
cgit v1.2.3