dbertoni 02/04/06 11:37:08
Modified: c/src/XercesParserLiaison XercesDocumentBridge.cpp
XercesDocumentBridge.hpp XercesParserLiaison.cpp
XercesParserLiaison.hpp
Log:
Removed broken document numbering code.
Revision Changes Path
1.22 +0 -10
xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.cpp
Index: XercesDocumentBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XercesDocumentBridge.cpp 23 Feb 2002 04:16:42 -0000 1.21
+++ XercesDocumentBridge.cpp 6 Apr 2002 19:37:08 -0000 1.22
@@ -103,11 +103,9 @@
XercesDocumentBridge::XercesDocumentBridge(
const DOM_Document& theXercesDocument,
- unsigned long theNumber,
bool threadSafe,
bool buildBridge) :
XalanDocument(),
- m_number(theNumber),
m_xercesDocument(theXercesDocument),
m_documentElement(0),
m_nodeMap(),
@@ -1549,14 +1547,6 @@
#else
static_cast<XalanElement*>(mapNode(theXercesNode));
#endif
-}
-
-
-
-unsigned long
-XercesDocumentBridge::getNumber() const
-{
- return m_number;
}
1.19 +0 -7
xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.hpp
Index: XercesDocumentBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XercesDocumentBridge.hpp 23 Feb 2002 04:16:42 -0000 1.18
+++ XercesDocumentBridge.hpp 6 Apr 2002 19:37:08 -0000 1.19
@@ -134,14 +134,12 @@
* an unbuilt node at the same time.
*
* @param theXercesDocument The Xerces document to bridge
- * @param theNumber The number of the document.
* @param threadSafe If true, the tree can safely be shared amongst
multiple threads. (Also implies buildBridge == true)
* @param buildBridge If true, all of the bridge nodes will be built
during construction.
*
*/
XercesDocumentBridge(
const DOM_Document& theXercesDocument,
- unsigned long theNumber = ~0UL,
bool threadSafe =
true,
bool buildBridge =
true);
@@ -299,9 +297,6 @@
virtual XalanElement*
getElementById(const XalanDOMString& elementId) const;
- virtual unsigned long
- getNumber() const;
-
// These are some special interfaces to manage relationships between
// our nodes and Xerces nodes.
@@ -562,8 +557,6 @@
// This is a private helper class for building the tree...
friend class BuildBridgeTreeWalker;
-
- const unsigned long
m_number;
// $$$ ToDo: This is because DOM_Document::getElementById() is not
// const...
1.44 +3 -15
xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.cpp
Index: XercesParserLiaison.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- XercesParserLiaison.cpp 23 Feb 2002 04:16:42 -0000 1.43
+++ XercesParserLiaison.cpp 6 Apr 2002 19:37:08 -0000 1.44
@@ -111,10 +111,7 @@
-XercesParserLiaison::XercesParserLiaison(
- XercesDOMSupport& /* theSupport */,
- DocumentNumberType theStartingNumber) :
- m_documentNumber(theStartingNumber),
+XercesParserLiaison::XercesParserLiaison(XercesDOMSupport& /* theSupport
*/) :
m_indent(-1),
m_useValidation(false),
m_includeIgnorableWhitespace(true),
@@ -131,8 +128,7 @@
-XercesParserLiaison::XercesParserLiaison(DocumentNumberType
theStartingNumber) :
- m_documentNumber(theStartingNumber),
+XercesParserLiaison::XercesParserLiaison() :
m_indent(-1),
m_useValidation(false),
m_includeIgnorableWhitespace(true),
@@ -266,14 +262,6 @@
-XercesParserLiaison::DocumentNumberType
-XercesParserLiaison::getNextDocumentNumber()
-{
- return m_documentNumber++;
-}
-
-
-
int
XercesParserLiaison::getIndent() const
{
@@ -599,7 +587,7 @@
bool buildBridge)
{
XercesDocumentBridge* const theNewDocument =
- new XercesDocumentBridge(theXercesDocument,
getNextDocumentNumber(), threadSafe, buildBridge);
+ new XercesDocumentBridge(theXercesDocument, threadSafe,
buildBridge);
m_documentMap[theNewDocument] = theNewDocument;
1.32 +2 -18
xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.hpp
Index: XercesParserLiaison.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.hpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- XercesParserLiaison.hpp 23 Feb 2002 04:16:42 -0000 1.31
+++ XercesParserLiaison.hpp 6 Apr 2002 19:37:08 -0000 1.32
@@ -99,20 +99,15 @@
* Construct a XercesParserLiaison instance.
*
* @param theSupport instance of DOMSupport object
- * @param theStartingNumber the starting number for documents
*
* @deprecated This constructor is deprecated. Use the next
constructor instead.
*/
- XercesParserLiaison(
- XercesDOMSupport& theSupport,
- DocumentNumberType theStartingNumber = 0);
+ XercesParserLiaison(XercesDOMSupport& theSupport);
/**
* Construct a XercesParserLiaison instance.
- *
- * @param theStartingNumber the starting number for documents
*/
- XercesParserLiaison(DocumentNumberType theStartingNumber = 0);
+ XercesParserLiaison();
virtual
~XercesParserLiaison();
@@ -150,9 +145,6 @@
virtual void
destroyDocument(XalanDocument* theDocument);
- virtual DocumentNumberType
- getNextDocumentNumber();
-
virtual int
getIndent() const;
@@ -424,12 +416,6 @@
}
}
- DocumentNumberType
- getDocumentNumber() const
- {
- return m_documentNumber;
- }
-
protected:
static void
@@ -460,8 +446,6 @@
private:
// Data members...
- unsigned long m_documentNumber;
-
int m_indent;
bool m_useValidation;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
