mhoyt 2004/11/11 12:24:41
Modified: c/src/xalanc/DOMSupport DOMSupport.hpp DOMSupportDefault.cpp
DOMSupportDefault.hpp
c/src/xalanc/XPath XPathExecutionContext.hpp
XPathExecutionContextDefault.cpp
XPathExecutionContextDefault.hpp
c/src/xalanc/XSLT FunctionUnparsedEntityURI.cpp
StylesheetExecutionContext.hpp
StylesheetExecutionContextDefault.cpp
StylesheetExecutionContextDefault.hpp
c/src/xalanc/XalanSourceTree XalanSourceTreeDOMSupport.cpp
XalanSourceTreeDOMSupport.hpp
c/src/xalanc/XalanTransformer XalanDefaultParsedSource.cpp
XalanDefaultParsedSource.hpp
c/src/xalanc/XercesParserLiaison XercesDOMSupport.cpp
XercesDOMSupport.hpp
Log:
Modified getUnparsedEntityURI(s) to return/use returned string reference
Revision Changes Path
1.6 +1 -2 xml-xalan/c/src/xalanc/DOMSupport/DOMSupport.hpp
Index: DOMSupport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/DOMSupport/DOMSupport.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DOMSupport.hpp 8 Nov 2004 18:04:45 -0000 1.5
+++ DOMSupport.hpp 11 Nov 2004 20:24:41 -0000 1.6
@@ -63,8 +63,7 @@
virtual const XalanDOMString&
getUnparsedEntityURI(
const XalanDOMString& theName,
- const XalanDocument& theDocument,
- XalanDOMString& theURI) const = 0;
+ const XalanDocument& theDocument) const = 0;
/**
* Determine if a node is after another node, in document order.
1.7 +2 -2 xml-xalan/c/src/xalanc/DOMSupport/DOMSupportDefault.cpp
Index: DOMSupportDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/DOMSupport/DOMSupportDefault.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DOMSupportDefault.cpp 8 Nov 2004 18:04:45 -0000 1.6
+++ DOMSupportDefault.cpp 11 Nov 2004 20:24:41 -0000 1.7
@@ -61,9 +61,9 @@
const XalanDOMString&
DOMSupportDefault::getUnparsedEntityURI(
const XalanDOMString& theName,
- const XalanDocument& theDocument,
- XalanDOMString& theURI) const
+ const XalanDocument& theDocument) const
{
+ XalanDOMString theURI(m_pool.getMemoryManager());
const XalanDocumentType* const theDoctype =
theDocument.getDoctype();
1.6 +1 -2 xml-xalan/c/src/xalanc/DOMSupport/DOMSupportDefault.hpp
Index: DOMSupportDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/DOMSupport/DOMSupportDefault.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DOMSupportDefault.hpp 8 Nov 2004 18:04:45 -0000 1.5
+++ DOMSupportDefault.hpp 11 Nov 2004 20:24:41 -0000 1.6
@@ -55,8 +55,7 @@
virtual const XalanDOMString&
getUnparsedEntityURI(
const XalanDOMString& theName,
- const XalanDocument& theDocument,
- XalanDOMString& theURI) const;
+ const XalanDocument& theDocument) const;
virtual bool
isNodeAfter(
1.15 +1 -2 xml-xalan/c/src/xalanc/XPath/XPathExecutionContext.hpp
Index: XPathExecutionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XPathExecutionContext.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XPathExecutionContext.hpp 8 Nov 2004 18:17:12 -0000 1.14
+++ XPathExecutionContext.hpp 11 Nov 2004 20:24:41 -0000 1.15
@@ -621,8 +621,7 @@
virtual const XalanDOMString&
getUnparsedEntityURI(
const XalanDOMString& theName,
- const XalanDocument& theDocument,
- XalanDOMString& theResult) const = 0;
+ const XalanDocument& theDocument) const = 0;
/**
* Tells, through the combination of the default-space attribute
1.13 +2 -3
xml-xalan/c/src/xalanc/XPath/XPathExecutionContextDefault.cpp
Index: XPathExecutionContextDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XPath/XPathExecutionContextDefault.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XPathExecutionContextDefault.cpp 8 Nov 2004 18:17:12 -0000 1.12
+++ XPathExecutionContextDefault.cpp 11 Nov 2004 20:24:41 -0000 1.13
@@ -470,10 +470,9 @@
const XalanDOMString&
XPathExecutionContextDefault::getUnparsedEntityURI(
const XalanDOMString& theName,
- const XalanDocument& theDocument,
- XalanDOMString& theResult) const
+ const XalanDocument& theDocument) const
{
- return m_domSupport->getUnparsedEntityURI(theName, theDocument,
theResult);
+ return m_domSupport->getUnparsedEntityURI(theName, theDocument);
}
1.12 +1 -2
xml-xalan/c/src/xalanc/XPath/XPathExecutionContextDefault.hpp
Index: XPathExecutionContextDefault.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XPath/XPathExecutionContextDefault.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XPathExecutionContextDefault.hpp 8 Nov 2004 18:17:12 -0000 1.11
+++ XPathExecutionContextDefault.hpp 11 Nov 2004 20:24:41 -0000 1.12
@@ -296,8 +296,7 @@
virtual const XalanDOMString&
getUnparsedEntityURI(
const XalanDOMString& theName,
- const XalanDocument& theDocument,
- XalanDOMString& theResult) const;
+ const XalanDocument& theDocument) const;
virtual bool
shouldStripSourceNode(const XalanText& node);
1.7 +1 -5 xml-xalan/c/src/xalanc/XSLT/FunctionUnparsedEntityURI.cpp
Index: FunctionUnparsedEntityURI.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XSLT/FunctionUnparsedEntityURI.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionUnparsedEntityURI.cpp 8 Nov 2004 18:18:56 -0000 1.6
+++ FunctionUnparsedEntityURI.cpp 11 Nov 2004 20:24:41 -0000 1.7
@@ -79,11 +79,7 @@
context->getOwnerDocument();
assert(doc != 0);
- const XPathExecutionContext::GetAndReleaseCachedString
theGuard(executionContext);
-
- XalanDOMString& uri = theGuard.get();
-
- executionContext.getUnparsedEntityURI(name, *doc, uri);
+ const XalanDOMString& uri =
executionContext.getUnparsedEntityURI(name, *doc);
return
executionContext.getXObjectFactory().createStringReference(uri);
}
1.25 +1 -2
xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContext.hpp
Index: StylesheetExecutionContext.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContext.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- StylesheetExecutionContext.hpp 8 Nov 2004 18:18:56 -0000 1.24
+++ StylesheetExecutionContext.hpp 11 Nov 2004 20:24:41 -0000 1.25
@@ -2077,8 +2077,7 @@
virtual const XalanDOMString&
getUnparsedEntityURI(
const XalanDOMString& theName,
- const XalanDocument& theDocument,
- XalanDOMString& theResult) const = 0;
+ const XalanDocument& theDocument) const = 0;
virtual bool
shouldStripSourceNode(const XalanText& node) = 0;
1.35 +2 -5
xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp
Index: StylesheetExecutionContextDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- StylesheetExecutionContextDefault.cpp 8 Nov 2004 18:18:56 -0000
1.34
+++ StylesheetExecutionContextDefault.cpp 11 Nov 2004 20:24:41 -0000
1.35
@@ -2303,12 +2303,9 @@
const XalanDOMString&
StylesheetExecutionContextDefault::getUnparsedEntityURI(
const XalanDOMString& theName,
- const XalanDocument& theDocument,
- XalanDOMString& theResult) const
+ const XalanDocument& theDocument) const
{
- m_xpathExecutionContextDefault.getUnparsedEntityURI(theName,
theDocument, theResult);
-
- return theResult;
+ return m_xpathExecutionContextDefault.getUnparsedEntityURI(theName,
theDocument);
}
1.34 +1 -2
xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp
Index: StylesheetExecutionContextDefault.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- StylesheetExecutionContextDefault.hpp 8 Nov 2004 18:18:56 -0000
1.33
+++ StylesheetExecutionContextDefault.hpp 11 Nov 2004 20:24:41 -0000
1.34
@@ -990,8 +990,7 @@
virtual const XalanDOMString&
getUnparsedEntityURI(
const XalanDOMString& theName,
- const XalanDocument& theDocument,
- XalanDOMString& theResult) const;
+ const XalanDocument& theDocument) const;
virtual bool
shouldStripSourceNode(const XalanText& node);
1.6 +3 -3
xml-xalan/c/src/xalanc/XalanSourceTree/XalanSourceTreeDOMSupport.cpp
Index: XalanSourceTreeDOMSupport.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XalanSourceTree/XalanSourceTreeDOMSupport.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanSourceTreeDOMSupport.cpp 8 Nov 2004 19:15:38 -0000 1.5
+++ XalanSourceTreeDOMSupport.cpp 11 Nov 2004 20:24:41 -0000 1.6
@@ -77,8 +77,7 @@
const XalanDOMString&
XalanSourceTreeDOMSupport::getUnparsedEntityURI(
const XalanDOMString& theName,
- const XalanDocument& theDocument,
- XalanDOMString& /*theResult*/) const
+ const XalanDocument& theDocument) const
{
if (m_parserLiaison != 0)
{
@@ -88,10 +87,11 @@
if (theXSTDocument != 0)
{
return theXSTDocument->getUnparsedEntityURI(theName);
+
}
}
- return s_emptyString;
+ return s_emptyString;
}
1.6 +1 -2
xml-xalan/c/src/xalanc/XalanSourceTree/XalanSourceTreeDOMSupport.hpp
Index: XalanSourceTreeDOMSupport.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XalanSourceTree/XalanSourceTreeDOMSupport.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanSourceTreeDOMSupport.hpp 8 Nov 2004 19:15:38 -0000 1.5
+++ XalanSourceTreeDOMSupport.hpp 11 Nov 2004 20:24:41 -0000 1.6
@@ -54,8 +54,7 @@
virtual const XalanDOMString&
getUnparsedEntityURI(
const XalanDOMString& theName,
- const XalanDocument& theDocument,
- XalanDOMString& theResult) const;
+ const XalanDocument& theDocument) const;
virtual bool
isNodeAfter(
1.7 +3 -6
xml-xalan/c/src/xalanc/XalanTransformer/XalanDefaultParsedSource.cpp
Index: XalanDefaultParsedSource.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XalanTransformer/XalanDefaultParsedSource.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanDefaultParsedSource.cpp 8 Nov 2004 19:20:04 -0000 1.6
+++ XalanDefaultParsedSource.cpp 11 Nov 2004 20:24:41 -0000 1.7
@@ -67,15 +67,13 @@
const XalanDOMString&
XalanDefaultParsedSourceDOMSupport::getUnparsedEntityURI(
const XalanDOMString& theName,
- const XalanDocument& theDocument,
- XalanDOMString& theResult ) const
+ const XalanDocument& theDocument) const
{
// Check the wrapped XalanSourceTreeDOMSupport instance...
const XalanDOMString& theURI =
m_domSupport.getUnparsedEntityURI(
theName,
- theDocument,
- theResult);
+ theDocument);
if (length(theURI) != 0)
{
@@ -86,8 +84,7 @@
// Chain up to our parent...
return XalanSourceTreeDOMSupport::getUnparsedEntityURI(
theName,
- theDocument,
- theResult);
+ theDocument);
}
}
1.7 +1 -2
xml-xalan/c/src/xalanc/XalanTransformer/XalanDefaultParsedSource.hpp
Index: XalanDefaultParsedSource.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XalanTransformer/XalanDefaultParsedSource.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanDefaultParsedSource.hpp 8 Nov 2004 19:20:04 -0000 1.6
+++ XalanDefaultParsedSource.hpp 11 Nov 2004 20:24:41 -0000 1.7
@@ -60,8 +60,7 @@
virtual const XalanDOMString&
getUnparsedEntityURI(
const XalanDOMString& theName,
- const XalanDocument& theDocument,
- XalanDOMString& theResult) const;
+ const XalanDocument& theDocument) const;
virtual bool
isNodeAfter(
1.6 +2 -3
xml-xalan/c/src/xalanc/XercesParserLiaison/XercesDOMSupport.cpp
Index: XercesDOMSupport.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XercesParserLiaison/XercesDOMSupport.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesDOMSupport.cpp 8 Nov 2004 18:13:57 -0000 1.5
+++ XercesDOMSupport.cpp 11 Nov 2004 20:24:41 -0000 1.6
@@ -61,10 +61,9 @@
const XalanDOMString&
XercesDOMSupport::getUnparsedEntityURI(
const XalanDOMString& theName,
- const XalanDocument& theDocument,
- XalanDOMString& theURI) const
+ const XalanDocument& theDocument) const
{
- return m_domSupportDefault.getUnparsedEntityURI(theName, theDocument,
theURI);
+ return m_domSupportDefault.getUnparsedEntityURI(theName, theDocument);
}
1.7 +1 -2
xml-xalan/c/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp
Index: XercesDOMSupport.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesDOMSupport.hpp 10 Nov 2004 19:09:12 -0000 1.6
+++ XercesDOMSupport.hpp 11 Nov 2004 20:24:41 -0000 1.7
@@ -51,8 +51,7 @@
virtual const XalanDOMString&
getUnparsedEntityURI(
const XalanDOMString& theName,
- const XalanDocument& theDocument,
- XalanDOMString& theURI) const;
+ const XalanDocument& theDocument) const;
virtual bool
isNodeAfter(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
