dbertoni 01/06/29 11:45:53
Modified: c/src/XMLSupport FormatterToDOM.cpp FormatterToDOM.hpp
FormatterToHTML.cpp FormatterToHTML.hpp
Log:
Added PrefixResolver to FormatterListener. Moved files to PlatformSupport subsystem.
Revision Changes Path
1.16 +3 -8 xml-xalan/c/src/XMLSupport/FormatterToDOM.cpp
Index: FormatterToDOM.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToDOM.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FormatterToDOM.cpp 2001/05/14 01:00:39 1.15
+++ FormatterToDOM.cpp 2001/06/29 18:45:47 1.16
@@ -80,13 +80,10 @@
#include <PlatformSupport/DOMStringHelper.hpp>
+#include <PlatformSupport/PrefixResolver.hpp>
-#include <DOMSupport/PrefixResolver.hpp>
-
-
-
const XalanDOMString FormatterToDOM::s_emptyString;
@@ -101,8 +98,7 @@
m_currentElem(currentElement),
m_elemStack(),
m_buffer1(),
- m_buffer2(),
- m_prefixResolver(0)
+ m_buffer2()
{
assert(m_doc != 0 && m_docFrag != 0);
}
@@ -118,8 +114,7 @@
m_currentElem(elem),
m_elemStack(),
m_buffer1(),
- m_buffer2(),
- m_prefixResolver(0)
+ m_buffer2()
{
assert(m_doc != 0);
}
1.16 +0 -15 xml-xalan/c/src/XMLSupport/FormatterToDOM.hpp
Index: FormatterToDOM.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToDOM.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FormatterToDOM.hpp 2001/05/14 01:00:39 1.15
+++ FormatterToDOM.hpp 2001/06/29 18:45:48 1.16
@@ -77,7 +77,6 @@
-class PrefixResolver;
class XalanDocument;
class XalanDocumentFragment;
class XalanElement;
@@ -121,18 +120,6 @@
~FormatterToDOM();
- const PrefixResolver*
- getPrefixResolver() const
- {
- return m_prefixResolver;
- }
-
- void
- setPrefixResolver(const PrefixResolver* thePrefixResolver)
- {
- m_prefixResolver = thePrefixResolver;
- }
-
// These methods are inherited from DocumentHandler ...
virtual void
@@ -272,8 +259,6 @@
XalanDOMString m_buffer1;
XalanDOMString m_buffer2;
-
- const PrefixResolver* m_prefixResolver;
static const XalanDOMString s_emptyString;
};
1.58 +1 -2 xml-xalan/c/src/XMLSupport/FormatterToHTML.cpp
Index: FormatterToHTML.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToHTML.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- FormatterToHTML.cpp 2001/06/21 20:48:01 1.57
+++ FormatterToHTML.cpp 2001/06/29 18:45:49 1.58
@@ -77,6 +77,7 @@
#include <PlatformSupport/DOMStringHelper.hpp>
+#include <PlatformSupport/PrefixResolver.hpp>
#include <PlatformSupport/Writer.hpp>
#include <PlatformSupport/XalanUnicode.hpp>
#include <PlatformSupport/XalanXMLChar.hpp>
@@ -84,7 +85,6 @@
#include <DOMSupport/DOMServices.hpp>
-#include <DOMSupport/PrefixResolver.hpp>
@@ -122,7 +122,6 @@
m_escapeURLs(true),
m_isFirstElement(false),
m_elementLevel(0),
- m_prefixResolver(0),
m_hasNamespaceStack()
{
initCharsMap();
1.25 +1 -22 xml-xalan/c/src/XMLSupport/FormatterToHTML.hpp
Index: FormatterToHTML.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToHTML.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- FormatterToHTML.hpp 2001/03/12 02:32:16 1.24
+++ FormatterToHTML.hpp 2001/06/29 18:45:50 1.25
@@ -58,7 +58,7 @@
#define FORMATTERTOHTML_HEADER_GUARD_1357924680
/**
- * $Id: FormatterToHTML.hpp,v 1.24 2001/03/12 02:32:16 dbertoni Exp $
+ * $Id: FormatterToHTML.hpp,v 1.25 2001/06/29 18:45:50 dbertoni Exp $
*
* $State: Exp $
*
@@ -91,10 +91,6 @@
-class PrefixResolver;
-
-
-
/**
* FormatterToHTML formats SAX-style events into HTML.
*/
@@ -198,18 +194,6 @@
const XMLCh* const data);
- const PrefixResolver*
- getPrefixResolver() const
- {
- return m_prefixResolver;
- }
-
- void
- setPrefixResolver(const PrefixResolver* thePrefixResolver)
- {
- m_prefixResolver = thePrefixResolver;
- }
-
class ElemDesc
{
public:
@@ -477,11 +461,6 @@
* A counter so we can tell if we're inside the document element.
*/
int m_elementLevel;
-
- /**
- * A prefix resolver for elements that have prefixes.
- */
- const PrefixResolver* m_prefixResolver;
/**
* A stack to determine if the current element has
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
