xerces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amass...@apache.org
Subject cvs commit: xml-xerces/c/src/xercesc/com IXMLDOMCharacterDataImpl.h IXMLDOMNodeImpl.h IXMLDOMNodeImpl.inl IXMLDOMTextImpl.h NodeContainerImpl.h xml4com.cpp XMLDOMAttribute.cpp XMLDOMAttribute.h XMLDOMCDATASection.h XMLDOMComment.h XMLDOMDocument.cpp XMLDOMDocument.h XMLDOMDocumentFragment.h XMLDOMDocumentType.cpp XMLDOMDocumentType.h XMLDOMElement.cpp XMLDOMElement.h XMLDOMEntity.cpp XMLDOMEntity.h XMLDOMEntityReference.h XMLDOMImplementation.cpp XMLDOMImplementation.h XMLDOMNamedNodeMap.cpp XMLDOMNamedNodeMap.h XMLDOMNodeList.cpp XMLDOMNodeList.h XMLDOMNotation.cpp XMLDOMNotation.h XMLDOMProcessingInstruction.cpp XMLDOMProcessingInstruction.h XMLDOMText.h XMLDOMUtil.cpp XMLDOMUtil.h XMLDOMXMLDecl.cpp XMLDOMXMLDecl.h XMLHttpRequest.h
Date Wed, 25 Feb 2004 18:38:34 GMT
amassari    2004/02/25 10:38:34

  Modified:    c/src/xercesc/com IXMLDOMCharacterDataImpl.h
                        IXMLDOMNodeImpl.h IXMLDOMNodeImpl.inl
                        IXMLDOMTextImpl.h NodeContainerImpl.h xml4com.cpp
                        XMLDOMAttribute.cpp XMLDOMAttribute.h
                        XMLDOMCDATASection.h XMLDOMComment.h
                        XMLDOMDocument.cpp XMLDOMDocument.h
                        XMLDOMDocumentFragment.h XMLDOMDocumentType.cpp
                        XMLDOMDocumentType.h XMLDOMElement.cpp
                        XMLDOMElement.h XMLDOMEntity.cpp XMLDOMEntity.h
                        XMLDOMEntityReference.h XMLDOMImplementation.cpp
                        XMLDOMImplementation.h XMLDOMNamedNodeMap.cpp
                        XMLDOMNamedNodeMap.h XMLDOMNodeList.cpp
                        XMLDOMNodeList.h XMLDOMNotation.cpp
                        XMLDOMNotation.h XMLDOMProcessingInstruction.cpp
                        XMLDOMProcessingInstruction.h XMLDOMText.h
                        XMLDOMUtil.cpp XMLDOMUtil.h XMLDOMXMLDecl.cpp
                        XMLDOMXMLDecl.h XMLHttpRequest.h
  Log:
  The COM wrapper doesn't use the deprecated DOM anymore
  
  Revision  Changes    Path
  1.4       +13 -22    xml-xerces/c/src/xercesc/com/IXMLDOMCharacterDataImpl.h
  
  Index: IXMLDOMCharacterDataImpl.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/IXMLDOMCharacterDataImpl.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IXMLDOMCharacterDataImpl.h	21 Nov 2003 12:05:48 -0000	1.3
  +++ IXMLDOMCharacterDataImpl.h	25 Feb 2004 18:38:33 -0000	1.4
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.4  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.3  2003/11/21 12:05:48  amassari
    * Updated version to 2.4
    *
  @@ -82,20 +85,10 @@
   template <class T, const IID* piid, class tihclass = CComTypeInfoHolder>
   class ATL_NO_VTABLE IXMLDOMCharacterDataImpl: public IXMLDOMNodeImpl<T,piid,tihclass>
   {
  -private:
  -	XMLCh* DOMStringToXMLCh(DOMString str)
  -	{
  -		XMLCh* cdata = new XMLCh[str.length()+1];
  -		for (unsigned int i=0; i < str.length(); i++)
  -			cdata[i] = str.charAt(i);
  -		cdata[str.length()] = 0;
  -		return cdata;
  -	}
  -
   public:
   
  -	virtual DOM_CharacterData& get_DOM_CharacterData() = 0; 
  -	virtual DOM_Node& get_DOM_Node() { return get_DOM_CharacterData(); } 
  +	virtual DOMCharacterData* get_DOMCharacterData() = 0; 
  +	virtual DOMNode* get_DOMNode() { return get_DOMCharacterData(); } 
   
   	// IXMLDOMCharacterData 
   
  @@ -110,8 +103,7 @@
   	
   	try
   	{
  -		//*pVal = SysAllocString(get_DOM_CharacterData().getData().rawBuffer());
  -		*pVal = SysAllocString(DOMStringToXMLCh(get_DOM_CharacterData().getData()));
  +		*pVal = SysAllocString(get_DOMCharacterData()->getData());
   	}
   	catch(...)
   	{
  @@ -128,7 +120,7 @@
   
   	try
   	{
  -		get_DOM_CharacterData().setData(newVal);
  +		get_DOMCharacterData()->setData(newVal);
   	}
   	catch(...)
   	{
  @@ -150,7 +142,7 @@
   
   	try
   	{
  -		*pVal = get_DOM_CharacterData().getLength();
  +		*pVal = get_DOMCharacterData()->getLength();
   	}
   	catch(...)
   	{
  @@ -171,8 +163,7 @@
   
   	try
   	{
  -		// need to copy the string to a new buffer since DOMString doesn't null terminate the substring.
  -		*data = SysAllocString(DOMStringToXMLCh(get_DOM_CharacterData().substringData(offset, count)));
  +        *data = SysAllocString(get_DOMCharacterData()->substringData(offset, count));
   	}
   	catch(...)
   	{
  @@ -188,7 +179,7 @@
   
   	try
   	{
  -		get_DOM_CharacterData().appendData(data);
  +		get_DOMCharacterData()->appendData(data);
   	}
   	catch(...)
   	{
  @@ -205,7 +196,7 @@
   
   	try
   	{
  -		get_DOM_CharacterData().insertData(offset, data);
  +		get_DOMCharacterData()->insertData(offset, data);
   	}
   	catch(...)
   	{
  @@ -222,7 +213,7 @@
   
   	try
   	{
  -		get_DOM_CharacterData().deleteData(offset, count);
  +		get_DOMCharacterData()->deleteData(offset, count);
   	}
   	catch(...)
   	{
  @@ -239,7 +230,7 @@
   
   	try
   	{
  -		get_DOM_CharacterData().replaceData(offset, count, data);
  +		get_DOMCharacterData()->replaceData(offset, count, data);
   	}
   	catch(...)
   	{
  
  
  
  1.5       +7 -5      xml-xerces/c/src/xercesc/com/IXMLDOMNodeImpl.h
  
  Index: IXMLDOMNodeImpl.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/IXMLDOMNodeImpl.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- IXMLDOMNodeImpl.h	12 Feb 2004 13:49:43 -0000	1.4
  +++ IXMLDOMNodeImpl.h	25 Feb 2004 18:38:33 -0000	1.5
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.5  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.4  2004/02/12 13:49:43  amassari
    * Updated version to 2.5
    *
  @@ -93,7 +96,7 @@
   #define ___ixmldomnodeimpl_h___
   
   #include <xercesc/util/XercesDefs.hpp>
  -#include <xercesc/dom/deprecated/DOM_DOMException.hpp>
  +#include <xercesc/dom/DOMException.hpp>
   XERCES_CPP_NAMESPACE_USE
   
   
  @@ -124,7 +127,7 @@
   		:m_pIXMLDOMDocument(NULL)
   	{}
   
  -	virtual DOM_Node& get_DOM_Node()		    = 0;
  +	virtual DOMNode* get_DOMNode()		    = 0;
   	virtual DOMNodeType get_DOMNodeType() const = 0;
   
   	void	SetOwnerDoc(IXMLDOMDocument	*p)
  @@ -142,7 +145,7 @@
   		if (NULL == pVal)
   			return E_POINTER;
   
  -		*pVal = reinterpret_cast<long> (&get_DOM_Node());
  +		*pVal = reinterpret_cast<long> (get_DOMNode());
   		return S_OK;
   	}
   
  @@ -202,8 +205,7 @@
   
   };
   
  -class XERCES_CPP_NAMESPACE_QUALIFIER DOM_DOMException;
  -HRESULT MakeHRESULT(DOM_DOMException& ex);
  +HRESULT MakeHRESULT(DOMException& ex);
   
   #include "IXMLDOMNodeImpl.inl"
   
  
  
  
  1.6       +70 -75    xml-xerces/c/src/xercesc/com/IXMLDOMNodeImpl.inl
  
  Index: IXMLDOMNodeImpl.inl
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/IXMLDOMNodeImpl.inl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- IXMLDOMNodeImpl.inl	21 Nov 2003 12:05:48 -0000	1.5
  +++ IXMLDOMNodeImpl.inl	25 Feb 2004 18:38:33 -0000	1.6
  @@ -59,12 +59,13 @@
    */
   
   
  -#include <xercesc/dom/deprecated/DOM_Node.hpp>
  -#include <xercesc/dom/deprecated/DOM_Document.hpp>
  +#include <xercesc/dom/DOMNode.hpp>
  +#include <xercesc/dom/DOMDocument.hpp>
  +#include <xercesc/dom/DOMText.hpp>
   #include "XMLDOMNodeList.h"
   #include "XMLDOMNamedNodeMap.h"
   #include "XMLDOMUtil.h"
  -#include <xercesc/dom/deprecated/DOM_DOMException.hpp>
  +#include <xercesc/dom/DOMException.hpp>
   
   XERCES_CPP_NAMESPACE_USE
   
  @@ -88,10 +89,9 @@
   
   	try
   	{
  -		DOMString val = get_DOM_Node().getNodeName();
  -		*pVal = SysAllocStringLen(val.rawBuffer(),val.length());
  +		*pVal = SysAllocString(get_DOMNode()->getNodeName());
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -117,17 +117,16 @@
   
   	try
   	{
  -		DOMString val = get_DOM_Node().getNodeValue();
  +        const XMLCh* val=get_DOMNode()->getNodeValue();
   		if (val != 0)
   		{
   			V_VT(pVal)   = VT_BSTR;
  -
  -			V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
  +			V_BSTR(pVal) = SysAllocString(val);
   		}
   		else
   			V_VT(pVal) = VT_NULL;
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -149,17 +148,17 @@
   	{
   		if(V_VT(&newVal) == VT_BSTR)
   		{
  -			get_DOM_Node().setNodeValue(V_BSTR(&newVal));
  +			get_DOMNode()->setNodeValue(V_BSTR(&newVal));
   		}
   		//
   		//   coerce to BSTR or throw error
   		//
   		else
   		{
  -			get_DOM_Node().setNodeValue((BSTR) (_bstr_t) newVal);
  +			get_DOMNode()->setNodeValue((BSTR) (_bstr_t) newVal);
   		}
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -200,12 +199,12 @@
   
   	try
   	{
  -		DOM_Node n = get_DOM_Node().getParentNode();
  -		if(!n.isNull()) {
  +		DOMNode* n = get_DOMNode()->getParentNode();
  +		if(n!=NULL) {
   			hr = wrapNode(m_pIXMLDOMDocument, n,IID_IXMLDOMNode,reinterpret_cast<LPVOID *> (pVal));
   		}
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -239,9 +238,9 @@
   
   	try
   	{
  -		pObj->m_container = get_DOM_Node().getChildNodes();
  +		pObj->m_container = get_DOMNode()->getChildNodes();
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		pObj->Release();
   		return MakeHRESULT(ex);
  @@ -275,14 +274,14 @@
   
   	try
   	{
  -		DOM_Node n = get_DOM_Node().getFirstChild();
  +		DOMNode* n = get_DOMNode()->getFirstChild();
   		//
   		//   returns Nothing if no children
   		//
  -		if(!n.isNull())
  +		if(n!=NULL)
   			hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -310,11 +309,11 @@
   
   	try
   	{
  -		DOM_Node n = get_DOM_Node().getLastChild();
  -		if(!n.isNull())
  +		DOMNode* n = get_DOMNode()->getLastChild();
  +		if(n!=NULL)
   			hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -341,11 +340,11 @@
   
   	try
   	{
  -		DOM_Node n = get_DOM_Node().getPreviousSibling();
  -		if(!n.isNull())
  +		DOMNode* n = get_DOMNode()->getPreviousSibling();
  +		if(n!=NULL)
   			hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -373,11 +372,11 @@
   
   	try
   	{
  -		DOM_Node n = get_DOM_Node().getNextSibling();
  -		if(!n.isNull())
  +		DOMNode* n = get_DOMNode()->getNextSibling();
  +		if(n!=NULL)
   			hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -400,12 +399,12 @@
   
   	*pVal = NULL;
   
  -	DOM_NamedNodeMap map;
  +	DOMNamedNodeMap* map=NULL;
   	try
   	{
  -		map = get_DOM_Node().getAttributes();
  +		map = get_DOMNode()->getAttributes();
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -466,7 +465,7 @@
   	if (S_OK != hr)
   		return hr;
   
  -	DOM_Node *pNewChildNode = reinterpret_cast<DOM_Node*> (id);
  +	DOMNode *pNewChildNode = reinterpret_cast<DOMNode*> (id);
   	if (NULL == pNewChildNode)
   		return E_INVALIDARG;
   
  @@ -479,16 +478,16 @@
   	if (S_OK != hr)
   		return hr;
   
  -	DOM_Node *pRefChildNode = reinterpret_cast<DOM_Node*> (id);
  +	DOMNode *pRefChildNode = reinterpret_cast<DOMNode*> (id);
   	if (NULL == pRefChildNode)
   		return E_INVALIDARG;
   
   	try
   	{
  -		DOM_Node n = get_DOM_Node().insertBefore(*pNewChildNode, *pRefChildNode);
  +		DOMNode* n = get_DOMNode()->insertBefore(pNewChildNode, pRefChildNode);
   		hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (outNewChild));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -527,7 +526,7 @@
   	if (S_OK != hr)
   		return hr;
   
  -	DOM_Node *pNewChildNode = reinterpret_cast<DOM_Node*> (id);
  +	DOMNode *pNewChildNode = reinterpret_cast<DOMNode*> (id);
   	if (NULL == pNewChildNode)
   		return E_INVALIDARG;
   
  @@ -540,16 +539,16 @@
   	if (S_OK != hr)
   		return hr;
   
  -	DOM_Node *pOldChildNode = reinterpret_cast<DOM_Node*> (id);
  +	DOMNode *pOldChildNode = reinterpret_cast<DOMNode*> (id);
   	if (NULL == pOldChildNode)
   		return E_INVALIDARG;
   
   	try
   	{
  -		DOM_Node n = get_DOM_Node().replaceChild(*pNewChildNode, *pOldChildNode);
  +		DOMNode* n = get_DOMNode()->replaceChild(pNewChildNode, pOldChildNode);
   		hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (outNewChild));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -584,17 +583,17 @@
   	if (S_OK != hr)
   		return hr;
   
  -	DOM_Node *pChildNode = reinterpret_cast<DOM_Node*> (id);
  +	DOMNode *pChildNode = reinterpret_cast<DOMNode*> (id);
   	if (NULL == pChildNode)
   		return E_INVALIDARG;
   
   	try
   	{
  -		DOM_Node n = get_DOM_Node().removeChild(*pChildNode);
  -		if(!n.isNull())
  +		DOMNode* n = get_DOMNode()->removeChild(pChildNode);
  +		if(n!=NULL)
   			hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (oldChild));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -629,16 +628,16 @@
   	if (S_OK != hr)
   		return hr;
   
  -	DOM_Node *pNewChildNode = reinterpret_cast<DOM_Node*> (id);
  +	DOMNode *pNewChildNode = reinterpret_cast<DOMNode*> (id);
   	if (NULL == pNewChildNode)
   		return E_INVALIDARG;
   
   	try
   	{
  -		DOM_Node n = get_DOM_Node().appendChild(*pNewChildNode);
  +		DOMNode* n = get_DOMNode()->appendChild(pNewChildNode);
   		hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (outNewChild));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -663,9 +662,9 @@
   
   	try
   	{
  -		*hasChild = (get_DOM_Node().hasChildNodes()) ? VARIANT_TRUE : VARIANT_FALSE;
  +		*hasChild = (get_DOMNode()->hasChildNodes()) ? VARIANT_TRUE : VARIANT_FALSE;
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -710,9 +709,9 @@
   
   	try
   	{
  -		hr = wrapNode(m_pIXMLDOMDocument,get_DOM_Node().cloneNode((VARIANT_TRUE == deep) ? true : false),IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
  +		hr = wrapNode(m_pIXMLDOMDocument,get_DOMNode()->cloneNode((VARIANT_TRUE == deep) ? true : false),IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -750,8 +749,7 @@
   	if (NULL == pVal)
   		return E_POINTER;
   
  -	DOMString val = GetText(get_DOM_Node());
  -	*pVal = SysAllocStringLen(val.rawBuffer(),val.length());
  +	*pVal = SysAllocString(get_DOMNode()->getTextContent());
   
   	return S_OK;
   }
  @@ -777,21 +775,21 @@
   			//
   			//   remove all child elements
   			//
  -			DOM_Node elem = get_DOM_Node();
  -			DOM_Node child = elem.getLastChild();
  -			while(!child.isNull())
  +			DOMNode* elem = get_DOMNode();
  +			DOMNode* child = elem->getLastChild();
  +			while(child!=NULL)
   			{
  -				elem.removeChild(child);
  -				child = elem.getLastChild();
  +				elem->removeChild(child);
  +				child = elem->getLastChild();
   			}
   			
  -			DOM_Document doc = elem.getOwnerDocument();
  -			elem.appendChild(doc.createTextNode(newVal));
  +			XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument* doc = elem->getOwnerDocument();
  +			elem->appendChild(doc->createTextNode(newVal));
   		}
   		else
  -			get_DOM_Node().setNodeValue(newVal);
  +			get_DOMNode()->setNodeValue(newVal);
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -873,9 +871,9 @@
   	_bstr_t text;
   	
   	try {
  -		GetXML(get_DOM_Node(),text);
  +		GetXML(get_DOMNode(),text);
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -941,10 +939,9 @@
   	*pVal = NULL;
   
   	try {
  -		DOMString val = get_DOM_Node().getNamespaceURI();
  -		*pVal = SysAllocStringLen(val.rawBuffer(),val.length());
  +		*pVal = SysAllocString(get_DOMNode()->getNamespaceURI());
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -968,10 +965,9 @@
   	*pVal = NULL;
   
   	try {
  -		DOMString val = get_DOM_Node().getPrefix();
  -		*pVal = SysAllocStringLen(val.rawBuffer(),val.length());
  +		*pVal = SysAllocString(get_DOMNode()->getPrefix());
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -995,10 +991,9 @@
   	*pVal = NULL;
   
   	try {
  -		DOMString val = get_DOM_Node().getLocalName();
  -		*pVal = SysAllocStringLen(val.rawBuffer(),val.length());
  +		*pVal = SysAllocString(get_DOMNode()->getLocalName());
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  
  
  
  1.3       +6 -3      xml-xerces/c/src/xercesc/com/IXMLDOMTextImpl.h
  
  Index: IXMLDOMTextImpl.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/IXMLDOMTextImpl.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IXMLDOMTextImpl.h	21 Nov 2003 12:05:48 -0000	1.2
  +++ IXMLDOMTextImpl.h	25 Feb 2004 18:38:33 -0000	1.3
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.3  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.2  2003/11/21 12:05:48  amassari
    * Updated version to 2.4
    *
  @@ -78,8 +81,8 @@
   {
   public:
   
  -	virtual DOM_Text& get_DOM_Text() = 0; 
  -	virtual DOM_CharacterData& get_DOM_CharacterData() { return get_DOM_Text(); } 
  +	virtual DOMText* get_DOMText() = 0; 
  +	virtual DOMCharacterData* get_DOMCharacterData() { return get_DOMText(); } 
   
   	// IXMLDOMText
   
  @@ -96,7 +99,7 @@
   
   	try
   	{
  -		hr = wrapNode(m_pIXMLDOMDocument,get_DOM_Text().splitText(offset),IID_IXMLDOMText, reinterpret_cast<LPVOID *> (rightHandTextNode));
  +		hr = wrapNode(m_pIXMLDOMDocument,get_DOMText()->splitText(offset),IID_IXMLDOMText, reinterpret_cast<LPVOID *> (rightHandTextNode));
   	}
   	catch(...)
   	{
  
  
  
  1.2       +8 -8      xml-xerces/c/src/xercesc/com/NodeContainerImpl.h
  
  Index: NodeContainerImpl.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/NodeContainerImpl.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NodeContainerImpl.h	1 Feb 2002 22:21:40 -0000	1.1
  +++ NodeContainerImpl.h	25 Feb 2004 18:38:33 -0000	1.2
  @@ -70,7 +70,7 @@
   	{
   	public:
   		iterator()
  -			:m_container()
  +			:m_container(NULL)
   			,m_NextNodeIndex(0)
   			,m_pIXMLDOMDocument(NULL)
   		{
  @@ -78,7 +78,7 @@
   			V_VT(&m_NextVar) = VT_NULL;
   		}	
   
  -		iterator(const T& container,int idx,IXMLDOMDocument *p)
  +		iterator(const T* container,int idx,IXMLDOMDocument *p)
   			:m_container(container)
   			,m_NextNodeIndex(idx)
   			,m_pIXMLDOMDocument(p)
  @@ -125,12 +125,12 @@
   			if (m_container == 0)
   				return m_NextVar;
   
  -			int length = m_container.getLength(); 
  +			int length = m_container->getLength(); 
   			if (m_NextNodeIndex >= length)
   				return m_NextVar;
   			
   			CComPtr<IXMLDOMNode> pNode;
  -			HRESULT hr = wrapNode(m_pIXMLDOMDocument,m_container.item(m_NextNodeIndex),IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (&pNode));
  +			HRESULT hr = wrapNode(m_pIXMLDOMDocument,m_container->item(m_NextNodeIndex),IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (&pNode));
   			if (S_OK == hr) {
   				CComQIPtr<IDispatch,&IID_IDispatch> pDisp(pNode);
   				if (pNode) {
  @@ -150,7 +150,7 @@
   		
   	private:
   
  -		T				 m_container;	
  +		const T*		 m_container;	
   		int			     m_NextNodeIndex;
   		IXMLDOMDocument	*m_pIXMLDOMDocument;
   		VARIANT			 m_NextVar;
  @@ -171,7 +171,7 @@
   		if (m_container == 0)
   			return iterator(m_container,0,m_pIXMLDOMDocument);
   		else	
  -			return iterator(m_container,m_container.getLength(),m_pIXMLDOMDocument);
  +			return iterator(m_container,m_container->getLength(),m_pIXMLDOMDocument);
   	}
   	
   	void	SetOwnerDoc(IXMLDOMDocument	*p)
  @@ -181,7 +181,7 @@
   			m_pIXMLDOMDocument->AddRef();
   	}
   
  -	T				 m_container;
  +	T*				 m_container;
   
   protected:
   
  
  
  
  1.3       +10 -9     xml-xerces/c/src/xercesc/com/xml4com.cpp
  
  Index: xml4com.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/xml4com.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xml4com.cpp	21 May 2002 19:53:53 -0000	1.2
  +++ xml4com.cpp	25 Feb 2004 18:38:33 -0000	1.3
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.3  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.2  2002/05/21 19:53:53  tng
    * DOM Reorganization: update include path for the old DOM interface in COM files
    *
  @@ -111,7 +114,7 @@
   
   #include <xercesc/util/PlatformUtils.hpp>
   #include "xml4com.h"
  -#include <xercesc/dom/deprecated/DOM_DOMException.hpp>
  +#include <xercesc/dom/DOMException.hpp>
   
   //
   //
  @@ -119,9 +122,6 @@
   //       generated by compiling MSXML.IDL using the MIDL compiler
   //        (and removing CLSID_DOMDocument, CLSID_XMLHttpRequest, et al)
   //
  -const IID LIBID_MSXML = {0xd63e0ce2,0xa0a2,0x11d0,{0x9c,0x02,0x00,0xc0,0x4f,0xc9,0x9c,0x8e}};
  -
  -
   const IID IID_IXMLDOMImplementation = {0x2933BF8F,0x7B36,0x11d2,{0xB2,0x0E,0x00,0xC0,0x4F,0x98,0x3E,0x60}};
   
   
  @@ -320,22 +320,23 @@
   	OLESTR("INVALID_MODIFICATION_ERR"),   // 	INVALID_MODIFICATION_ERR =  13
   	OLESTR("NAMESPACE_ERR"),   // 	NAMESPACE_ERR	 =  14
   	OLESTR("INVALID_ACCESS_ERR") // INVALID_ACCESS_ERR   = 15
  +    OLESTR("VALIDATION_ERR") // VALIDATION_ERR = 16
   };
   
   //
   //
   //   makes an HRESULT with a code based on the DOM error code
   //
  -HRESULT MakeHRESULT(DOM_DOMException& ex)
  +HRESULT MakeHRESULT(DOMException& ex)
   {
   	ICreateErrorInfo* pCErr = NULL;
   	HRESULT sc = CreateErrorInfo(&pCErr);
   	if(SUCCEEDED(sc)) {
  -		DOMString msg = ex.msg;
  +		const XMLCh* msg = ex.msg;
   		if(msg == NULL)
   		{
  -			if(ex.code >= DOM_DOMException::INDEX_SIZE_ERR &&
  -				ex.code <= DOM_DOMException::INVALID_ACCESS_ERR)
  +			if(ex.code >= DOMException::INDEX_SIZE_ERR &&
  +				ex.code <= DOMException::VALIDATION_ERR)
   			{
   				sc = pCErr->SetDescription(Msgs[ex.code]);
   			}
  @@ -346,7 +347,7 @@
   		}
   		else
   		{
  -			sc = pCErr->SetDescription((BSTR) ex.msg.rawBuffer());
  +			sc = pCErr->SetDescription(SysAllocString(ex.msg));
   		}
   
   		IErrorInfo* pErr = NULL;
  
  
  
  1.2       +13 -16    xml-xerces/c/src/xercesc/com/XMLDOMAttribute.cpp
  
  Index: XMLDOMAttribute.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMAttribute.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLDOMAttribute.cpp	1 Feb 2002 22:21:40 -0000	1.1
  +++ XMLDOMAttribute.cpp	25 Feb 2004 18:38:33 -0000	1.2
  @@ -72,10 +72,9 @@
   
   	try
   	{
  -		DOMString val = attr.getName();
  -		*pVal = SysAllocStringLen(val.rawBuffer(),val.length());
  +		*pVal = SysAllocString(attr->getName());
   	}
  -	catch(DOM_DOMException& ex) {
  +	catch(DOMException& ex) {
   		return MakeHRESULT(ex);
   	}
   	catch(...)
  @@ -98,11 +97,10 @@
   
   	try
   	{
  -		DOMString val = attr.getValue();
   		V_VT(pVal)   = VT_BSTR;
  -		V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
  +		V_BSTR(pVal) = SysAllocString(attr->getValue());
   	}
  -	catch(DOM_DOMException& ex) {
  +	catch(DOMException& ex) {
   		return MakeHRESULT(ex);
   	}
   	catch(...)
  @@ -121,15 +119,15 @@
   	try
   	{
   		if(V_VT(&newVal) == VT_BSTR) {
  -			attr.setValue(V_BSTR(&newVal));
  +			attr->setValue(V_BSTR(&newVal));
   		}
   		else {
  -			attr.setValue((BSTR) (_bstr_t) newVal);
  +			attr->setValue((BSTR) (_bstr_t) newVal);
   		}
   
  -		attr.setValue(V_BSTR(&newVal));
  +		attr->setValue(V_BSTR(&newVal));
   	}
  -	catch(DOM_DOMException& ex) {
  +	catch(DOMException& ex) {
   		return MakeHRESULT(ex);
   	}
   	catch(...)
  @@ -147,9 +145,9 @@
   
   	try
   	{
  -		*pVal = attr.getSpecified() ? VARIANT_TRUE : VARIANT_FALSE;
  +		*pVal = attr->getSpecified() ? VARIANT_TRUE : VARIANT_FALSE;
   	}
  -	catch(DOM_DOMException& ex) {
  +	catch(DOMException& ex) {
   		return MakeHRESULT(ex);
   	}
   	catch(...)
  @@ -172,11 +170,10 @@
   
   	try
   	{
  -		DOMString val = attr.getValue();
   		V_VT(pVal)   = VT_BSTR;
  -		V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
  +		V_BSTR(pVal) = SysAllocString(attr->getValue());
   	}
  -	catch(DOM_DOMException& ex) {
  +	catch(DOMException& ex) {
   		return MakeHRESULT(ex);
   	}
   	catch(...)
  
  
  
  1.6       +4 -4      xml-xerces/c/src/xercesc/com/XMLDOMAttribute.h
  
  Index: XMLDOMAttribute.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMAttribute.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLDOMAttribute.h	21 Nov 2003 12:05:48 -0000	1.5
  +++ XMLDOMAttribute.h	25 Feb 2004 18:38:33 -0000	1.6
  @@ -61,7 +61,7 @@
   #ifndef ___xmldomattribute_h___
   #define ___xmldomattribute_h___
   
  -#include <xercesc/dom/deprecated/DOM_Attr.hpp>
  +#include <xercesc/dom/DOMAttr.hpp>
   #include "IXMLDOMNodeImpl.h"
   XERCES_CPP_NAMESPACE_USE
   
  @@ -78,7 +78,7 @@
   		ReleaseOwnerDoc();
   	}
   
  -	virtual DOM_Node& get_DOM_Node()			 { return attr;}
  +	virtual DOMNode* get_DOMNode()			 { return attr;}
   	virtual DOMNodeType get_DOMNodeType() const  { return NODE_ATTRIBUTE; }
   
   DECLARE_NOT_AGGREGATABLE(CXMLDOMAttribute)
  @@ -107,7 +107,7 @@
   	//
   	STDMETHOD(get_nodeValue)(VARIANT* pVal);
   
  -	DOM_Attr attr;
  +	DOMAttr* attr;
   };
   
   typedef CComObject<CXMLDOMAttribute> CXMLDOMAttributeObj;
  
  
  
  1.6       +6 -3      xml-xerces/c/src/xercesc/com/XMLDOMCDATASection.h
  
  Index: XMLDOMCDATASection.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMCDATASection.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLDOMCDATASection.h	21 Nov 2003 12:05:48 -0000	1.5
  +++ XMLDOMCDATASection.h	25 Feb 2004 18:38:33 -0000	1.6
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.6  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.5  2003/11/21 12:05:48  amassari
    * Updated version to 2.4
    *
  @@ -94,7 +97,7 @@
   #ifndef ___xmldomcdatasection_h___
   #define ___xmldomcdatasection_h___
   
  -#include <xercesc/dom/deprecated/DOM_CDATASection.hpp>
  +#include <xercesc/dom/DOMCDATASection.hpp>
   #include "IXMLDOMTextImpl.h"
   XERCES_CPP_NAMESPACE_USE
   
  @@ -111,7 +114,7 @@
   		ReleaseOwnerDoc();
   	}
   
  -	virtual DOM_Text& get_DOM_Text()			 { return cdataSection;}
  +	virtual DOMText* get_DOMText()			 { return cdataSection;}
   	virtual DOMNodeType get_DOMNodeType() const  { return NODE_CDATA_SECTION; }
   
   DECLARE_NOT_AGGREGATABLE(CXMLDOMCDATASection)
  @@ -128,7 +131,7 @@
   	COM_INTERFACE_ENTRY(IDispatch)
   END_COM_MAP()
   
  -	DOM_CDATASection cdataSection;
  +	DOMCDATASection* cdataSection;
   };
   
   typedef CComObject<CXMLDOMCDATASection> CXMLDOMCDATASectionObj;
  
  
  
  1.6       +6 -3      xml-xerces/c/src/xercesc/com/XMLDOMComment.h
  
  Index: XMLDOMComment.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMComment.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLDOMComment.h	21 Nov 2003 12:05:48 -0000	1.5
  +++ XMLDOMComment.h	25 Feb 2004 18:38:33 -0000	1.6
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.6  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.5  2003/11/21 12:05:48  amassari
    * Updated version to 2.4
    *
  @@ -94,7 +97,7 @@
   #ifndef ___xmldomcomment_h___
   #define ___xmldomcomment_h___
   
  -#include <xercesc/dom/deprecated/DOM_Comment.hpp>
  +#include <xercesc/dom/DOMComment.hpp>
   #include "IXMLDOMCharacterDataImpl.h"
   
   XERCES_CPP_NAMESPACE_USE
  @@ -112,7 +115,7 @@
   		ReleaseOwnerDoc();
   	}
   
  -	virtual DOM_CharacterData& get_DOM_CharacterData()  { return comment;}
  +	virtual DOMCharacterData* get_DOMCharacterData()  { return comment;}
   	virtual DOMNodeType get_DOMNodeType() const			{ return NODE_COMMENT; }
   	
   DECLARE_NOT_AGGREGATABLE(CXMLDOMComment)
  @@ -127,7 +130,7 @@
   	COM_INTERFACE_ENTRY(IDispatch)
   END_COM_MAP()
   
  -	DOM_Comment comment;
  +	DOMComment* comment;
   };
   
   typedef CComObject<CXMLDOMComment> CXMLDOMCommentObj;
  
  
  
  1.5       +61 -60    xml-xerces/c/src/xercesc/com/XMLDOMDocument.cpp
  
  Index: XMLDOMDocument.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMDocument.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XMLDOMDocument.cpp	2 Dec 2003 14:33:13 -0000	1.4
  +++ XMLDOMDocument.cpp	25 Feb 2004 18:38:33 -0000	1.5
  @@ -60,9 +60,10 @@
   
   #include "stdafx.h"
   
  -#include <xercesc/dom/deprecated/DOMParser.hpp>
  +#include <xercesc/parsers/XercesDOMParser.hpp>
   #include <xercesc/sax/SAXParseException.hpp>
   #include <xercesc/framework/MemBufInputSource.hpp>
  +#include <xercesc/dom/DOMImplementation.hpp>
   
   #include "xml4com.h"
   #include "XMLDOMDocument.h"
  @@ -80,7 +81,6 @@
   #include "XMLDOMAttribute.h"
   #include "XMLDOMEntityReference.h"
   #include "BindStatusCallback.h"
  -#include <xercesc/dom/deprecated/DocumentImpl.hpp>
   
   // I need to make sure the file is registered with long filenames
   HRESULT WINAPI CXMLDOMDocument::UpdateRegistry(BOOL bRegister)
  @@ -110,7 +110,7 @@
   }
   
   CXMLDOMDocument::CXMLDOMDocument()
  -	:m_Document					()
  +	:m_Document					(NULL)
   	,m_bValidate				(false)
   	,m_lReadyState				(0)
   	,m_url						(_T(""))
  @@ -126,6 +126,7 @@
   	,m_bParseError				(false)
   	,m_bThreadValidate			(false)
   	,m_bPreserveWhiteSpace      (false)
  +    ,m_TmpDocument              (NULL)
   {
   }
   
  @@ -144,7 +145,7 @@
   	m_pParseError->AddRef();
   	m_pIXMLDOMDocument = this;
   
  -	m_Document = DOM_Document::createDocument();
  +    m_Document = DOMImplementation::getImplementation()->createDocument();
   
   	return hr;
   }
  @@ -255,12 +256,12 @@
   		return E_POINTER;
   
   	*pVal = NULL;
  -	DOM_DocumentType doctype = m_Document.getDoctype();
  +	DOMDocumentType* doctype = m_Document->getDoctype();
   
   	//
   	//   if the document had no doctype then return a null object
   	//
  -	if(doctype.isNull())
  +	if(doctype==NULL)
   		return S_OK;
   
   	CXMLDOMDocumentTypeObj *pObj = NULL;
  @@ -332,9 +333,9 @@
   
   	try
   	{
  -		pObj->element = m_Document.getDocumentElement();
  +		pObj->element = m_Document->getDocumentElement();
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		pObj->Release();
   		return MakeHRESULT(ex);
  @@ -357,17 +358,17 @@
   {
   	ATLTRACE(_T("CXMLDOMDocument::putref_documentElement\n"));
   
  -	DOM_Element elem;
  +	DOMElement* elem;
   
   	try
   	{
  -		elem = m_Document.getDocumentElement();
  -		if (NULL == newVal && !elem.isNull()) {
  -			m_Document.removeChild(elem);
  +		elem = m_Document->getDocumentElement();
  +		if (NULL == newVal && elem!=NULL) {
  +			m_Document->removeChild(elem);
   			return S_OK;
   		}
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -385,18 +386,18 @@
   	if (S_OK != hr)
   		return hr;
   
  -	DOM_Node *pNewValNode = reinterpret_cast<DOM_Node*> (id);
  +	DOMNode *pNewValNode = reinterpret_cast<DOMNode*> (id);
   	if (NULL == pNewValNode)
   		return E_INVALIDARG;
   
   	try
   	{
  -		if(elem.isNull())
  -			m_Document.appendChild(*pNewValNode);
  +		if(elem==NULL)
  +			m_Document->appendChild(pNewValNode);
   		else
  -			m_Document.replaceChild(*pNewValNode, elem);
  +			m_Document->replaceChild(pNewValNode, elem);
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -427,9 +428,9 @@
   
   	try
   	{
  -		pObj->element = m_Document.createElement(tagName);
  +		pObj->element = m_Document->createElement(tagName);
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		pObj->Release();
   		return MakeHRESULT(ex);
  @@ -467,9 +468,9 @@
   
   	try
   	{
  -		pObj->documentFragment = m_Document.createDocumentFragment();
  +		pObj->documentFragment = m_Document->createDocumentFragment();
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		pObj->Release();
   		return MakeHRESULT(ex);
  @@ -507,9 +508,9 @@
   
   	try
   	{
  -		pObj->text = m_Document.createTextNode(data);
  +		pObj->text = m_Document->createTextNode(data);
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		pObj->Release();
   		return MakeHRESULT(ex);
  @@ -547,9 +548,9 @@
   
   	try
   	{
  -		pObj->comment = m_Document.createComment(data);
  +		pObj->comment = m_Document->createComment(data);
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		pObj->Release();
   		return MakeHRESULT(ex);
  @@ -587,9 +588,9 @@
   
   	try
   	{
  -		pObj->cdataSection = m_Document.createCDATASection(data);
  +		pObj->cdataSection = m_Document->createCDATASection(data);
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		pObj->Release();
   		return MakeHRESULT(ex);
  @@ -627,9 +628,9 @@
   
   	try
   	{
  -		pObj->processingInstruction = m_Document.createProcessingInstruction(target, data);
  +		pObj->processingInstruction = m_Document->createProcessingInstruction(target, data);
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		pObj->Release();
   		return MakeHRESULT(ex);
  @@ -667,9 +668,9 @@
   
   	try
   	{
  -		pObj->attr = m_Document.createAttribute(name);
  +		pObj->attr = m_Document->createAttribute(name);
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		pObj->Release();
   		return MakeHRESULT(ex);
  @@ -707,9 +708,9 @@
   
   	try
   	{
  -		pObj->entityReference = m_Document.createEntityReference(name);
  +		pObj->entityReference = m_Document->createEntityReference(name);
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		pObj->Release();
   		return MakeHRESULT(ex);
  @@ -747,9 +748,9 @@
   
   	try
   	{
  -		pObj->m_container = m_Document.getElementsByTagName(tagName);
  +		pObj->m_container = m_Document->getElementsByTagName(tagName);
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		pObj->Release();
   		return MakeHRESULT(ex);
  @@ -815,59 +816,59 @@
   	switch(nodeType) {
   		case NODE_ELEMENT:
   		{
  -			DOM_Element node;
  +			DOMElement* node;
   			if (SysStringLen(namespaceURI) > 0)
  -				node = m_Document.createElementNS(namespaceURI,name);
  +				node = m_Document->createElementNS(namespaceURI,name);
   			else
  -				node = m_Document.createElement(name);
  +				node = m_Document->createElement(name);
   			
   			hr = wrapNode(m_pIXMLDOMDocument,node,IID_IXMLDOMNode,reinterpret_cast<LPVOID *> (pVal));
   			break;
   		}
   		case NODE_ATTRIBUTE:
   		{
  -			DOM_Attr node;
  +			DOMAttr* node;
   			if (SysStringLen(namespaceURI) > 0)
  -				node = m_Document.createAttributeNS(namespaceURI,name);
  +				node = m_Document->createAttributeNS(namespaceURI,name);
   			else
  -				node = m_Document.createAttribute(name);
  +				node = m_Document->createAttribute(name);
   
   			hr = wrapNode(m_pIXMLDOMDocument,node,IID_IXMLDOMNode,reinterpret_cast<LPVOID *> (pVal));
   			break;
   		}
   		case NODE_TEXT:
   		{
  -			DOM_Text node = m_Document.createTextNode(OLESTR(""));
  +			DOMText* node = m_Document->createTextNode(OLESTR(""));
   			hr = wrapNode(m_pIXMLDOMDocument,node,IID_IXMLDOMNode,reinterpret_cast<LPVOID *> (pVal));
   			break;
   		}
   		case NODE_CDATA_SECTION:
   		{
  -			DOM_CDATASection node = m_Document.createCDATASection(OLESTR(""));
  +			DOMCDATASection* node = m_Document->createCDATASection(OLESTR(""));
   			hr = wrapNode(m_pIXMLDOMDocument,node,IID_IXMLDOMNode,reinterpret_cast<LPVOID *> (pVal));
   			break;
   		}
   		case NODE_ENTITY_REFERENCE:
   		{
  -			DOM_EntityReference node = m_Document.createEntityReference(name);
  +			DOMEntityReference* node = m_Document->createEntityReference(name);
   			hr = wrapNode(m_pIXMLDOMDocument,node,IID_IXMLDOMNode,reinterpret_cast<LPVOID *> (pVal));
   			break;
   		}
   		case NODE_PROCESSING_INSTRUCTION:
   		{
  -			DOM_ProcessingInstruction node = m_Document.createProcessingInstruction(name,OLESTR(""));
  +			DOMProcessingInstruction* node = m_Document->createProcessingInstruction(name,OLESTR(""));
   			hr = wrapNode(m_pIXMLDOMDocument,node,IID_IXMLDOMNode,reinterpret_cast<LPVOID *> (pVal));
   			break;
   		}
   		case NODE_COMMENT:
   		{
  -			DOM_Comment node = m_Document.createComment(OLESTR(""));
  +			DOMComment* node = m_Document->createComment(OLESTR(""));
   			hr = wrapNode(m_pIXMLDOMDocument,node,IID_IXMLDOMNode,reinterpret_cast<LPVOID *> (pVal));
   			break;
   		}
   		case NODE_DOCUMENT_FRAGMENT:
   		{
  -			DOM_DocumentFragment node = m_Document.createDocumentFragment();
  +			DOMDocumentFragment* node = m_Document->createDocumentFragment();
   			hr = wrapNode(m_pIXMLDOMDocument,node,IID_IXMLDOMNode,reinterpret_cast<LPVOID *> (pVal));
   			break;
   		}
  @@ -876,7 +877,7 @@
   			break;
   	}
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		hr = MakeHRESULT(ex);
   	}
  @@ -900,9 +901,9 @@
   
   	try
   	{
  -		hr = wrapNode(m_pIXMLDOMDocument, m_Document.getElementById(idString),IID_IXMLDOMNode,reinterpret_cast<LPVOID *> (pVal));
  +		hr = wrapNode(m_pIXMLDOMDocument, m_Document->getElementById(idString),IID_IXMLDOMNode,reinterpret_cast<LPVOID *> (pVal));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -1390,7 +1391,7 @@
   		}
   	}
   
  -	DOMParser parser;
  +	XercesDOMParser parser;
   
   	//
   	//   If set to true then an node supporting IXMLDOMProcessingInstruction
  @@ -1399,7 +1400,7 @@
   	//   Setting to true in a custom DLL will better mimic
   	//      MSXML.DLL but at a cost of conformance errors
   	//      using David Brownell's suite
  -	parser.setToCreateXMLDeclTypeNode(false);
  +	//parser.setToCreateXMLDeclTypeNode(false);
   
   	parser.setIncludeIgnorableWhitespace(pThis->m_bPreserveWhiteSpace);
   
  @@ -1411,7 +1412,7 @@
   		//   this brings the COM component into better mimicry to MSXML
   		//      by not throwing a validation error when there is no DOCTYPE
   		//
  -		parser.setValidationScheme(pThis->m_bThreadValidate ? DOMParser::Val_Auto : DOMParser::Val_Never);
  +		parser.setValidationScheme(pThis->m_bThreadValidate ? AbstractDOMParser::Val_Auto : AbstractDOMParser::Val_Never);
   	}
   
   	if (!pThis->m_bParseError && !pThis->m_bAbort)
  @@ -1445,7 +1446,7 @@
   	}
   
   	if (!pThis->m_bParseError && !pThis->m_bAbort)
  -		pThis->m_TmpDocument = parser.getDocument();
  +		pThis->m_TmpDocument = parser.adoptDocument();
   
   	if (!pThis->m_bParseError && !pThis->m_bAbort && pThis->m_bAsync)
   		pThis->PostMessage(MSG_READY_STATE_CHANGE,4);
  @@ -1467,16 +1468,16 @@
   	_bstr_t text;
   	
   	try {
  -		DOM_NodeList childs = m_Document.getChildNodes();
  -		int length = childs.getLength();
  +		DOMNodeList* childs = m_Document->getChildNodes();
  +		int length = childs->getLength();
   		for (int i=0; i < length; ++i) {
  -			DOM_Node child = childs.item(i);
  +			DOMNode* child = childs->item(i);
   			_bstr_t nodeText;
   			GetXML(child,nodeText);
   			text += nodeText;
   		}
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  
  
  
  1.8       +8 -5      xml-xerces/c/src/xercesc/com/XMLDOMDocument.h
  
  Index: XMLDOMDocument.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMDocument.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XMLDOMDocument.h	12 Feb 2004 13:49:43 -0000	1.7
  +++ XMLDOMDocument.h	25 Feb 2004 18:38:33 -0000	1.8
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.8  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.7  2004/02/12 13:49:43  amassari
    * Updated version to 2.5
    *
  @@ -104,7 +107,7 @@
   #ifndef ___xmldomdocument_h___
   #define ___xmldomdocument_h___
   
  -#include <xercesc/dom/deprecated/DOM_Document.hpp>
  +#include <xercesc/dom/DOMDocument.hpp>
   #include "IXMLDOMNodeImpl.h"
   
   #include "resource.h"       // main symbols
  @@ -135,8 +138,8 @@
   	HRESULT FinalConstruct();
   	void	FinalRelease();
   
  -	virtual DOM_Node&   get_DOM_Node()			 { return m_Document;}
  -	virtual DOMNodeType get_DOMNodeType() const  { return NODE_DOCUMENT; }
  +	virtual DOMNode*        get_DOMNode()		    { return m_Document;}
  +    virtual DOMNodeType     get_DOMNodeType() const { return NODE_DOCUMENT; }
   
   	virtual void resetErrors() {};
   
  @@ -218,7 +221,7 @@
   
   	bool IsAbort() const { return m_bAbort; }
   
  -	DOM_Document		  m_Document;
  +	XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument*		  m_Document;
   
   private:
   
  @@ -236,7 +239,7 @@
   	// thread data
   	_bstr_t				  m_FileName;
   	_bstr_t				  m_xml;
  -	DOM_Document		  m_TmpDocument;
  +	XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument*		  m_TmpDocument;
   	bool			      m_bParseError;
   	bool				  m_bThreadValidate;
   	bool                  m_bPreserveWhiteSpace;
  
  
  
  1.6       +6 -3      xml-xerces/c/src/xercesc/com/XMLDOMDocumentFragment.h
  
  Index: XMLDOMDocumentFragment.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMDocumentFragment.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLDOMDocumentFragment.h	21 Nov 2003 12:05:48 -0000	1.5
  +++ XMLDOMDocumentFragment.h	25 Feb 2004 18:38:33 -0000	1.6
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.6  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.5  2003/11/21 12:05:48  amassari
    * Updated version to 2.4
    *
  @@ -94,7 +97,7 @@
   #ifndef ___xmldomdocumentfragment_h___
   #define ___xmldomdocumentfragment_h___
   
  -#include <xercesc/dom/deprecated/DOM_DocumentFragment.hpp>
  +#include <xercesc/dom/DOMDocumentFragment.hpp>
   #include "IXMLDOMNodeImpl.h"
   
   XERCES_CPP_NAMESPACE_USE
  @@ -112,7 +115,7 @@
   		ReleaseOwnerDoc();
   	}
   	
  -	virtual DOM_Node& get_DOM_Node()			 { return documentFragment;}
  +	virtual DOMNode* get_DOMNode()			 { return documentFragment;}
   	virtual DOMNodeType get_DOMNodeType() const  { return NODE_DOCUMENT_FRAGMENT; }
   
   DECLARE_NOT_AGGREGATABLE(CXMLDOMDocumentFragment)
  @@ -127,7 +130,7 @@
   	COM_INTERFACE_ENTRY(ISupportErrorInfo)
   END_COM_MAP()
   
  -	DOM_DocumentFragment documentFragment;
  +	DOMDocumentFragment* documentFragment;
   };
   
   typedef CComObject<CXMLDOMDocumentFragment> CXMLDOMDocumentFragmentObj;
  
  
  
  1.2       +7 -8      xml-xerces/c/src/xercesc/com/XMLDOMDocumentType.cpp
  
  Index: XMLDOMDocumentType.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMDocumentType.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLDOMDocumentType.cpp	1 Feb 2002 22:21:41 -0000	1.1
  +++ XMLDOMDocumentType.cpp	25 Feb 2004 18:38:33 -0000	1.2
  @@ -75,10 +75,9 @@
   
   	try
   	{
  -		DOMString val = documentType.getName();
  -		*pVal = SysAllocStringLen(val.rawBuffer(),val.length());
  +		*pVal = SysAllocString(documentType->getName());
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -110,9 +109,9 @@
   
   	try
   	{
  -		pObj->m_container = documentType.getEntities();
  +		pObj->m_container = documentType->getEntities();
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		pObj->Release();
   		return MakeHRESULT(ex);
  @@ -150,9 +149,9 @@
   
   	try
   	{
  -		pObj->m_container = documentType.getNotations();
  +		pObj->m_container = documentType->getNotations();
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		pObj->Release();
   		return MakeHRESULT(ex);
  
  
  
  1.6       +6 -3      xml-xerces/c/src/xercesc/com/XMLDOMDocumentType.h
  
  Index: XMLDOMDocumentType.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMDocumentType.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLDOMDocumentType.h	21 Nov 2003 12:05:48 -0000	1.5
  +++ XMLDOMDocumentType.h	25 Feb 2004 18:38:33 -0000	1.6
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.6  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.5  2003/11/21 12:05:48  amassari
    * Updated version to 2.4
    *
  @@ -94,7 +97,7 @@
   #ifndef ___xmldomdocumenttype_h___
   #define ___xmldomdocumenttype_h___
   
  -#include <xercesc/dom/deprecated/DOM_DocumentType.hpp>
  +#include <xercesc/dom/DOMDocumentType.hpp>
   #include "IXMLDOMNodeImpl.h"
   
   XERCES_CPP_NAMESPACE_USE
  @@ -112,7 +115,7 @@
   		ReleaseOwnerDoc();
   	}
   
  -	virtual DOM_Node& get_DOM_Node()	  { return documentType;}
  +	virtual DOMNode* get_DOMNode()	  { return documentType;}
   	virtual DOMNodeType get_DOMNodeType() const  { return NODE_DOCUMENT_TYPE; }
   
   DECLARE_NOT_AGGREGATABLE(CXMLDOMDocumentType)
  @@ -131,7 +134,7 @@
   	STDMETHOD(get_entities)(IXMLDOMNamedNodeMap  * *pVal);
   	STDMETHOD(get_notations)(IXMLDOMNamedNodeMap  * *pVal);
   
  -	DOM_DocumentType documentType;
  +	DOMDocumentType* documentType;
   };
   
   typedef CComObject<CXMLDOMDocumentType> CXMLDOMDocumentTypeObj;
  
  
  
  1.2       +26 -29    xml-xerces/c/src/xercesc/com/XMLDOMElement.cpp
  
  Index: XMLDOMElement.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMElement.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLDOMElement.cpp	1 Feb 2002 22:21:41 -0000	1.1
  +++ XMLDOMElement.cpp	25 Feb 2004 18:38:33 -0000	1.2
  @@ -76,10 +76,9 @@
   
   	try
   	{
  -		DOMString val = element.getTagName();
  -		*pVal = SysAllocStringLen(val.rawBuffer(),val.length());
  +		*pVal = SysAllocString(element->getTagName());
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -101,13 +100,11 @@
   	::VariantInit(pVal);
   	V_VT(pVal) = VT_EMPTY;
   
  -	DOMString a = element.getAttribute(name);
  -
   	try {
   		V_VT(pVal)   = VT_BSTR;
  -		V_BSTR(pVal) = SysAllocStringLen(a.rawBuffer(),a.length());
  +		V_BSTR(pVal) = SysAllocString(element->getAttribute(name));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -126,13 +123,13 @@
   	{
   		if (V_VT(&value) == VT_BSTR)
   		{
  -			element.setAttribute(name, value.bstrVal);
  +			element->setAttribute(name, value.bstrVal);
   		}
   		else {
  -			element.setAttribute(name,(BSTR) (_bstr_t) value);
  +			element->setAttribute(name,(BSTR) (_bstr_t) value);
   		}
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -151,9 +148,9 @@
   
   	try
   	{
  -		element.removeAttribute(name);
  +		element->removeAttribute(name);
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -173,8 +170,8 @@
   		return E_POINTER;
   
   	*attr = NULL;
  -	DOM_Attr attrNode(element.getAttributeNode(name));
  -	if(attrNode.isNull())
  +	DOMAttr* attrNode=element->getAttributeNode(name);
  +	if(attrNode==NULL)
   		return S_OK;
   	
   
  @@ -190,7 +187,7 @@
   	{
   		pObj->attr = attrNode;
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		pObj->Release();
   		return MakeHRESULT(ex);
  @@ -218,7 +215,7 @@
   
   	*attributeNode = NULL;
   
  -	DOM_Attr* newAttr = NULL;
  +	DOMAttr* newAttr = NULL;
   	IIBMXMLDOMNodeIdentity* nodeID = NULL;
   	HRESULT sc = attr->QueryInterface(IID_IIBMXMLDOMNodeIdentity,(void**) &nodeID);
   	if(SUCCEEDED(sc)) {
  @@ -231,9 +228,9 @@
   			//
   			sc = E_INVALIDARG;
   			try {
  -				DOM_Node* newNode = (DOM_Node*) id;
  -				if(newNode->getNodeType() == DOM_Node::ATTRIBUTE_NODE) {
  -					newAttr = (DOM_Attr*) newNode;
  +				DOMNode* newNode = (DOMNode*) id;
  +				if(newNode->getNodeType() == DOMNode::ATTRIBUTE_NODE) {
  +					newAttr = (DOMAttr*) newNode;
   				}
   			}
   			catch(...) {
  @@ -249,8 +246,8 @@
   	sc = S_OK;
   	try
   	{
  -		DOM_Attr& oldAttr = element.setAttributeNode(*newAttr);
  -		if(!oldAttr.isNull()) {
  +		DOMAttr* oldAttr = element->setAttributeNode(newAttr);
  +		if(oldAttr!=NULL) {
   			CXMLDOMAttributeObj *pObj = NULL;
   			sc = CXMLDOMAttributeObj::CreateInstance(&pObj);
   			if (SUCCEEDED(sc)) {
  @@ -263,7 +260,7 @@
   			}
   		}
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -301,9 +298,9 @@
   			nodeID->get_NodeId(&id);
   			nodeID->Release();
   		}
  -		pObj->attr = element.removeAttributeNode(*((DOM_Attr*) id));
  +		pObj->attr = element->removeAttributeNode((DOMAttr*) id);
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		pObj->Release();
   		return MakeHRESULT(ex);
  @@ -341,9 +338,9 @@
   
   	try
   	{
  -		pObj->m_container = element.getElementsByTagName(tagName);
  +		pObj->m_container = element->getElementsByTagName(tagName);
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		pObj->Release();
   		return MakeHRESULT(ex);
  @@ -368,9 +365,9 @@
   
   	try
   	{
  -		element.normalize();
  +		element->normalize();
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  
  
  
  1.6       +6 -3      xml-xerces/c/src/xercesc/com/XMLDOMElement.h
  
  Index: XMLDOMElement.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMElement.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLDOMElement.h	21 Nov 2003 12:05:48 -0000	1.5
  +++ XMLDOMElement.h	25 Feb 2004 18:38:33 -0000	1.6
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.6  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.5  2003/11/21 12:05:48  amassari
    * Updated version to 2.4
    *
  @@ -94,7 +97,7 @@
   #ifndef ___xmldomelement_h___
   #define ___xmldomelement_h___
   
  -#include <xercesc/dom/deprecated/DOM_Element.hpp>
  +#include <xercesc/dom/DOMElement.hpp>
   #include "IXMLDOMNodeImpl.h"
   
   XERCES_CPP_NAMESPACE_USE
  @@ -112,7 +115,7 @@
   		ReleaseOwnerDoc();
   	}
   
  -	virtual DOM_Node& get_DOM_Node()	  { return element;}
  +	virtual DOMNode* get_DOMNode()	  { return element;}
   	virtual DOMNodeType get_DOMNodeType() const  { return NODE_ELEMENT; }
   
   DECLARE_NOT_AGGREGATABLE(CXMLDOMElement)
  @@ -138,7 +141,7 @@
   	STDMETHOD(getElementsByTagName)(BSTR tagName, IXMLDOMNodeList  * *resultList);
   	STDMETHOD(normalize)(void);
   
  -	DOM_Element element;
  +	DOMElement* element;
   };
   
   typedef CComObject<CXMLDOMElement> CXMLDOMElementObj;
  
  
  
  1.2       +9 -10     xml-xerces/c/src/xercesc/com/XMLDOMEntity.cpp
  
  Index: XMLDOMEntity.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMEntity.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLDOMEntity.cpp	1 Feb 2002 22:21:41 -0000	1.1
  +++ XMLDOMEntity.cpp	25 Feb 2004 18:38:33 -0000	1.2
  @@ -74,7 +74,7 @@
   
   	try
   	{
  -		DOMString val = entity.getPublicId();
  +        const XMLCh* val=entity->getPublicId();
   		if(val == NULL)
   		{
   			V_VT(pVal) = VT_NULL;
  @@ -82,10 +82,10 @@
   		else
   		{
   			V_VT(pVal)   = VT_BSTR;
  -			V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
  +			V_BSTR(pVal) = SysAllocString(val);
   		}
   	}
  -	catch(DOM_DOMException& ex) {
  +	catch(DOMException& ex) {
   		return MakeHRESULT(ex);
   	}
   	catch(...)
  @@ -107,7 +107,7 @@
   
   	try
   	{
  -		DOMString val = entity.getSystemId();
  +        const XMLCh* val=entity->getSystemId();
   		if(val == NULL)
   		{
   			V_VT(pVal) = VT_NULL;
  @@ -115,10 +115,10 @@
   		else
   		{
   			V_VT(pVal)   = VT_BSTR;
  -			V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
  +			V_BSTR(pVal) = SysAllocString(val);
   		}
   	}
  -	catch(DOM_DOMException& ex) {
  +	catch(DOMException& ex) {
   		return MakeHRESULT(ex);
   	}
   	catch(...)
  @@ -140,10 +140,9 @@
   
   	try
   	{
  -		DOMString val = entity.getNotationName();
  -		*pVal = SysAllocStringLen(val.rawBuffer(),val.length());
  +		*pVal = SysAllocString(entity->getNotationName());
   	}
  -	catch(DOM_DOMException& ex) {
  +	catch(DOMException& ex) {
   		return MakeHRESULT(ex);
   	}
   	catch(...)
  
  
  
  1.6       +6 -3      xml-xerces/c/src/xercesc/com/XMLDOMEntity.h
  
  Index: XMLDOMEntity.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMEntity.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLDOMEntity.h	21 Nov 2003 12:05:48 -0000	1.5
  +++ XMLDOMEntity.h	25 Feb 2004 18:38:33 -0000	1.6
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.6  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.5  2003/11/21 12:05:48  amassari
    * Updated version to 2.4
    *
  @@ -85,7 +88,7 @@
   #ifndef ___xmldomentity_h___
   #define ___xmldomentity_h___
   
  -#include <xercesc/dom/deprecated/DOM_Entity.hpp>
  +#include <xercesc/dom/DOMEntity.hpp>
   #include "IXMLDOMNodeImpl.h"
   
   XERCES_CPP_NAMESPACE_USE
  @@ -103,7 +106,7 @@
   		ReleaseOwnerDoc();
   	}
   
  -	virtual DOM_Node& get_DOM_Node()			 { return entity;} 
  +	virtual DOMNode* get_DOMNode()			 { return entity;} 
   	virtual DOMNodeType get_DOMNodeType() const  { return NODE_ENTITY; }
   
   DECLARE_NOT_AGGREGATABLE(CXMLDOMEntity)
  @@ -121,7 +124,7 @@
   	STDMETHOD(get_systemId)(VARIANT  *pVal);
   	STDMETHOD(get_notationName)(BSTR  *pVal);
   
  -	DOM_Entity entity;
  +	DOMEntity* entity;
   };
   
   typedef CComObject<CXMLDOMEntity> CXMLDOMEntityObj;
  
  
  
  1.6       +6 -3      xml-xerces/c/src/xercesc/com/XMLDOMEntityReference.h
  
  Index: XMLDOMEntityReference.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMEntityReference.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLDOMEntityReference.h	21 Nov 2003 12:05:48 -0000	1.5
  +++ XMLDOMEntityReference.h	25 Feb 2004 18:38:33 -0000	1.6
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.6  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.5  2003/11/21 12:05:48  amassari
    * Updated version to 2.4
    *
  @@ -94,7 +97,7 @@
   #ifndef ___xmldomentityreference_h___
   #define ___xmldomentityreference_h___
   
  -#include <xercesc/dom/deprecated/DOM_EntityReference.hpp>
  +#include <xercesc/dom/DOMEntityReference.hpp>
   #include "IXMLDOMNodeImpl.h"
   
   XERCES_CPP_NAMESPACE_USE
  @@ -112,7 +115,7 @@
   		ReleaseOwnerDoc();
   	}
   
  -	virtual DOM_Node& get_DOM_Node()			 { return entityReference;}
  +	virtual DOMNode* get_DOMNode()			 { return entityReference;}
   	virtual DOMNodeType get_DOMNodeType() const  { return NODE_ENTITY_REFERENCE; }
   
   DECLARE_NOT_AGGREGATABLE(CXMLDOMEntityReference)
  @@ -126,7 +129,7 @@
   	COM_INTERFACE_ENTRY(ISupportErrorInfo)
   END_COM_MAP()
   
  -	DOM_EntityReference entityReference;
  +	DOMEntityReference* entityReference;
   };
   
   typedef CComObject<CXMLDOMEntityReference> CXMLDOMEntityReferenceObj;
  
  
  
  1.2       +4 -1      xml-xerces/c/src/xercesc/com/XMLDOMImplementation.cpp
  
  Index: XMLDOMImplementation.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMImplementation.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLDOMImplementation.cpp	1 Feb 2002 22:21:41 -0000	1.1
  +++ XMLDOMImplementation.cpp	25 Feb 2004 18:38:33 -0000	1.2
  @@ -56,8 +56,11 @@
   
   /*
    * $Log$
  - * Revision 1.1  2002/02/01 22:21:41  peiyongz
  - * Initial revision
  + * Revision 1.2  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
  + * Revision 1.1.1.1  2002/02/01 22:21:41  peiyongz
  + * sane_include
    *
    * Revision 1.2  2000/03/30 02:00:10  abagchi
    * Initial checkin of working code with Copyright Notice
  @@ -79,7 +82,7 @@
   
   	try
   	{
  -		*pVal = (implementation.hasFeature(feature, ver) ? VARIANT_TRUE : VARIANT_FALSE);
  +		*pVal = (implementation->hasFeature(feature, ver) ? VARIANT_TRUE : VARIANT_FALSE);
   	}
   	catch(...)
   	{
  
  
  
  1.7       +5 -2      xml-xerces/c/src/xercesc/com/XMLDOMImplementation.h
  
  Index: XMLDOMImplementation.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMImplementation.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XMLDOMImplementation.h	12 Feb 2004 13:49:43 -0000	1.6
  +++ XMLDOMImplementation.h	25 Feb 2004 18:38:33 -0000	1.7
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.7  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.6  2004/02/12 13:49:43  amassari
    * Updated version to 2.5
    *
  @@ -88,7 +91,7 @@
   #ifndef ___xmldomimplementation_h___
   #define ___xmldomimplementation_h___
   
  -#include <xercesc/dom/deprecated/DOM_DOMImplementation.hpp>
  +#include <xercesc/dom/DOMImplementation.hpp>
   
   XERCES_CPP_NAMESPACE_USE
   
  @@ -111,7 +114,7 @@
   	// IXMLDOMImplementation methods
   	STDMETHOD(hasFeature)(BSTR feature, BSTR ver, VARIANT_BOOL  *pVal);
   
  -	DOM_DOMImplementation implementation;
  +	DOMImplementation* implementation;
   };
   
   typedef CComObject<CXMLDOMImplementation> CXMLDOMImplementationObj;
  
  
  
  1.2       +27 -27    xml-xerces/c/src/xercesc/com/XMLDOMNamedNodeMap.cpp
  
  Index: XMLDOMNamedNodeMap.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMNamedNodeMap.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLDOMNamedNodeMap.cpp	1 Feb 2002 22:21:41 -0000	1.1
  +++ XMLDOMNamedNodeMap.cpp	25 Feb 2004 18:38:33 -0000	1.2
  @@ -64,7 +64,7 @@
   #include "XMLDOMUtil.h"
   #include "IXMLDOMNodeImpl.h"
   
  -typedef CComEnumOnSTL<IEnumVARIANT, &IID_IEnumVARIANT, VARIANT, _Copy<VARIANT>, NodeContainerImpl<DOM_NamedNodeMap> >
  +typedef CComEnumOnSTL<IEnumVARIANT, &IID_IEnumVARIANT, VARIANT, _Copy<VARIANT>, NodeContainerImpl<DOMNamedNodeMap> >
   		CComEnumUnknownOnNamedNodeContainer;
   
   STDMETHODIMP CXMLDOMNamedNodeMap::getNamedItem(BSTR name, IXMLDOMNode  **pVal)
  @@ -82,11 +82,11 @@
   
   	try
   	{
  -		DOM_Node n = m_container.getNamedItem(name);
  -		if(!n.isNull())
  +		DOMNode* n = m_container->getNamedItem(name);
  +		if(n!=NULL)
   			hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -122,21 +122,21 @@
   	if (S_OK != hr)
   		return hr;
   
  -	DOM_Node *pNewItemNode = reinterpret_cast<DOM_Node*> (id);
  +	DOMNode *pNewItemNode = reinterpret_cast<DOMNode*> (id);
   	if (NULL == pNewItemNode)
   		return E_INVALIDARG;
   
   	try
   	{
  -		DOMString  name = pNewItemNode->getNodeName();
  +		const XMLCh* name = pNewItemNode->getNodeName();
   		//
   		//  returns old node
   		//
  -		DOM_Node n = m_container.setNamedItem(*pNewItemNode);
  -		if(!n.isNull())
  +		DOMNode* n = m_container->setNamedItem(pNewItemNode);
  +		if(n!=NULL)
   			hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -163,8 +163,8 @@
   
   	try
   	{
  -		DOM_Node n = m_container.removeNamedItem(name);
  -		if(!n.isNull())
  +		DOMNode* n = m_container->removeNamedItem(name);
  +		if(n!=NULL)
   			hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
   	}
   	//
  @@ -192,11 +192,11 @@
   		if (m_container == 0 || index < 0)
   			return E_INVALIDARG;
   
  -		long length =  m_container.getLength();
  +		long length =  m_container->getLength();
   		if (index < length)
  -			hr = wrapNode(m_pIXMLDOMDocument,m_container.item(index),IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
  +			hr = wrapNode(m_pIXMLDOMDocument,m_container->item(index),IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -222,9 +222,9 @@
   
   	try
   	{
  -		*pVal = m_container.getLength();
  +		*pVal = m_container->getLength();
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -252,11 +252,11 @@
   
   	try
   	{
  -		DOM_Node n = m_container.getNamedItemNS(namespaceURI,baseName);
  -		if(!n.isNull())
  +		DOMNode* n = m_container->getNamedItemNS(namespaceURI,baseName);
  +		if(n!=NULL)
   			hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -284,11 +284,11 @@
   
   	try
   	{
  -		DOM_Node n = m_container.removeNamedItemNS(namespaceURI,baseName);
  -		if(!n.isNull())
  +		DOMNode* n = m_container->removeNamedItemNS(namespaceURI,baseName);
  +		if(n!=NULL)
   			hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -311,7 +311,7 @@
   	if (m_container == 0)
   		return S_OK;
   	
  -	int length = m_container.getLength();
  +	int length = m_container->getLength();
   	if (0 == length)
   		return S_OK;
   
  @@ -322,11 +322,11 @@
   
   	try
   	{
  -		DOM_Node n = m_container.item(m_NextNodeIndex);
  -		if(!n.isNull())
  +		DOMNode* n = m_container->item(m_NextNodeIndex);
  +		if(n!=NULL)
   			hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  
  
  
  1.7       +5 -2      xml-xerces/c/src/xercesc/com/XMLDOMNamedNodeMap.h
  
  Index: XMLDOMNamedNodeMap.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMNamedNodeMap.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XMLDOMNamedNodeMap.h	12 Feb 2004 13:49:43 -0000	1.6
  +++ XMLDOMNamedNodeMap.h	25 Feb 2004 18:38:33 -0000	1.7
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.7  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.6  2004/02/12 13:49:43  amassari
    * Updated version to 2.5
    *
  @@ -97,7 +100,7 @@
   #ifndef ___xmldomnamednodemap_h___
   #define ___xmldomnamednodemap_h___
   
  -#include <xercesc/dom/deprecated/DOM_NamedNodeMap.hpp>
  +#include <xercesc/dom/DOMNamedNodeMap.hpp>
   #include "NodeContainerImpl.h"
   
   XERCES_CPP_NAMESPACE_USE
  @@ -105,7 +108,7 @@
   class ATL_NO_VTABLE CXMLDOMNamedNodeMap :
   	public CComObjectRootEx<CComSingleThreadModel>,
   	public IDispatchImpl<IXMLDOMNamedNodeMap, &IID_IXMLDOMNamedNodeMap, &LIBID_Xerces, 2, 50>,
  -	public NodeContainerImpl<DOM_NamedNodeMap>,
  +	public NodeContainerImpl<DOMNamedNodeMap>,
   	public ISupportErrorInfo
   {
   public:
  
  
  
  1.2       +10 -10    xml-xerces/c/src/xercesc/com/XMLDOMNodeList.cpp
  
  Index: XMLDOMNodeList.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMNodeList.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLDOMNodeList.cpp	1 Feb 2002 22:21:41 -0000	1.1
  +++ XMLDOMNodeList.cpp	25 Feb 2004 18:38:33 -0000	1.2
  @@ -64,7 +64,7 @@
   #include "XMLDOMUtil.h"
   #include "IXMLDOMNodeImpl.h"
   
  -typedef CComEnumOnSTL<IEnumVARIANT, &IID_IEnumVARIANT, VARIANT, _Copy<VARIANT>,NodeContainerImpl<DOM_NodeList> >
  +typedef CComEnumOnSTL<IEnumVARIANT, &IID_IEnumVARIANT, VARIANT, _Copy<VARIANT>,NodeContainerImpl<DOMNodeList> >
   		CComEnumUnknownOnNodeContainer;
   
   STDMETHODIMP CXMLDOMNodeList::get_item(long index, IXMLDOMNode  **pVal)
  @@ -82,15 +82,15 @@
   		if (m_container == 0 || index < 0)
   			return E_INVALIDARG;
   
  -		long length = m_container.getLength();
  +		long length = m_container->getLength();
   		//
   		//    if index is beyond end
   		//       return a null object not an exception
   		//
   		if (index < length)
  -			hr = wrapNode(m_pIXMLDOMDocument,m_container.item(index),IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
  +			hr = wrapNode(m_pIXMLDOMDocument,m_container->item(index),IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -117,9 +117,9 @@
   
   	try
   	{
  -		*pVal = m_container.getLength();
  +		*pVal = m_container->getLength();
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -143,7 +143,7 @@
   	if (m_container == 0)
   		return S_OK;
   	
  -	int length = m_container.getLength();
  +	int length = m_container->getLength();
   	if (0 == length)
   		return S_OK;
   
  @@ -155,9 +155,9 @@
   
   	try
   	{
  -		hr = wrapNode(m_pIXMLDOMDocument,m_container.item(m_NextNodeIndex),IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
  +		hr = wrapNode(m_pIXMLDOMDocument,m_container->item(m_NextNodeIndex),IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  
  
  
  1.7       +5 -2      xml-xerces/c/src/xercesc/com/XMLDOMNodeList.h
  
  Index: XMLDOMNodeList.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMNodeList.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XMLDOMNodeList.h	12 Feb 2004 13:49:43 -0000	1.6
  +++ XMLDOMNodeList.h	25 Feb 2004 18:38:33 -0000	1.7
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.7  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.6  2004/02/12 13:49:43  amassari
    * Updated version to 2.5
    *
  @@ -97,7 +100,7 @@
   #ifndef ___xmldomnodelist_h___
   #define ___xmldomnodelist_h___
   
  -#include <xercesc/dom/deprecated/DOM_NodeList.hpp>
  +#include <xercesc/dom/DOMNodeList.hpp>
   #include "NodeContainerImpl.h"
   
   XERCES_CPP_NAMESPACE_USE
  @@ -105,7 +108,7 @@
   class ATL_NO_VTABLE CXMLDOMNodeList :
   	public CComObjectRootEx<CComSingleThreadModel>,
   	public IDispatchImpl<IXMLDOMNodeList, &IID_IXMLDOMNodeList, &LIBID_Xerces, 2, 50>,
  -	public NodeContainerImpl<DOM_NodeList>,
  +	public NodeContainerImpl<DOMNodeList>,
   	public ISupportErrorInfo
   {
   public:
  
  
  
  1.2       +7 -7      xml-xerces/c/src/xercesc/com/XMLDOMNotation.cpp
  
  Index: XMLDOMNotation.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMNotation.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLDOMNotation.cpp	1 Feb 2002 22:21:42 -0000	1.1
  +++ XMLDOMNotation.cpp	25 Feb 2004 18:38:33 -0000	1.2
  @@ -73,7 +73,7 @@
   
   	try
   	{
  -		DOMString val = notation.getPublicId();
  +        const XMLCh* val=notation->getPublicId();
   		if(val == NULL)
   		{
   			V_VT(pVal) = VT_NULL;
  @@ -81,10 +81,10 @@
   		else
   		{
   			V_VT(pVal) = VT_BSTR;
  -			V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
  +			V_BSTR(pVal) = SysAllocString(val);
   		}
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -108,7 +108,7 @@
   
   	try
   	{
  -		DOMString val = notation.getSystemId();
  +        const XMLCh* val=notation->getSystemId();
   		if(val == NULL)
   		{
   			V_VT(pVal) = VT_NULL;
  @@ -116,10 +116,10 @@
   		else
   		{
   			V_VT(pVal) = VT_BSTR;
  -			V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
  +			V_BSTR(pVal) = SysAllocString(val);
   		}
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  
  
  
  1.6       +6 -3      xml-xerces/c/src/xercesc/com/XMLDOMNotation.h
  
  Index: XMLDOMNotation.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMNotation.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLDOMNotation.h	21 Nov 2003 12:05:48 -0000	1.5
  +++ XMLDOMNotation.h	25 Feb 2004 18:38:33 -0000	1.6
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.6  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.5  2003/11/21 12:05:48  amassari
    * Updated version to 2.4
    *
  @@ -94,7 +97,7 @@
   #ifndef ___xmldomnotation_h___
   #define ___xmldomnotation_h___
   
  -#include <xercesc/dom/deprecated/DOM_Notation.hpp>
  +#include <xercesc/dom/DOMNotation.hpp>
   #include "IXMLDOMNodeImpl.h"
   
   XERCES_CPP_NAMESPACE_USE
  @@ -112,7 +115,7 @@
   		ReleaseOwnerDoc();
   	}
   
  -	virtual DOM_Node& get_DOM_Node()			 { return notation;}
  +	virtual DOMNode* get_DOMNode()			 { return notation;}
   	virtual DOMNodeType get_DOMNodeType() const  { return NODE_NOTATION; }
   
   DECLARE_NOT_AGGREGATABLE(CXMLDOMNotation)
  @@ -130,7 +133,7 @@
   	STDMETHOD(get_publicId)(VARIANT  *pVal);
   	STDMETHOD(get_systemId)(VARIANT  *pVal);
   
  -	DOM_Notation notation;
  +	DOMNotation* notation;
   };
   
   typedef CComObject<CXMLDOMNotation> CXMLDOMNotationObj;
  
  
  
  1.2       +7 -9      xml-xerces/c/src/xercesc/com/XMLDOMProcessingInstruction.cpp
  
  Index: XMLDOMProcessingInstruction.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMProcessingInstruction.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLDOMProcessingInstruction.cpp	1 Feb 2002 22:21:42 -0000	1.1
  +++ XMLDOMProcessingInstruction.cpp	25 Feb 2004 18:38:33 -0000	1.2
  @@ -74,10 +74,9 @@
   
   	try
   	{
  -		DOMString val = processingInstruction.getTarget();
  -		*pVal = SysAllocStringLen(val.rawBuffer(),val.length());
  +		*pVal = SysAllocString(processingInstruction->getTarget());
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -101,10 +100,9 @@
   
   	try
   	{
  -		DOMString val = processingInstruction.getData();
  -		*pVal = SysAllocStringLen(val.rawBuffer(),val.length());
  +		*pVal = SysAllocString(processingInstruction->getData());
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  @@ -123,9 +121,9 @@
   
   	try
   	{
  -		processingInstruction.setData(newVal);
  +		processingInstruction->setData(newVal);
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  
  
  
  1.6       +6 -3      xml-xerces/c/src/xercesc/com/XMLDOMProcessingInstruction.h
  
  Index: XMLDOMProcessingInstruction.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMProcessingInstruction.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLDOMProcessingInstruction.h	21 Nov 2003 12:05:48 -0000	1.5
  +++ XMLDOMProcessingInstruction.h	25 Feb 2004 18:38:33 -0000	1.6
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.6  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.5  2003/11/21 12:05:48  amassari
    * Updated version to 2.4
    *
  @@ -94,7 +97,7 @@
   #ifndef ___xmldomprocessinginstruction_h___
   #define ___xmldomprocessinginstruction_h___
   
  -#include <xercesc/dom/deprecated/DOM_ProcessingInstruction.hpp>
  +#include <xercesc/dom/DOMProcessingInstruction.hpp>
   #include "IXMLDOMNodeImpl.h"
   
   XERCES_CPP_NAMESPACE_USE
  @@ -112,7 +115,7 @@
   		ReleaseOwnerDoc();
   	}
   
  -	virtual DOM_Node& get_DOM_Node()			 { return processingInstruction;}
  +	virtual DOMNode* get_DOMNode()			 { return processingInstruction;}
   	virtual DOMNodeType get_DOMNodeType() const  { return NODE_PROCESSING_INSTRUCTION; }
   
   DECLARE_NOT_AGGREGATABLE(CXMLDOMProcessingInstruction)
  @@ -131,7 +134,7 @@
   	STDMETHOD(get_data)(BSTR  *pVal);
   	STDMETHOD(put_data)(BSTR newVal);
   
  -	DOM_ProcessingInstruction processingInstruction;
  +	DOMProcessingInstruction* processingInstruction;
   };
   
   typedef CComObject<CXMLDOMProcessingInstruction> CXMLDOMProcessingInstructionObj;
  
  
  
  1.6       +6 -3      xml-xerces/c/src/xercesc/com/XMLDOMText.h
  
  Index: XMLDOMText.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMText.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLDOMText.h	21 Nov 2003 12:05:48 -0000	1.5
  +++ XMLDOMText.h	25 Feb 2004 18:38:33 -0000	1.6
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.6  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.5  2003/11/21 12:05:48  amassari
    * Updated version to 2.4
    *
  @@ -94,7 +97,7 @@
   #ifndef ___xmldomtext_h___
   #define ___xmldomtext_h___
   
  -#include <xercesc/dom/deprecated/DOM_Text.hpp>
  +#include <xercesc/dom/DOMText.hpp>
   #include "IXMLDOMTextImpl.h"
   
   XERCES_CPP_NAMESPACE_USE
  @@ -112,7 +115,7 @@
   		ReleaseOwnerDoc();
   	}
   
  -	virtual DOM_Text& get_DOM_Text()		 	 { return text;}
  +	virtual DOMText* get_DOMText()		 	 { return text;}
   	virtual DOMNodeType get_DOMNodeType() const  { return NODE_TEXT; }
   
   DECLARE_NOT_AGGREGATABLE(CXMLDOMText)
  @@ -127,7 +130,7 @@
   	COM_INTERFACE_ENTRY(ISupportErrorInfo)
   END_COM_MAP()
   	
  -	DOM_Text text;
  +	DOMText* text;
   };
   
   typedef CComObject<CXMLDOMText> CXMLDOMTextObj;
  
  
  
  1.3       +111 -182  xml-xerces/c/src/xercesc/com/XMLDOMUtil.cpp
  
  Index: XMLDOMUtil.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMUtil.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLDOMUtil.cpp	21 Oct 2003 21:29:15 -0000	1.2
  +++ XMLDOMUtil.cpp	25 Feb 2004 18:38:33 -0000	1.3
  @@ -72,10 +72,10 @@
   #include "XMLDOMDocumentType.h"
   #include "XMLDOMDocumentFragment.h"
   #include "XMLDOMNotation.h"
  -#include "XMLDOMXMLDecl.h"
   #include "XMLDOMUtil.h"
   #include <xercesc/util/PlatformUtils.hpp>
   #include <xercesc/util/XMLUniDefs.hpp>
  +#include <xercesc/util/XMLString.hpp>
   
   
   const OLECHAR* g_DomNodeName[] =
  @@ -97,37 +97,6 @@
   
   const int g_DomNodeNameSize = sizeof(g_DomNodeName) / sizeof(OLECHAR*);
   
  -DOMString GetText(const DOM_Node& node)
  -{
  -	DOM_Node::NodeType type = static_cast<DOM_Node::NodeType> (node.getNodeType());
  -	DOMString val;		
  -
  -	if (DOM_Node::DOCUMENT_TYPE_NODE		  == type ||
  -		DOM_Node::NOTATION_NODE				  == type)
  -		return val;
  -	
  -	if (DOM_Node::CDATA_SECTION_NODE		  == type ||
  -		DOM_Node::COMMENT_NODE				  == type ||
  -		DOM_Node::PROCESSING_INSTRUCTION_NODE == type ||
  -		DOM_Node::TEXT_NODE					  == type) {
  -		val = node.getNodeValue();
  -		return val;
  -	}
  -
  -	DOM_NodeList l =  node.getChildNodes();
  -	int length = l.getLength();
  -	if (length > 0) {
  -		for (int i = 0; i < length; ++i)
  -			val.appendData(GetText(l.item(i)));
  -	}
  -	else {
  -		val = node.getNodeValue();
  -	}
  -	return val;
  -}
  -
  -
  -
   template <class Base>
   class CComObjectPool
   {
  @@ -310,14 +279,14 @@
   typedef CPooledComObject<CXMLDOMComment> CPooledXMLDOMCommentObj;
   
   
  -HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal)
  +HRESULT wrapNode(IXMLDOMDocument *pDoc, DOMNode* node, REFIID iid, LPVOID *pVal)
   {
   	HRESULT hr = S_OK;
   	if (NULL == pVal)
   		return E_POINTER;
   
   	*pVal = NULL;
  -	short type = node.getNodeType();
  +	short type = node->getNodeType();
   
   	// the way we are constructing the wrappers is kind of fishy but oh well...
   	// the various IBM DOM wrapper classes don't ever add any members or have
  @@ -326,7 +295,7 @@
   
   	switch(type)
   	{
  -	case DOM_Node::ELEMENT_NODE:
  +	case DOMNode::ELEMENT_NODE:
   	{
   		CXMLDOMElement *pObj = NULL;
   		hr = CPooledXMLDOMElementObj::CreateInstance(&pObj);
  @@ -338,9 +307,9 @@
   
   		try
   		{
  -			pObj->element = *(static_cast<DOM_Element*> (&node));
  +			pObj->element = static_cast<DOMElement*> (node);
   		}
  -		catch(DOM_DOMException& ex)
  +		catch(DOMException& ex)
   		{
   			pObj->Release();
   			return MakeHRESULT(ex);
  @@ -358,7 +327,7 @@
   		pObj->Release();
   		break;
   	}
  -	case DOM_Node::ATTRIBUTE_NODE:
  +	case DOMNode::ATTRIBUTE_NODE:
   	{
   		CXMLDOMAttribute *pObj = NULL;
   		hr = CPooledXMLDOMAttributeObj::CreateInstance(&pObj);
  @@ -370,9 +339,9 @@
   
   		try
   		{
  -			pObj->attr = *(static_cast<DOM_Attr*> (&node));
  +			pObj->attr = static_cast<DOMAttr*> (node);
   		}
  -		catch(DOM_DOMException& ex)
  +		catch(DOMException& ex)
   		{
   			pObj->Release();
   			return MakeHRESULT(ex);
  @@ -390,7 +359,7 @@
   		pObj->Release();
   		break;
   	}
  -	case DOM_Node::TEXT_NODE:
  +	case DOMNode::TEXT_NODE:
   	{
   		CXMLDOMText *pObj = NULL;
   		hr = CPooledXMLDOMTextObj::CreateInstance(&pObj);
  @@ -402,9 +371,9 @@
   
   		try
   		{
  -			pObj->text = *(static_cast<DOM_Text*> (&node));
  +			pObj->text = static_cast<DOMText*> (node);
   		}
  -		catch(DOM_DOMException& ex)
  +		catch(DOMException& ex)
   		{
   			pObj->Release();
   			return MakeHRESULT(ex);
  @@ -422,7 +391,7 @@
   		pObj->Release();
   		break;
   	}
  -	case DOM_Node::CDATA_SECTION_NODE:
  +	case DOMNode::CDATA_SECTION_NODE:
   	{
   		CXMLDOMCDATASection *pObj = NULL;
   		hr = CPooledXMLDOMCDATASectionObj::CreateInstance(&pObj);
  @@ -434,9 +403,9 @@
   
   		try
   		{
  -			pObj->cdataSection = *(static_cast<DOM_CDATASection*> (&node));
  +			pObj->cdataSection = static_cast<DOMCDATASection*> (node);
   		}
  -		catch(DOM_DOMException& ex)
  +		catch(DOMException& ex)
   		{
   			pObj->Release();
   			return MakeHRESULT(ex);
  @@ -454,7 +423,7 @@
   		pObj->Release();
   		break;
   	}
  -	case DOM_Node::ENTITY_REFERENCE_NODE:
  +	case DOMNode::ENTITY_REFERENCE_NODE:
   	{
   		CXMLDOMEntityReference *pObj = NULL;
   		hr = CPooledXMLDOMEntityReferenceObj::CreateInstance(&pObj);
  @@ -466,9 +435,9 @@
   
   		try
   		{
  -			pObj->entityReference = *(static_cast<DOM_EntityReference*> (&node));
  +			pObj->entityReference = static_cast<DOMEntityReference*> (node);
   		}
  -		catch(DOM_DOMException& ex)
  +		catch(DOMException& ex)
   		{
   			pObj->Release();
   			return MakeHRESULT(ex);
  @@ -486,7 +455,7 @@
   		pObj->Release();
   		break;
   	}
  -	case DOM_Node::ENTITY_NODE:
  +	case DOMNode::ENTITY_NODE:
   	{
   		CXMLDOMEntity *pObj = NULL;
   		hr = CPooledXMLDOMEntityObj::CreateInstance(&pObj);
  @@ -498,9 +467,9 @@
   		
   		try
   		{
  -			pObj->entity = *(static_cast<DOM_Entity*> (&node));
  +			pObj->entity = static_cast<DOMEntity*> (node);
   		}
  -		catch(DOM_DOMException& ex)
  +		catch(DOMException& ex)
   		{
   			pObj->Release();
   			return MakeHRESULT(ex);
  @@ -518,7 +487,7 @@
   		pObj->Release();
   		break;
   	}
  -	case DOM_Node::PROCESSING_INSTRUCTION_NODE:
  +	case DOMNode::PROCESSING_INSTRUCTION_NODE:
   	{
   		CXMLDOMProcessingInstruction *pObj = NULL;
   		hr = CPooledXMLDOMProcessingInstructionObj::CreateInstance(&pObj);
  @@ -530,9 +499,9 @@
   
   		try
   		{
  -			pObj->processingInstruction = *(static_cast<DOM_ProcessingInstruction*> (&node));
  +			pObj->processingInstruction = static_cast<DOMProcessingInstruction*> (node);
   		}
  -		catch(DOM_DOMException& ex)
  +		catch(DOMException& ex)
   		{
   			pObj->Release();
   			return MakeHRESULT(ex);
  @@ -550,7 +519,7 @@
   		pObj->Release();
   		break;
   	}
  -	case DOM_Node::COMMENT_NODE:
  +	case DOMNode::COMMENT_NODE:
   	{
   		CXMLDOMComment *pObj = NULL;
   		hr = CPooledXMLDOMCommentObj::CreateInstance(&pObj);
  @@ -562,9 +531,9 @@
   
   		try
   		{
  -			pObj->comment = *(static_cast<DOM_Comment*> (&node));
  +			pObj->comment = static_cast<DOMComment*> (node);
   		}
  -		catch(DOM_DOMException& ex)
  +		catch(DOMException& ex)
   		{
   			pObj->Release();
   			return MakeHRESULT(ex);
  @@ -582,7 +551,7 @@
   		pObj->Release();
   		break;
   	}
  -	case DOM_Node::DOCUMENT_NODE:
  +	case DOMNode::DOCUMENT_NODE:
   	{
   		CXMLDOMDocumentObj *pObj = NULL;
   		hr = CXMLDOMDocumentObj::CreateInstance(&pObj);
  @@ -594,9 +563,9 @@
   
   		try
   		{
  -			pObj->m_Document = *(static_cast<DOM_Document*> (&node));
  +			pObj->m_Document = static_cast<XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument*> (node);
   		}
  -		catch(DOM_DOMException& ex)
  +		catch(DOMException& ex)
   		{
   			pObj->Release();
   			return MakeHRESULT(ex);
  @@ -614,7 +583,7 @@
   		pObj->Release();
   		break;
   	}
  -	case DOM_Node::DOCUMENT_TYPE_NODE:
  +	case DOMNode::DOCUMENT_TYPE_NODE:
   	{
   		CXMLDOMDocumentTypeObj *pObj = NULL;
   		hr = CXMLDOMDocumentTypeObj::CreateInstance(&pObj);
  @@ -626,9 +595,9 @@
   
   		try
   		{
  -			pObj->documentType = *(static_cast<DOM_DocumentType*> (&node));
  +			pObj->documentType = static_cast<DOMDocumentType*> (node);
   		}
  -		catch(DOM_DOMException& ex)
  +		catch(DOMException& ex)
   		{
   			pObj->Release();
   			return MakeHRESULT(ex);
  @@ -646,7 +615,7 @@
   		pObj->Release();
   		break;
   	}
  -	case DOM_Node::DOCUMENT_FRAGMENT_NODE:
  +	case DOMNode::DOCUMENT_FRAGMENT_NODE:
   	{
   		CXMLDOMDocumentFragmentObj *pObj = NULL;
   		hr = CXMLDOMDocumentFragmentObj::CreateInstance(&pObj);
  @@ -658,9 +627,9 @@
   
   		try
   		{
  -			pObj->documentFragment = *(static_cast<DOM_DocumentFragment*> (&node));
  +			pObj->documentFragment = static_cast<DOMDocumentFragment*> (node);
   		}
  -		catch(DOM_DOMException& ex)
  +		catch(DOMException& ex)
   		{
   			pObj->Release();
   			return MakeHRESULT(ex);
  @@ -678,7 +647,7 @@
   		pObj->Release();
   		break;
   	}
  -	case DOM_Node::NOTATION_NODE:
  +	case DOMNode::NOTATION_NODE:
   	{
   		CXMLDOMNotationObj *pObj = NULL;
   		hr = CXMLDOMNotationObj::CreateInstance(&pObj);
  @@ -690,9 +659,9 @@
   
   		try
   		{
  -			pObj->notation = *(static_cast<DOM_Notation*> (&node));
  +			pObj->notation = static_cast<DOMNotation*> (node);
   		}
  -		catch(DOM_DOMException& ex)
  +		catch(DOMException& ex)
   		{
   			pObj->Release();
   			return MakeHRESULT(ex);
  @@ -711,38 +680,6 @@
   		break;
   	}
   
  -	case DOM_Node::XML_DECL_NODE:
  -	{
  -		CXMLDOMXMLDeclObj *pObj = NULL;
  -		hr = CXMLDOMXMLDeclObj::CreateInstance(&pObj);
  -		if (S_OK != hr)
  -			return hr;
  -	
  -		pObj->AddRef();
  -		pObj->SetOwnerDoc(pDoc);
  -
  -		try
  -		{
  -			pObj->xmlDecl = *(static_cast<DOM_XMLDecl*> (&node));
  -		}
  -		catch(DOM_DOMException& ex)
  -		{
  -			pObj->Release();
  -			return MakeHRESULT(ex);
  -		}
  -		catch(...)
  -		{
  -			pObj->Release();
  -			return E_FAIL;
  -		}
  -	
  -		hr = pObj->QueryInterface(iid, pVal);
  -		if (S_OK != hr)
  -			*pVal = NULL;
  -
  -		pObj->Release();
  -		break;
  -	}
   	default:
   		hr = E_NOTIMPL;
   		break;
  @@ -779,11 +716,6 @@
   		return *this;
   	}
   
  -	xmlstream& operator<<(const DOMString& other) {
  -		append(other.rawBuffer(),other.length());
  -		return *this;
  -	}
  -
   	xmlstream& operator<<(const XMLCh other) {
   		append(&other,1);
   		return *this;
  @@ -837,63 +769,62 @@
   // ---------------------------------------------------------------------------
   //  outputContent
   //
  -//  Write document content from a DOMString to a C++ ostream. Escape the
  +//  Write document content from a string to a C++ ostream. Escape the
   //  XML special characters (<, &, etc.) unless this is suppressed by the
   //  command line option.
   // ---------------------------------------------------------------------------
  -void outputContent(xmlstream& target, const DOMString &toWrite)
  +void outputContent(xmlstream& target, const XMLCh* toWrite)
   {
   
  -        int            length = toWrite.length();
  -        const XMLCh*   chars  = toWrite.rawBuffer();
  +    int            length = XMLString::stringLen(toWrite);
   
  -        int index;
  -        for (index = 0; index < length; index++)
  +    int index;
  +    for (index = 0; index < length; index++)
  +    {
  +        switch (toWrite[index])
           {
  -            switch (chars[index])
  -            {
  -            case chAmpersand :
  -                target << XMLStrL("&amp;");
  -                break;
  -
  -            case chOpenAngle :
  -                target << XMLStrL("&lt;");
  -                break;
  -
  -            case chCloseAngle:
  -                target << XMLStrL("&gt;");
  -                break;
  -
  -            case chDoubleQuote :
  -                target << XMLStrL("&quot;");
  -                break;
  -
  -            default:
  -                // If it is none of the special characters, print it as such
  -                target << toWrite.substringData(index, 1);
  -                break;
  -            }
  +        case chAmpersand :
  +            target << XMLStrL("&amp;");
  +            break;
  +
  +        case chOpenAngle :
  +            target << XMLStrL("&lt;");
  +            break;
  +
  +        case chCloseAngle:
  +            target << XMLStrL("&gt;");
  +            break;
  +
  +        case chDoubleQuote :
  +            target << XMLStrL("&quot;");
  +            break;
  +
  +        default:
  +            // If it is none of the special characters, print it as such
  +            target << toWrite[index];
  +            break;
           }
  +    }
   
       return;
   }
   
  -xmlstream& operator<<(xmlstream& target, const DOM_Node& toWrite)
  +xmlstream& operator<<(xmlstream& target, const DOMNode* toWrite)
   {
       // Get the name and value out for convenience
  -    DOMString   nodeName = toWrite.getNodeName();
  -    DOMString   nodeValue = toWrite.getNodeValue();
  +    const XMLCh* nodeName = toWrite->getNodeName();
  +    const XMLCh* nodeValue = toWrite->getNodeValue();
   
   
  -	switch (toWrite.getNodeType())
  +	switch (toWrite->getNodeType())
       {
  -		case DOM_Node::TEXT_NODE:
  +		case DOMNode::TEXT_NODE:
           {
               outputContent(target, nodeValue);
               break;
           }
   
  -        case DOM_Node::PROCESSING_INSTRUCTION_NODE :
  +        case DOMNode::PROCESSING_INSTRUCTION_NODE :
           {
               target  << XMLStrL("<?")
                       << nodeName
  @@ -903,39 +834,47 @@
               break;
           }
   
  -        case DOM_Node::DOCUMENT_NODE :
  +        case DOMNode::DOCUMENT_NODE :
           {
               //
               //  Bug here:  we need to find a way to get the encoding name
               //  for the default code page on the system where the program
               //  is running, and plug that in for the encoding name.
               //
  -            //target << "<?xml version='1.0' encoding='ISO-8859-1' ?>\n";
  -            DOM_Node child = toWrite.getFirstChild();
  +            XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument* document=(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument*)toWrite;
  +            target << XMLStrL("<?xml version=\"") << document->getVersion() << XMLStrL("\"");
  +            const XMLCh* str = document->getEncoding();
  +            if (str != 0)
  +                target << XMLStrL(" encoding=\"") << str << XMLStrL("\"");
  +            if(document->getStandalone())
  +                target << XMLStrL(" standalone=\"yes\"");
  +            target << XMLStrL("?>");
  +
  +            DOMNode* child = toWrite->getFirstChild();
               while( child != 0)
               {
                   target << child;
  -                child = child.getNextSibling();
  +                child = child->getNextSibling();
               }
               break;
           }
   
  -        case DOM_Node::ELEMENT_NODE :
  +        case DOMNode::ELEMENT_NODE :
           {
               // Output the element start tag.
               target << XMLStrL('<') << nodeName;
   
               // Output any attributes on this element
  -            DOM_NamedNodeMap attributes = toWrite.getAttributes();
  -            int attrCount = attributes.getLength();
  +            DOMNamedNodeMap* attributes = toWrite->getAttributes();
  +            int attrCount = attributes->getLength();
               for (int i = 0; i < attrCount; i++)
               {
  -                DOM_Node  attribute = attributes.item(i);
  +                DOMNode*  attribute = attributes->item(i);
   
  -                target  << XMLStrL(' ') << attribute.getNodeName()
  +                target  << XMLStrL(' ') << attribute->getNodeName()
                           << XMLStrL(" = \"");
                           //  Note that "<" must be escaped in attribute values.
  -                        outputContent(target, attribute.getNodeValue());
  +                        outputContent(target, attribute->getNodeValue());
                           target << XMLStrL('"');
               }
   
  @@ -943,7 +882,7 @@
               //  Test for the presence of children, which includes both
               //  text content and nested elements.
               //
  -            DOM_Node child = toWrite.getFirstChild();
  +            DOMNode* child = toWrite->getFirstChild();
               if (child != 0)
               {
                   // There are children. Close start-tag, and output children.
  @@ -951,7 +890,7 @@
                   while( child != 0)
                   {
                       target << child;
  -                    child = child.getNextSibling();
  +                    child = child->getNextSibling();
                   }
   
                   // Done with children.  Output the end tag.
  @@ -968,77 +907,67 @@
               break;
           }
   
  -        case DOM_Node::ENTITY_REFERENCE_NODE:
  +        case DOMNode::ENTITY_REFERENCE_NODE:
           {
  -            DOM_Node child;
  -            for (child = toWrite.getFirstChild(); child != 0; child = child.getNextSibling())
  +            DOMNode* child;
  +            for (child = toWrite->getFirstChild(); child != 0; child = child->getNextSibling())
                   target << child;
               break;
           }
   
  -        case DOM_Node::CDATA_SECTION_NODE:
  +        case DOMNode::CDATA_SECTION_NODE:
           {
               target << XMLStrL("<![CDATA[") << nodeValue << XMLStrL("]]>");
               break;
           }
   
  -        case DOM_Node::COMMENT_NODE:
  +        case DOMNode::COMMENT_NODE:
           {
               target << XMLStrL("<!--") << nodeValue << XMLStrL("-->");
               break;
           }
   
  -        case DOM_Node::DOCUMENT_TYPE_NODE:
  +        case DOMNode::DOCUMENT_TYPE_NODE:
           {
  -			DOM_DocumentType doctype = (DOM_DocumentType &)toWrite;;
  +			DOMDocumentType* doctype = (DOMDocumentType*)toWrite;;
   
   			target << XMLStrL("<!DOCTYPE ") << nodeName ;
  -			DOMString id = doctype.getPublicId();
  +			const XMLCh* id = doctype->getPublicId();
   			if (id != 0)
   				target << XMLStrL(" PUBLIC \"") << id << XMLStrL("\"");
  -			id = doctype.getSystemId();
  +			id = doctype->getSystemId();
   			if (id != 0)
   				target << XMLStrL(" SYSTEM \"") << id << XMLStrL("\"");
  -			id = doctype.getInternalSubset();
  +			id = doctype->getInternalSubset();
   			if (id !=0)
   				target << XMLStrL(" [ ") << id  << XMLStrL("]");
   			target  << XMLStrL(">");
               break;
           }
  -		case DOM_Node::ENTITY_NODE:
  +		case DOMNode::ENTITY_NODE:
           {
  +			DOMEntity* entity = (DOMEntity*)toWrite;;
  +
   			target << XMLStrL("<!ENTITY ") << nodeName;
  -			DOMString id = ((DOM_Entity &)toWrite).getPublicId();
  +			const XMLCh* id = entity->getPublicId();
   			if (id != 0)
   				target << XMLStrL("PUBLIC \"") << id << XMLStrL("\"");
  -			id = ((DOM_Entity &)toWrite).getSystemId();
  +			id = entity->getSystemId();
   			if (id != 0)
   				target << XMLStrL("SYSTEM \"") << id << XMLStrL("\"");
  -			id = ((DOM_Entity &)toWrite).getNotationName();
  +			id = entity->getNotationName();
   			if (id != 0)
   				target << XMLStrL("NDATA \"") << id << XMLStrL("\"");
   
               break;
           }
  -        case DOM_Node::XML_DECL_NODE:
  -        {
  -            target << XMLStrL("<?xml version=") << ((DOM_XMLDecl &)toWrite).getVersion();
  -            DOMString str = ((DOM_XMLDecl &)toWrite).getEncoding();
  -            if (str != 0)
  -                target << XMLStrL(" encoding=") << str;
  -            str = ((DOM_XMLDecl &)toWrite).getStandalone();
  -            if (str != 0)
  -                target << XMLStrL(" standalone=") << str;
  -            target << XMLStrL("?>");
  -            break;
  -        }
           default:
               target << XMLStrL("<!-- Unrecognized node type -->");
       }
   	return target;
   }
   
  -void GetXML(const DOM_Node &node, _bstr_t &text)
  +void GetXML(const DOMNode* node, _bstr_t &text)
   {
   	xmlstream stream;
   	stream << node;
  
  
  
  1.3       +4 -7      xml-xerces/c/src/xercesc/com/XMLDOMUtil.h
  
  Index: XMLDOMUtil.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMUtil.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLDOMUtil.h	14 Mar 2003 12:44:49 -0000	1.2
  +++ XMLDOMUtil.h	25 Feb 2004 18:38:33 -0000	1.3
  @@ -62,17 +62,14 @@
   #define ___wrapnode_h___
   
   #include <xercesc/util/XercesDefs.hpp>
  -#include <xercesc/dom/deprecated/DOM_Node.hpp>
  +#include <xercesc/dom/DOMNode.hpp>
   XERCES_CPP_NAMESPACE_USE
   
  -class XERCES_CPP_NAMESPACE_QUALIFIER DOM_Node;
  -
   extern const OLECHAR* g_DomNodeName[];
   extern const int	g_DomNodeNameSize;
   
  -void GetXML (const DOM_Node &node, _bstr_t &text);
  -DOMString GetText(const DOM_Node& node);
  -HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal);
  +void GetXML (const DOMNode* node, _bstr_t &text);
  +HRESULT wrapNode(IXMLDOMDocument *pDoc, DOMNode* node, REFIID iid, LPVOID *pVal);
   
   
   
  
  
  
  1.2       +3 -58     xml-xerces/c/src/xercesc/com/XMLDOMXMLDecl.cpp
  
  Index: XMLDOMXMLDecl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMXMLDecl.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLDOMXMLDecl.cpp	1 Feb 2002 22:21:42 -0000	1.1
  +++ XMLDOMXMLDecl.cpp	25 Feb 2004 18:38:33 -0000	1.2
  @@ -94,64 +94,9 @@
   
   	try
   	{
  -		unsigned int len= 0;
  -		unsigned int totalLen = 0;
  -		DOMString version(xmlDecl.getVersion());
  -		len = version.length();
  -		if(len > 0) totalLen = len + 10;
  -
  -		DOMString standalone(xmlDecl.getStandalone());
  -		len = standalone.length();
  -		if(len > 0) {
  -			if(totalLen > 0)
  -				totalLen += len + 14;
  -			else
  -				totalLen = len + 13;
  -		}
  -
  -		DOMString encoding(xmlDecl.getEncoding());
  -		len = encoding.length();
  -		if(len > 0) {
  -			if(totalLen > 0)
  -				totalLen += len + 13;
  -			else
  -				totalLen = len + 12;
  -		}
  -
  -		*pVal = SysAllocStringLen(NULL,totalLen+1);
  -		**pVal = 0;
  -
  -		len = version.length();
  -		totalLen = len;
  -		if(len > 0) {
  -			wcscpy(*pVal,OLESTR("version=\""));
  -			wcsncat(*pVal,version.rawBuffer(),len);
  -			wcscat(*pVal,OLESTR("\""));
  -		}
  -
  -		len = standalone.length();
  -		if(len > 0) {
  -			if(totalLen > 0)
  -				wcscat(*pVal,OLESTR(" standalone=\""));
  -			else
  -				wcscat(*pVal,OLESTR("standalone=\""));
  -			wcsncat(*pVal,standalone.rawBuffer(),len);
  -			wcscat(*pVal,OLESTR("\""));
  -			totalLen += len;
  -		}
  -
  -		len = encoding.length();
  -		if(len > 0) {
  -			if(totalLen > 0)
  -				wcscat(*pVal,OLESTR(" encoding=\""));
  -			else
  -				wcscat(*pVal,OLESTR("encoding=\""));
  -			wcsncat(*pVal,encoding.rawBuffer(),len);
  -			wcscat(*pVal,OLESTR("\""));
  -		}
  -
  +        *pVal = SysAllocString(xmlDecl->getTarget());
   	}
  -	catch(DOM_DOMException& ex)
  +	catch(DOMException& ex)
   	{
   		return MakeHRESULT(ex);
   	}
  
  
  
  1.6       +4 -3      xml-xerces/c/src/xercesc/com/XMLDOMXMLDecl.h
  
  Index: XMLDOMXMLDecl.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMXMLDecl.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLDOMXMLDecl.h	21 Nov 2003 12:05:48 -0000	1.5
  +++ XMLDOMXMLDecl.h	25 Feb 2004 18:38:33 -0000	1.6
  @@ -58,8 +58,9 @@
   #ifndef ___xmldomxmldecl_h___
   #define ___xmldomxmldecl_h___
   
  -#include <xercesc/dom/deprecated/DOM_XMLDecl.hpp>
  +#include <xercesc/dom/DOMProcessingInstruction.hpp>
   #include "IXMLDOMNodeImpl.h"
  +
   XERCES_CPP_NAMESPACE_USE
   
   class ATL_NO_VTABLE CXMLDOMXMLDecl : 
  @@ -75,7 +76,7 @@
   		ReleaseOwnerDoc();
   	}
   
  -	virtual DOM_Node& get_DOM_Node()			 { return xmlDecl;} 
  +	virtual DOMNode* get_DOMNode()			 { return xmlDecl;} 
   	virtual DOMNodeType get_DOMNodeType() const  { return NODE_PROCESSING_INSTRUCTION; }
   
   DECLARE_NOT_AGGREGATABLE(CXMLDOMXMLDecl)
  @@ -93,7 +94,7 @@
   	STDMETHOD(get_data)(BSTR  *pVal);
   	STDMETHOD(put_data)(BSTR newVal);
   
  -	DOM_XMLDecl xmlDecl;
  +	DOMProcessingInstruction* xmlDecl;
   };
   
   typedef CComObject<CXMLDOMXMLDecl> CXMLDOMXMLDeclObj;
  
  
  
  1.6       +4 -1      xml-xerces/c/src/xercesc/com/XMLHttpRequest.h
  
  Index: XMLHttpRequest.h
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLHttpRequest.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLHttpRequest.h	12 Feb 2004 13:49:43 -0000	1.5
  +++ XMLHttpRequest.h	25 Feb 2004 18:38:33 -0000	1.6
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.6  2004/02/25 18:38:33  amassari
  + * The COM wrapper doesn't use the deprecated DOM anymore
  + *
    * Revision 1.5  2004/02/12 13:49:43  amassari
    * Updated version to 2.5
    *
  @@ -85,7 +88,7 @@
   #ifndef ___xmlhttprequest_h___
   #define ___xmlhttprequest_h___
   
  -#include <xercesc/dom/deprecated/DOM_Document.hpp>
  +#include <xercesc/dom/DOMDocument.hpp>
   #include "IXMLDOMNodeImpl.h"
   
   #include "resource.h"       // main symbols
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org


Mime
View raw message