diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-23 11:12:00 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-23 11:12:00 +0000 |
| commit | fb290dada0fb94a79b895dbb108d6f910e574c73 (patch) | |
| tree | 596b82848c0d5b90511a285d7df5b28d49d0ff03 /writerperfect | |
| parent | e2ae2cbccd2ce685dfc8da4b5b7cf6a7f6e33225 (diff) | |
INTEGRATION: CWS fs08 (1.2.38); FILE MERGED
2006/12/19 10:09:04 fridrich_strba 1.2.38.2: removing memory leaks and warnings with GNU/Linux gcc 3.4.5
2006/12/18 09:27:17 fridrich_strba 1.2.38.1: convert writerperfect into a framework where converter libraries based on libwpd's api can simply plug themselves
Diffstat (limited to 'writerperfect')
| -rw-r--r-- | writerperfect/source/filter/DocumentElement.cxx | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/writerperfect/source/filter/DocumentElement.cxx b/writerperfect/source/filter/DocumentElement.cxx index 336657d44964..38caf5780e15 100644 --- a/writerperfect/source/filter/DocumentElement.cxx +++ b/writerperfect/source/filter/DocumentElement.cxx @@ -26,7 +26,6 @@ */ #include "DocumentElement.hxx" -#include "DocumentHandler.hxx" #include "FilterInternal.hxx" #include <string.h> @@ -37,9 +36,9 @@ void TagElement::print() const WRITER_DEBUG_MSG(("%s\n", msTagName.cstr())); } -void TagOpenElement::write(DocumentHandler &xHandler) const +void TagOpenElement::write(DocumentHandler *pHandler) const { - xHandler.startElement(getTagName().cstr(), maAttrList); + pHandler->startElement(getTagName().cstr(), maAttrList); } void TagOpenElement::print() const @@ -52,17 +51,17 @@ void TagOpenElement::addAttribute(const char *szAttributeName, const WPXString & maAttrList.insert(szAttributeName, sAttributeValue); } -void TagCloseElement::write(DocumentHandler &xHandler) const +void TagCloseElement::write(DocumentHandler *pHandler) const { WRITER_DEBUG_MSG(("TagCloseElement: write (%s)\n", getTagName().cstr())); - xHandler.endElement(getTagName().cstr()); + pHandler->endElement(getTagName().cstr()); } -void CharDataElement::write(DocumentHandler &xHandler) const +void CharDataElement::write(DocumentHandler *pHandler) const { WRITER_DEBUG_MSG(("TextElement: write\n")); - xHandler.characters(msData); + pHandler->characters(msData); } TextElement::TextElement(const WPXString & sTextBuf) : @@ -72,7 +71,7 @@ TextElement::TextElement(const WPXString & sTextBuf) : // write: writes a text run, appropriately converting spaces to <text:s> // elements -void TextElement::write(DocumentHandler &xHandler) const +void TextElement::write(DocumentHandler *pHandler) const { WPXPropertyList xBlankAttrList; @@ -89,15 +88,15 @@ void TextElement::write(DocumentHandler &xHandler) const if (iNumConsecutiveSpaces > 1) { if (sTemp.len() > 0) { - xHandler.characters(sTemp); + pHandler->characters(sTemp); sTemp.clear(); } - xHandler.startElement("text:s", xBlankAttrList); - xHandler.endElement("text:s"); + pHandler->startElement("text:s", xBlankAttrList); + pHandler->endElement("text:s"); } else { sTemp.append(i()); } } - xHandler.characters(sTemp); + pHandler->characters(sTemp); } |