dbertoni 2002/12/20 16:20:45
Modified: c/src/XPath XalanXPathException.hpp
XObjectResultTreeFragProxyText.cpp
XPathEnvSupport.hpp
XPathExecutionContextDefault.cpp
Log:
Use new XalanLocator functions.
Revision Changes Path
1.3 +2 -2 xml-xalan/c/src/XPath/XalanXPathException.hpp
Index: XalanXPathException.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XalanXPathException.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanXPathException.hpp 21 Nov 2002 01:26:18 -0000 1.2
+++ XalanXPathException.hpp 21 Dec 2002 00:20:45 -0000 1.3
@@ -91,8 +91,8 @@
*
* @param message message explaining the problem.
* @param theURI the URI of the related document, if known
- * @param theLineNumber the line number of the related document, or -1 if not
known
- * @param theColumnNumber the column number of the related document, or -1 if
not known
+ * @param theLineNumber the line number of the related document.
+ * @param theColumnNumber the column number of the related document.
* @param styleNode the node in the stylesheet where the problem occurred
* @param theType type of exception, default is "XalanXPathException"
*/
1.5 +1 -1 xml-xalan/c/src/XPath/XObjectResultTreeFragProxyText.cpp
Index: XObjectResultTreeFragProxyText.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectResultTreeFragProxyText.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XObjectResultTreeFragProxyText.cpp 21 Nov 2002 01:26:18 -0000 1.4
+++ XObjectResultTreeFragProxyText.cpp 21 Dec 2002 00:20:45 -0000 1.5
@@ -395,7 +395,7 @@
XalanText*
-XObjectResultTreeFragProxyText::splitText(unsigned int /* offset */)
+XObjectResultTreeFragProxyText::splitText(unsigned int /* offset */)
{
throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
1.22 +5 -6 xml-xalan/c/src/XPath/XPathEnvSupport.hpp
Index: XPathEnvSupport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEnvSupport.hpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XPathEnvSupport.hpp 21 Nov 2002 01:26:18 -0000 1.21
+++ XPathEnvSupport.hpp 21 Dec 2002 00:20:45 -0000 1.22
@@ -225,10 +225,8 @@
* (may be 0)
* @param msg string message explaining the problem.
* @param uri the URI of the stylesheet, if
available. May be 0;
- * @param lineNo line number where the problem occurred,
- * if it is known, else -1
- * @param charOffset character offset where the problem,
- * occurred if it is known, else -1
+ * @param lineNo line number where the problem occurred.
+ * @param charOffset character offset where the problem.
* @return true if the return is an ERROR, in which case exception will be
* thrown. Otherwise the processor will continue to process.
*/
@@ -243,8 +241,9 @@
int lineNo,
int charOffset)
const = 0;
- // These interfaces are inherited from Resettable...
-
+ /**
+ * Reset the instance.
+ */
virtual void
reset() = 0;
1.58 +6 -6 xml-xalan/c/src/XPath/XPathExecutionContextDefault.cpp
Index: XPathExecutionContextDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContextDefault.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- XPathExecutionContextDefault.cpp 12 Dec 2002 22:24:31 -0000 1.57
+++ XPathExecutionContextDefault.cpp 21 Dec 2002 00:20:45 -0000 1.58
@@ -509,8 +509,8 @@
{
assert(m_xpathEnvSupport != 0);
- XalanLocator::size_type lineNumber = -1;
- XalanLocator::size_type columnNumber = -1;
+ XalanLocator::size_type lineNumber = XalanLocator::getUnknownValue();
+ XalanLocator::size_type columnNumber = XalanLocator::getUnknownValue();
XalanDOMString uri;
@@ -572,8 +572,8 @@
{
assert(m_xpathEnvSupport != 0);
- int lineNumber = -1;
- int columnNumber = -1;
+ XalanLocator::size_type lineNumber = XalanLocator::getUnknownValue();
+ XalanLocator::size_type columnNumber = XalanLocator::getUnknownValue();
XalanDOMString uri;
@@ -635,8 +635,8 @@
{
assert(m_xpathEnvSupport != 0);
- int lineNumber = -1;
- int columnNumber = -1;
+ XalanLocator::size_type lineNumber = XalanLocator::getUnknownValue();
+ XalanLocator::size_type columnNumber = XalanLocator::getUnknownValue();
XalanDOMString uri;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
