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

List:       kde-commits
Subject:    KDE/kdelibs/khtml/xml
From:       Maks Orlovich <maksim () kde ! org>
Date:       2010-05-27 15:59:19
Message-ID: 20100527160504.2B2E8AC8C0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1131202 by orlovich:

Make sure we always have a str for CharacterData.

BUG: 238977


 M  +4 -3      dom_textimpl.cpp  
 M  +2 -4      dom_textimpl.h  


--- trunk/KDE/kdelibs/khtml/xml/dom_textimpl.cpp #1131201:1131202
@@ -70,7 +70,9 @@
     if(str == _data.impl) return; // ### fire DOMCharacterDataModified if modified?
     DOMStringImpl *oldStr = str;
     str = _data.impl;
-    if(str) str->ref();
+    if (!str)
+        str = new DOMStringImpl((QChar*)0, 0);
+    str->ref();
     if (m_render)
       (static_cast<RenderText*>(m_render))->setText(str);
     setChanged(true);
@@ -659,5 +661,4 @@
     return true;
 }
 
-
-
+// kate: indent-width 4; replace-tabs on; tab-width 8; space-indent on;
--- trunk/KDE/kdelibs/khtml/xml/dom_textimpl.h #1131201:1131202
@@ -38,8 +38,6 @@
 {
 public:
     CharacterDataImpl(DocumentImpl *doc, DOMStringImpl* _text);
-    CharacterDataImpl(DocumentImpl *doc)
-        : NodeImpl(doc), str(0) {}
 
     virtual ~CharacterDataImpl();
 
@@ -93,7 +91,7 @@
     CommentImpl(DocumentImpl *doc, DOMStringImpl* _text)
         : CharacterDataImpl(doc, _text) {}
     CommentImpl(DocumentImpl *doc)
-        : CharacterDataImpl(doc) {}
+        : CharacterDataImpl(doc, 0) {}
     // DOM methods overridden from  parent classes
     virtual DOMString nodeName() const;
     virtual unsigned short nodeType() const;
@@ -115,7 +113,7 @@
     TextImpl(DocumentImpl *impl, DOMStringImpl* _text)
         : CharacterDataImpl(impl, _text) {}
     TextImpl(DocumentImpl *impl)
-        : CharacterDataImpl(impl) {}
+        : CharacterDataImpl(impl, 0) {}
 
     // DOM methods & attributes for CharacterData
 
[prev in list] [next in list] [prev in thread] [next in thread]