dbertoni 01/01/25 09:15:13
Modified: c/src/XSLT ElemAttribute.cpp ElemElement.cpp
FunctionGenerateID.cpp
Log:
Change for Solaris port.
Revision Changes Path
1.14 +15 -6 xml-xalan/c/src/XSLT/ElemAttribute.cpp
Index: ElemAttribute.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttribute.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemAttribute.cpp 2001/01/08 18:29:48 1.13
+++ ElemAttribute.cpp 2001/01/25 17:15:04 1.14
@@ -158,14 +158,18 @@
ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
- StylesheetExecutionContext::GetAndReleaseCachedString
attrName(executionContext);
+ StylesheetExecutionContext::GetAndReleaseCachedString
attrNameGuard(executionContext);
+ XalanDOMString& attrName = attrNameGuard.get();
+
m_pNameAVT->evaluate(attrName, sourceNode, *this, executionContext);
if(!isEmpty(attrName))
{
// save original attribute name
- StylesheetExecutionContext::GetAndReleaseCachedString
origAttrName(executionContext);
+ StylesheetExecutionContext::GetAndReleaseCachedString
origAttrNameGuard(executionContext);
+
+ XalanDOMString& origAttrName = origAttrNameGuard.get();
assign(origAttrName, attrName);
@@ -173,9 +177,10 @@
unsigned int indexOfNSSep = 0;
- // save original attribute name
- StylesheetExecutionContext::GetAndReleaseCachedString
attrNameSpace(executionContext);
+ StylesheetExecutionContext::GetAndReleaseCachedString
attrNameSpaceGuard(executionContext);
+ XalanDOMString& attrNameSpace =
attrNameSpaceGuard.get();
+
if(0 != m_pNamespaceAVT)
{
m_pNamespaceAVT->evaluate(attrNameSpace, sourceNode,
*this, executionContext);
@@ -206,11 +211,15 @@
}
else
{
-
StylesheetExecutionContext::GetAndReleaseCachedString
newPrefix(executionContext);
+
StylesheetExecutionContext::GetAndReleaseCachedString
newPrefixGuard(executionContext);
+
+ XalanDOMString& newPrefix =
newPrefixGuard.get();
executionContext.getUniqueNamespaceValue(newPrefix);
+
+
StylesheetExecutionContext::GetAndReleaseCachedString
nsDeclGuard(executionContext);
-
StylesheetExecutionContext::GetAndReleaseCachedString
nsDecl(executionContext);
+ XalanDOMString& nsDecl =
nsDeclGuard.get();
reserve(nsDecl,
DOMServices::s_XMLNamespaceWithSeparatorLength + length(newPrefix) + 1);
1.14 +12 -4 xml-xalan/c/src/XSLT/ElemElement.cpp
Index: ElemElement.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemElement.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemElement.cpp 2001/01/08 18:29:50 1.13
+++ ElemElement.cpp 2001/01/25 17:15:05 1.14
@@ -165,8 +165,10 @@
XalanNode*
sourceNode,
const QName& mode)
const
{
- StylesheetExecutionContext::GetAndReleaseCachedString
elemName(executionContext);
+ StylesheetExecutionContext::GetAndReleaseCachedString
elemNameGuard(executionContext);
+ XalanDOMString& elemName = elemNameGuard.get();
+
m_nameAVT->evaluate(elemName, sourceNode, *this, executionContext);
bool isIllegalElement = false;
@@ -211,7 +213,9 @@
{
if(0 != m_namespaceAVT)
{
- StylesheetExecutionContext::GetAndReleaseCachedString
elemNameSpace(executionContext);
+ StylesheetExecutionContext::GetAndReleaseCachedString
elemNameSpaceGuard(executionContext);
+
+ XalanDOMString& elemNameSpace =
elemNameSpaceGuard.get();
m_namespaceAVT->evaluate(elemNameSpace, sourceNode,
*this, executionContext);
@@ -235,11 +239,15 @@
}
else
{
-
StylesheetExecutionContext::GetAndReleaseCachedString
newPrefix(executionContext);
+
StylesheetExecutionContext::GetAndReleaseCachedString
newPrefixGuard(executionContext);
+ XalanDOMString& newPrefix =
newPrefixGuard.get();
+
executionContext.getUniqueNamespaceValue(newPrefix);
+
+
StylesheetExecutionContext::GetAndReleaseCachedString
nsDeclGuard(executionContext);
-
StylesheetExecutionContext::GetAndReleaseCachedString
nsDecl(executionContext);
+ XalanDOMString& nsDecl =
nsDeclGuard.get();
reserve(nsDecl,
DOMServices::s_XMLNamespaceWithSeparatorLength + length(newPrefix) + 1);
1.15 +1 -1 xml-xalan/c/src/XSLT/FunctionGenerateID.cpp
Index: FunctionGenerateID.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionGenerateID.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FunctionGenerateID.cpp 2001/01/08 18:29:51 1.14
+++ FunctionGenerateID.cpp 2001/01/25 17:15:07 1.15
@@ -133,7 +133,7 @@
theID.get() = m_prefix;
- getSuffix(context, theID);
+ getSuffix(context, theID.get());
return executionContext.getXObjectFactory().createString(theID);
}
