diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 11:46:24 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 11:46:24 +0000 |
| commit | 62d6ec6bd5f1666dea0fbfcb5a4e586873dff9d3 (patch) | |
| tree | f8ef7eeaf90011141c7f8e0f6947a2b7e4e13567 /writerfilter | |
| parent | e6d18f920b7d69a4ca0519e8c7e6f44ebad404a6 (diff) | |
INTEGRATION: CWS xmlfilter06 (1.5.6); FILE MERGED
2008/06/05 15:59:01 hbrinkm 1.5.6.3: debug code
2008/06/02 15:15:04 hbrinkm 1.5.6.2: use TagLogger
2008/05/27 11:36:10 dr 1.5.6.1: joined changes from CWS xmlfilter05
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLParserState.cxx | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx index a496003a595e..e475416db489 100644 --- a/writerfilter/source/ooxml/OOXMLParserState.cxx +++ b/writerfilter/source/ooxml/OOXMLParserState.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: OOXMLParserState.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.6 $ * * This file is part of OpenOffice.org. * @@ -31,6 +31,7 @@ #include <stdio.h> #include <iostream> #include "OOXMLParserState.hxx" +#include "ooxmlLoggers.hxx" namespace writerfilter { namespace ooxml @@ -177,9 +178,9 @@ void OOXMLParserState::newCharacterProperty(const Id & rId, (new OOXMLPropertyImpl(rId, pVal, OOXMLPropertyImpl::ATTRIBUTE)); #ifdef DEBUG_PROPERTIES - logger("DEBUG", "<newCharacterProperty>"); - logger("DEBUG", pProperty->toString()); - logger("DEBUG", "</newCharacterProperty>"); + debug_logger->startElement("<newCharacterProperty"); + debug_logger->chars(pProperty->toString()); + debug_logger->endElement("newCharacterProperty"); #endif mpCharacterProps->add(pProperty); @@ -192,15 +193,20 @@ void OOXMLParserState::resolveCharacterProperties(Stream & rStream) if (mpCharacterProps.get() != NULL) { #ifdef DEBUG_PROPERTIES - logger("DEBUG", "<resolveCharacterProperties>"); - logger("DEBUG", mpCharacterProps->toString()); - logger("DEBUG", "</resolveCharacterProperties>"); + debug_logger->startElement("resolveCharacterProperties"); + debug_logger->chars(mpCharacterProps->toString()); + debug_logger->endElement("resolveCharacterProperties"); #endif rStream.props(mpCharacterProps); mpCharacterProps.reset(new OOXMLPropertySetImpl()); } } +OOXMLPropertySet::Pointer_t OOXMLParserState::getCharacterProperties() const +{ + return mpCharacterProps; +} + void OOXMLParserState::setCharacterProperties (OOXMLPropertySet::Pointer_t pProps) { @@ -258,6 +264,8 @@ XMLTag::Pointer_t OOXMLParserState::toTag() const pTag->addAttr("XNoteId", OUStringToOString(getXNoteId(), RTL_TEXTENCODING_ASCII_US).getStr()); + if (mpCharacterProps != OOXMLPropertySet::Pointer_t()) + pTag->chars(mpCharacterProps->toString()); return pTag; } |