From kde-commits  Tue Jan 02 10:53:39 2007
From: Germain Garand <germain () ebooksfrance ! com>
Date: Tue, 02 Jan 2007 10:53:39 +0000
To: kde-commits
Subject: branches/KDE/3.5/kdelibs/khtml/rendering
Message-Id: <1167735219.418226.17589.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=116773523028866

SVN commit 618865 by ggarand:

backport 618852.



 M  +1 -1      render_box.cpp  
 M  +1 -0      render_table.h  


--- branches/KDE/3.5/kdelibs/khtml/rendering/render_box.cpp #618864:618865
@@ -707,7 +707,7 @@
     }
 
     RenderBlock* cb = containingBlock();
-    if (isRenderBlock() && cb->isTable()) {
+    if (isRenderBlock() && cb->isTable() && static_cast<RenderTable*>(cb)->caption() == this) {
         //captions are not affected by table border or padding
         return cb->width();
     }
--- branches/KDE/3.5/kdelibs/khtml/rendering/render_table.h #618864:618865
@@ -162,6 +162,7 @@
     CollapsedBorderValue* currentBorderStyle() { return m_currentBorder; }
 
     RenderTableSection *firstBodySection() const { return firstBody; }
+    RenderFlow*         caption() const { return tCaption; }
 
 protected: