diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-02 18:38:22 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-02 18:40:04 -0500 |
| commit | cc5fd88be313142d3996c81f8bdfc1290485858c (patch) | |
| tree | 36c6e1eef900d0ef1aa05e96d786194b4c5674d9 /tdehtml/xml | |
| parent | 2c850d93a7803e435504fe9c982cb974695d7a3b (diff) | |
| download | tdelibs-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/xml')
| -rw-r--r-- | tdehtml/xml/dom_docimpl.cpp | 2 | ||||
| -rw-r--r-- | tdehtml/xml/dom_docimpl.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp index 423a2a51e..b896d05a3 100644 --- a/tdehtml/xml/dom_docimpl.cpp +++ b/tdehtml/xml/dom_docimpl.cpp @@ -2345,7 +2345,7 @@ bool DocumentImpl::isURLAllowed(const TQString& url) const return false; // Prohibit non-file URLs if we are asked to. - if (!thisPart || thisPart->onlyLocalReferences() && newURL.protocol() != "file" && newURL.protocol() != "data") + if (!thisPart || (thisPart->onlyLocalReferences() && (newURL.protocol() != "file") && (newURL.protocol() != "data"))) return false; // do we allow this suburl ? diff --git a/tdehtml/xml/dom_docimpl.h b/tdehtml/xml/dom_docimpl.h index 9cacfd9f5..bcdc9500c 100644 --- a/tdehtml/xml/dom_docimpl.h +++ b/tdehtml/xml/dom_docimpl.h @@ -27,6 +27,8 @@ #ifndef _DOM_DocumentImpl_h_ #define _DOM_DocumentImpl_h_ +#include <stdint.h> + #include "xml/dom_elementimpl.h" #include "xml/dom_textimpl.h" #include "xml/dom2_traversalimpl.h" @@ -617,7 +619,7 @@ protected: TQString name = cs ? n.string() : n.string().upper(); TQString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name); if (!ids.find( qn )) { - ids.insert( qn, (void*)id ); + ids.insert( qn, (void*)(intptr_t)id ); } } expandIfNeeded(); |