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

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml/rendering (silent)
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2005-09-06 16:36:53
Message-ID: 1126024613.403241.18661.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 457809 by carewolf:

SVN_SILENT: How did this happen?


 M  +1 -25     render_flow.cpp  
 M  +0 -1      render_flow.h  
 M  +0 -16     render_line.cpp  


--- branches/KDE/3.5/kdelibs/khtml/rendering/render_flow.cpp #457808:457809
@@ -138,34 +138,10 @@
             curr = next;
         }
         m_firstLineBox = 0;
-        m_lastLineBox = 0;
+        m_lastLineBox = 0;  
     }
 }
 
-void RenderFlow::deleteLastLineBox(RenderArena* arena)
-{
-    if (m_lastLineBox) {
-        if (!arena)
-            arena = renderArena();
-        InlineRunBox *curr=m_lastLineBox, *prev = m_lastLineBox;
-        if (m_firstLineBox == m_lastLineBox)
-            m_firstLineBox = m_lastLineBox = 0;
-        else {
-            prev = curr->prevLineBox();
-            while (!prev->isInlineFlowBox()) {
-                prev = prev->prevLineBox();
-                prev->detach(arena);
-            }
-            m_lastLineBox = static_cast<InlineFlowBox*>(prev);
-            prev->setNextLineBox(0);
-        }
-        if (curr->parent()) {
-            curr->parent()->removeFromLine(curr);
-        }
-        curr->detach(arena);
-    }
-}
-
 InlineBox* RenderFlow::createInlineBox(bool makePlaceHolderBox, bool isRootLineBox)
 {
     if ( !isRootLineBox &&
--- branches/KDE/3.5/kdelibs/khtml/rendering/render_flow.h #457808:457809
@@ -57,7 +57,6 @@
 
     static RenderFlow* createFlow(DOM::NodeImpl* node, RenderStyle* style, RenderArena* arena);
 
-    virtual void deleteLastLineBox(RenderArena* arena=0);
     virtual void deleteInlineBoxes(RenderArena* arena=0);
 
 
--- branches/KDE/3.5/kdelibs/khtml/rendering/render_line.cpp #457808:457809
@@ -80,22 +80,6 @@
     return static_cast<RootInlineBox*>(this);
 }
 
-void InlineFlowBox::removeFromLine(InlineBox *child)
-{
-    if (child == m_firstChild) {
-        m_firstChild = child->nextOnLine();
-    }
-    if (child == m_lastChild) {
-        m_lastChild = child->prevOnLine();
-    }
-    if (child->nextOnLine()) {
-        child->nextOnLine()->m_prev = child->prevOnLine();
-    }
-    if (child->prevOnLine()) {
-        child->prevOnLine()->m_next = child->nextOnLine();
-    }
-}
-
 int InlineFlowBox::marginLeft() const
 {
     if (!includeLeftEdge())
[prev in list] [next in list] [prev in thread] [next in thread]