You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2005/05/26 20:21:02 UTC
cvs commit: xml-xalan/c/src/xalanc/PlatformSupport FormatterListener.cpp FormatterListener.hpp
dbertoni 2005/05/26 11:21:02
Modified: c/src/xalanc/PlatformSupport FormatterListener.cpp
FormatterListener.hpp
Log:
Changes for Jira issue XALANC-480.
Revision Changes Path
1.9 +2 -3 xml-xalan/c/src/xalanc/PlatformSupport/FormatterListener.cpp
Index: FormatterListener.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/FormatterListener.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FormatterListener.cpp 6 May 2005 17:24:31 -0000 1.8
+++ FormatterListener.cpp 26 May 2005 18:21:02 -0000 1.9
@@ -39,8 +39,7 @@
FormatterListener::FormatterListener(eFormat theFormat) :
ParentType(),
m_prefixResolver(0),
- m_outputFormat(theFormat),
- m_XMLVersion(XML_VERSION_1_0)
+ m_outputFormat(theFormat)
{
assert(length(s_piTarget) == s_piTargetLength);
assert(length(s_piData) == s_piDataLength);
1.9 +11 -38 xml-xalan/c/src/xalanc/PlatformSupport/FormatterListener.hpp
Index: FormatterListener.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/FormatterListener.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FormatterListener.hpp 8 May 2005 00:08:26 -0000 1.8
+++ FormatterListener.hpp 26 May 2005 18:21:02 -0000 1.9
@@ -51,6 +51,8 @@
typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList AttributeListType;
+XALAN_USING_XERCES(Locator)
+XALAN_USING_XERCES(AttributeList)
/**
@@ -76,37 +78,23 @@
OUTPUT_METHOD_OTHER = 5
};
-protected:
- enum eXMLVer
- {
- XML_VERSION_1_0 = 0,
- XML_VERSION_1_1 = 1
- };
-
-public:
FormatterListener(eFormat theFormat);
virtual
~FormatterListener();
+ /**
+ * Get the output format for the instance.
+ *
+ * @return An enum indicating the output format.
+ */
eFormat
getOutputFormat() const
{
return m_outputFormat;
}
- eXMLVer
- getXMLVersion() const
- {
- return m_XMLVersion;
- }
-
- bool
- isXML1_1Version()const
- {
- return ( XML_VERSION_1_1 == m_XMLVersion );
- }
- /**
+ /**
* Get the PrefixResolver for the FormatterListener
*
* @return A pointer to the PrefixResolver, if any.
@@ -214,7 +202,7 @@
resetDocument() = 0;
virtual void
- setDocumentLocator(const LocatorType* const locator) = 0;
+ setDocumentLocator(const Locator* const locator) = 0;
virtual void
startDocument() = 0;
@@ -222,7 +210,7 @@
virtual void
startElement(
const XMLCh* const name,
- AttributeListType& attrs) = 0;
+ AttributeList& attrs) = 0;
virtual Writer*
getWriter() const;
@@ -264,19 +252,6 @@
const PrefixResolver* m_prefixResolver;
static const XalanDOMString s_emptyString;
-
- /**
- * Set the output version during serializing.
- * Should be called once
- *
- * @param theVersion XML version of the output
- */
- void
- setXMLVersion( eXMLVer theVersion )
- {
- *(const_cast<eXMLVer*>(&m_XMLVersion)) = theVersion;
- }
-
private:
@@ -291,8 +266,6 @@
// Data membmers...
const eFormat m_outputFormat;
-
- const eXMLVer m_XMLVersion;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org