[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/khtml/rendering
From:       Germain Garand <germain () ebooksfrance ! com>
Date:       2005-03-03 13:17:16
Message-ID: 20050303131716.601681751E () office ! kde ! org
[Download RAW message or body]

CVS commit by ggarand: 

Don't delete this's placeholder box on layout, parent will take care of it.
Fix crash in dynamic pop-ups.

BUG: 97085


  M +2 -0      render_box.cpp   1.256
  M +0 -1      render_flow.cpp   1.362


--- kdelibs/khtml/rendering/render_box.cpp  #1.255:1.256
@@ -201,4 +201,6 @@ void RenderBox::detach()
 InlineBox* RenderBox::createInlineBox(bool /*makePlaceHolderBox*/, bool /*isRootLineBox*/)
 {
+    if (m_placeHolderBox)
+        m_placeHolderBox->detach(renderArena());
     return (m_placeHolderBox = new (renderArena()) InlineBox(this));
 }

--- kdelibs/khtml/rendering/render_flow.cpp  #1.361:1.362
@@ -141,5 +141,4 @@ void RenderFlow::deleteInlineBoxes(Rende
         m_lastLineBox = 0;  
     }
-    RenderBox::deleteInlineBoxes(arena);
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]