summaryrefslogtreecommitdiffstats
path: root/tdehtml/rendering/render_text.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-02 18:38:22 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-02 18:40:04 -0500
commitcc5fd88be313142d3996c81f8bdfc1290485858c (patch)
tree36c6e1eef900d0ef1aa05e96d786194b4c5674d9 /tdehtml/rendering/render_text.h
parent2c850d93a7803e435504fe9c982cb974695d7a3b (diff)
downloadtdelibs-cc5fd88be313142d3996c81f8bdfc1290485858c.tar.gz
tdelibs-cc5fd88be313142d3996c81f8bdfc1290485858c.zip
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
Diffstat (limited to 'tdehtml/rendering/render_text.h')
-rw-r--r--tdehtml/rendering/render_text.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/tdehtml/rendering/render_text.h b/tdehtml/rendering/render_text.h
index acce98350..a05d65daa 100644
--- a/tdehtml/rendering/render_text.h
+++ b/tdehtml/rendering/render_text.h
@@ -74,7 +74,15 @@ private:
void* operator new(size_t sz) throw();
public:
- void setSpaceAdd(int add) { m_width -= m_toAdd; m_toAdd = add; m_width += m_toAdd; }
+ void setSpaceAdd(int add) {
+ if (add < 0) {
+ m_toAdd = 0;
+ kdDebug( 6040 ) << " InlineTextBox::setSpaceAdd() invalid negative value " << add << " specified!" << endl;
+ }
+ else {
+ m_width -= m_toAdd; m_toAdd = add; m_width += m_toAdd;
+ }
+ }
int spaceAdd() { return m_toAdd; }
virtual bool isInlineTextBox() const { return true; }