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

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdelibs/khtml/rendering
From:       Dirk Mueller <mueller () kde ! org>
Date:       2004-04-26 21:05:28
Message-ID: 20040426210528.1E28B903E () office ! kde ! org
[Download RAW message or body]

CVS commit by mueller: 

avoid assertion failure on man: pages (backport revision 1.34)


  M +5 -3      render_block.cpp   1.20.2.7


--- kdelibs/khtml/rendering/render_block.cpp  #1.20.2.6:1.20.2.7
@@ -423,4 +423,9 @@ void RenderBlock::layout()
 void RenderBlock::layoutBlock(bool relayoutChildren)
 {
+    if (isInline() && !isReplacedBlock()) {
+        setLayouted();
+        return;
+    }
+
     //    kdDebug( 6040 ) << renderName() << " " << this << "::layoutBlock() start" << endl;
     //     QTime t;
@@ -429,7 +434,4 @@ void RenderBlock::layoutBlock(bool relay
     KHTMLAssert( minMaxKnown() );
 
-    if (isInline()) // Inline <form>s inside various table elements can cause us to
-        return;     // come in here.  Just bail. -dwh
-
     int oldWidth = m_width;
 


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