dmitryh 2004/12/14 10:59:07
Modified: c/src/xalanc/XMLSupport FormatterToDOM.cpp
FormatterToDOM.hpp FormatterToHTML.cpp
FormatterToHTML.hpp FormatterToText.cpp
FormatterToText.hpp FormatterToXML_UTF16.cpp
FormatterToXML_UTF16.hpp FormatterToXML_UTF8.cpp
FormatterToXML_UTF8.hpp FormatterToXMLBase.cpp
FormatterToXMLBase.hpp
Log:
Fix for providing backward API compatibility for Formatter* classes
Revision Changes Path
1.6 +5 -5 xml-xalan/c/src/xalanc/XMLSupport/FormatterToDOM.cpp
Index: FormatterToDOM.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToDOM.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FormatterToDOM.cpp 8 Nov 2004 18:14:35 -0000 1.5
+++ FormatterToDOM.cpp 14 Dec 2004 18:59:06 -0000 1.6
@@ -55,11 +55,11 @@
-FormatterToDOM::FormatterToDOM(
- MemoryManagerType& theManager ,
+FormatterToDOM::FormatterToDOM(
XalanDocument* doc,
XalanDocumentFragment* docFrag,
- XalanElement* currentElement) :
+ XalanElement* currentElement,
+ MemoryManagerType& theManager ) :
FormatterListener(OUTPUT_METHOD_DOM),
m_doc(doc),
m_docFrag(docFrag),
@@ -74,9 +74,9 @@
FormatterToDOM::FormatterToDOM(
- MemoryManagerType& theManager,
XalanDocument* doc,
- XalanElement* elem) :
+ XalanElement* elem,
+ MemoryManagerType& theManager) :
FormatterListener(OUTPUT_METHOD_DOM),
m_doc(doc),
m_docFrag(0),
1.8 +5 -5 xml-xalan/c/src/xalanc/XMLSupport/FormatterToDOM.hpp
Index: FormatterToDOM.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToDOM.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FormatterToDOM.hpp 8 Nov 2004 18:14:35 -0000 1.7
+++ FormatterToDOM.hpp 14 Dec 2004 18:59:06 -0000 1.8
@@ -68,10 +68,10 @@
* @param currentElement current element for nodes
*/
FormatterToDOM(
- MemoryManagerType& theManager,
XalanDocument* doc,
XalanDocumentFragment* docFrag,
- XalanElement* currentElement);
+ XalanElement* currentElement,
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
/**
* Construct a FormatterToDOM instance. it will add the DOM nodes
@@ -81,9 +81,9 @@
* @param elem current element for nodes
*/
FormatterToDOM(
- MemoryManagerType& theManager,
- XalanDocument* doc,
- XalanElement* elem);
+ XalanDocument* doc,
+ XalanElement* elem,
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
virtual
~FormatterToDOM();
1.9 +5 -5 xml-xalan/c/src/xalanc/XMLSupport/FormatterToHTML.cpp
Index: FormatterToHTML.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToHTML.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FormatterToHTML.cpp 10 Nov 2004 19:09:11 -0000 1.8
+++ FormatterToHTML.cpp 14 Dec 2004 18:59:06 -0000 1.9
@@ -58,7 +58,6 @@
FormatterToHTML::FormatterToHTML(
- MemoryManagerType& theManager,
Writer& writer,
const XalanDOMString& encoding,
const XalanDOMString& mediaType,
@@ -67,7 +66,8 @@
bool doIndent,
int indent,
bool escapeURLs,
- bool omitMetaTag) :
+ bool omitMetaTag,
+ MemoryManagerType& theManager) :
FormatterToXML(
writer,
s_emptyString,
@@ -122,8 +122,7 @@
ThisType* theResult = theGuard.get();
new (theResult) ThisType(
- theManager,
- writer,
+ writer,
encoding,
mediaType,
doctypeSystem,
@@ -131,7 +130,8 @@
doIndent,
indent,
escapeURLs,
- omitMetaTag);
+ omitMetaTag,
+ theManager);
theGuard.release();
1.7 +2 -2 xml-xalan/c/src/xalanc/XMLSupport/FormatterToHTML.hpp
Index: FormatterToHTML.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToHTML.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FormatterToHTML.hpp 8 Nov 2004 18:14:35 -0000 1.6
+++ FormatterToHTML.hpp 14 Dec 2004 18:59:06 -0000 1.7
@@ -73,7 +73,6 @@
* @param omitMetaTag Whether or not to output a META TAG according
to the recommendation. The default is false.
*/
FormatterToHTML(
- MemoryManagerType& theManager,
Writer& writer,
const XalanDOMString& encoding =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
const XalanDOMString& mediaType =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
@@ -82,7 +81,8 @@
bool doIndent = true,
int indent
= eDefaultIndentAmount,
bool escapeURLs =
true,
- bool omitMetaTag =
false);
+ bool omitMetaTag =
false,
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
static FormatterToHTML*
create(
1.8 +6 -6 xml-xalan/c/src/xalanc/XMLSupport/FormatterToText.cpp
Index: FormatterToText.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToText.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FormatterToText.cpp 8 Nov 2004 18:14:35 -0000 1.7
+++ FormatterToText.cpp 14 Dec 2004 18:59:06 -0000 1.8
@@ -47,10 +47,10 @@
FormatterToText::FormatterToText(
- MemoryManagerType& theManager,
Writer& writer,
bool normalizeLinefeed,
- bool handleIgnorableWhitespace) :
+ bool handleIgnorableWhitespace,
+ MemoryManagerType& theManager) :
FormatterListener(OUTPUT_METHOD_TEXT),
m_writer(&writer),
m_maxCharacter(XalanDOMChar(~0)),
@@ -67,11 +67,11 @@
FormatterToText::FormatterToText(
- MemoryManagerType& theManager,
Writer& writer,
const XalanDOMString& encoding,
bool
normalizeLinefeed,
- bool
handleIgnorableWhitespace) :
+ bool
handleIgnorableWhitespace,
+ MemoryManagerType& theManager ) :
FormatterListener(OUTPUT_METHOD_TEXT),
m_writer(&writer),
m_maxCharacter(0),
@@ -109,11 +109,11 @@
ThisType* theResult = theGuard.get();
new (theResult) ThisType(
- theManager,
writer,
encoding,
normalizeLinefeed,
- handleIgnorableWhitespace);
+ handleIgnorableWhitespace,
+ theManager);
theGuard.release();
1.6 +7 -7 xml-xalan/c/src/xalanc/XMLSupport/FormatterToText.hpp
Index: FormatterToText.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToText.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FormatterToText.hpp 8 Nov 2004 18:14:35 -0000 1.5
+++ FormatterToText.hpp 14 Dec 2004 18:59:06 -0000 1.6
@@ -51,7 +51,7 @@
/**
* FormatterToText instance constructor.
*/
- FormatterToText(MemoryManagerType& theManager);
+ FormatterToText(MemoryManagerType& theManager
XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
/**
* FormatterToText instance constructor.
@@ -61,10 +61,10 @@
* @param handleIgnorableWhitespace If true ignorableWhitespace() will
write data to the Writer
*/
FormatterToText(
- MemoryManagerType& theManager,
- Writer& writer,
- bool normalizeLinefeed = true,
- bool handleIgnorableWhitespace = true);
+ Writer& writer,
+ bool normalizeLinefeed = true,
+ bool handleIgnorableWhitespace =
true,
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
/**
* FormatterToText instance constructor.
@@ -75,11 +75,11 @@
* @param handleIgnorableWhitespace If true ignorableWhitespace() will
write data to the Writer
*/
FormatterToText(
- MemoryManagerType& theManager,
Writer& writer,
const XalanDOMString& encoding,
bool
normalizeLinefeed = true,
- bool
handleIgnorableWhitespace = true);
+ bool
handleIgnorableWhitespace = true,
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
static FormatterToText*
create(
1.15 +7 -6
xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML_UTF16.cpp
Index: FormatterToXML_UTF16.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML_UTF16.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FormatterToXML_UTF16.cpp 9 Nov 2004 16:06:04 -0000 1.14
+++ FormatterToXML_UTF16.cpp 14 Dec 2004 18:59:06 -0000 1.15
@@ -45,23 +45,23 @@
FormatterToXML_UTF16::FormatterToXML_UTF16(
- MemoryManagerType& theManager,
Writer& writer,
const XalanDOMString& version,
const XalanDOMString& mediaType,
const XalanDOMString& doctypeSystem,
const XalanDOMString& doctypePublic,
bool xmlDecl,
- const XalanDOMString& standalone) :
+ const XalanDOMString& standalone,
+ MemoryManagerType& theManager) :
FormatterToXMLBase(
- theManager,
writer,
version,
mediaType,
doctypeSystem,
doctypePublic,
xmlDecl,
- standalone),
+ standalone,
+ theManager),
m_buffer(),
m_bufferPosition(m_buffer),
m_bufferRemaining(kBufferSize)
@@ -97,14 +97,15 @@
ThisType* theResult = theGuard.get();
- new (theResult) ThisType( theManager,
+ new (theResult) ThisType(
writer,
version ,
mediaType ,
doctypeSystem ,
doctypePublic ,
xmlDecl ,
- standalone );
+ standalone,
+ theManager );
theGuard.release();
1.12 +3 -3
xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML_UTF16.hpp
Index: FormatterToXML_UTF16.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML_UTF16.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FormatterToXML_UTF16.hpp 8 Nov 2004 18:14:35 -0000 1.11
+++ FormatterToXML_UTF16.hpp 14 Dec 2004 18:59:07 -0000 1.12
@@ -74,14 +74,14 @@
* the standalone document declaration
*/
FormatterToXML_UTF16(
- MemoryManagerType& theManager,
- Writer& writer,
+ Writer& writer,
const XalanDOMString& version =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
const XalanDOMString& mediaType =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
const XalanDOMString& doctypeSystem =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
const XalanDOMString& doctypePublic =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
bool xmlDecl = true,
- const XalanDOMString& standalone =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()));
+ const XalanDOMString& standalone =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
static FormatterToXML_UTF16*
create(
1.15 +7 -6 xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML_UTF8.cpp
Index: FormatterToXML_UTF8.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML_UTF8.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FormatterToXML_UTF8.cpp 9 Nov 2004 16:06:04 -0000 1.14
+++ FormatterToXML_UTF8.cpp 14 Dec 2004 18:59:07 -0000 1.15
@@ -46,23 +46,23 @@
FormatterToXML_UTF8::FormatterToXML_UTF8(
- MemoryManagerType& theManager,
Writer& writer,
const XalanDOMString& version,
const XalanDOMString& mediaType,
const XalanDOMString& doctypeSystem,
const XalanDOMString& doctypePublic,
bool xmlDecl,
- const XalanDOMString& standalone) :
+ const XalanDOMString& standalone,
+ MemoryManagerType& theManager) :
FormatterToXMLBase(
- theManager,
writer,
version,
mediaType,
doctypeSystem,
doctypePublic,
xmlDecl,
- standalone),
+ standalone,
+ theManager),
m_nameFunction(0),
m_buffer(),
m_bufferPosition(m_buffer),
@@ -96,14 +96,15 @@
ThisType* theResult = theGuard.get();
- new (theResult) ThisType(theManager,
+ new (theResult) ThisType(
writer,
version,
mediaType,
doctypeSystem,
doctypePublic,
xmlDecl,
- standalone);
+ standalone,
+ theManager);
theGuard.release();
1.12 +3 -3 xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML_UTF8.hpp
Index: FormatterToXML_UTF8.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML_UTF8.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FormatterToXML_UTF8.hpp 8 Nov 2004 18:14:35 -0000 1.11
+++ FormatterToXML_UTF8.hpp 14 Dec 2004 18:59:07 -0000 1.12
@@ -72,14 +72,14 @@
* the standalone document declaration
*/
FormatterToXML_UTF8(
- MemoryManagerType& theManager,
- Writer& writer,
+ Writer& writer,
const XalanDOMString& version =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
const XalanDOMString& mediaType =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
const XalanDOMString& doctypeSystem =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
const XalanDOMString& doctypePublic =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
bool xmlDecl = true,
- const XalanDOMString& standalone =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()));
+ const XalanDOMString& standalone =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
static FormatterToXML_UTF8*
create(
1.13 +2 -2 xml-xalan/c/src/xalanc/XMLSupport/FormatterToXMLBase.cpp
Index: FormatterToXMLBase.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToXMLBase.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FormatterToXMLBase.cpp 8 Nov 2004 18:14:35 -0000 1.12
+++ FormatterToXMLBase.cpp 14 Dec 2004 18:59:07 -0000 1.13
@@ -105,14 +105,14 @@
FormatterToXMLBase::FormatterToXMLBase(
- MemoryManagerType& theManager,
Writer& writer,
const XalanDOMString& version,
const XalanDOMString& mediaType,
const XalanDOMString& doctypeSystem,
const XalanDOMString& doctypePublic,
bool xmlDecl,
- const XalanDOMString& standalone) :
+ const XalanDOMString& standalone,
+ MemoryManagerType& theManager) :
FormatterListener(OUTPUT_METHOD_XML),
m_writer(&writer),
m_nextIsRaw(false),
1.7 +2 -2 xml-xalan/c/src/xalanc/XMLSupport/FormatterToXMLBase.hpp
Index: FormatterToXMLBase.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToXMLBase.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FormatterToXMLBase.hpp 8 Nov 2004 18:14:35 -0000 1.6
+++ FormatterToXMLBase.hpp 14 Dec 2004 18:59:07 -0000 1.7
@@ -68,14 +68,14 @@
* the standalone document declaration
*/
FormatterToXMLBase(
- MemoryManagerType& theManager,
Writer& writer,
const XalanDOMString& version,
const XalanDOMString& mediaType,
const XalanDOMString& doctypeSystem,
const XalanDOMString& doctypePublic,
bool xmlDecl,
- const XalanDOMString& standalone);
+ const XalanDOMString& standalone,
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
virtual
~FormatterToXMLBase();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
