From cc5fd88be313142d3996c81f8bdfc1290485858c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 2 Oct 2014 18:38:22 -0500 Subject: Don't use insane (negative) layout values if layout engine does not allocate sufficient space for a text string This resolves Bug 1950 Make most debugging statements work again Add new debugging statements Fix several annoying build warnings --- tdehtml/rendering/render_line.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'tdehtml/rendering/render_line.h') diff --git a/tdehtml/rendering/render_line.h b/tdehtml/rendering/render_line.h index 3dc066e10..8d4c8a256 100644 --- a/tdehtml/rendering/render_line.h +++ b/tdehtml/rendering/render_line.h @@ -84,7 +84,15 @@ public: RootInlineBox* root(); - void setWidth(short w) { m_width = w; } + void setWidth(short w) { + if (w < 0) { + m_width = SHRT_MAX; + kdDebug( 6040 ) << " InlineBox::setWidth() invalid negative width " << w << " specified!" << endl; + } + else { + m_width = w; + } + } short width() const { return m_width; } void setXPos(short x) { m_x = x; } -- cgit v1.2.1