Kaydet (Commit) 82463bdd authored tarafından Tor Lillqvist's avatar Tor Lillqvist Kaydeden (comit) Miklos Vajna

We can simply use DBG_UTIL now after efc29fbb

Change-Id: I74cce2d3fb4661ea9a44d0b166ca98dfade53056
Reviewed-on: https://gerrit.libreoffice.org/69604
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
üst d3d02f29
......@@ -27,12 +27,6 @@ $(eval $(call gb_Library_use_sdk_api,writerfilter))
$(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter))
$(eval $(call gb_Library_add_defs,writerfilter,\
$(if $(ENABLE_DBGUTIL), \
-DDEBUG_WRITERFILTER \
) \
))
$(eval $(call gb_Library_use_libraries,writerfilter,\
basegfx \
comphelper \
......
......@@ -352,7 +352,7 @@ public:
/**
Returns string representation of this value.
*/
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
virtual std::string toString() const = 0;
#endif
};
......@@ -385,14 +385,14 @@ public:
/**
Returns name of sprm.
*/
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
virtual std::string getName() const = 0;
#endif
/**
Returns string representation of sprm.
*/
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
virtual std::string toString() const = 0;
#endif
......
......@@ -235,7 +235,7 @@ DomainMapper::~DomainMapper()
}
catch( const uno::Exception& ) {}
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().endDocument();
#endif
}
......@@ -2756,7 +2756,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
break;
default:
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("unhandled");
TagLogger::getInstance().attribute("id", nSprmId);
TagLogger::getInstance().attribute("name", rSprm.getName());
......@@ -3048,7 +3048,7 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len)
{
//TODO: Determine the right text encoding (FIB?)
OUString sText( reinterpret_cast<const char*>(data_), len, RTL_TEXTENCODING_MS_1252 );
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("text");
TagLogger::getInstance().chars(sText);
TagLogger::getInstance().endElement();
......
......@@ -39,7 +39,7 @@
#include <sal/log.hxx>
#include <comphelper/sequence.hxx>
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
#include "PropertyMapHelper.hxx"
#include <rtl/ustring.hxx>
#endif
......@@ -70,7 +70,7 @@ void DomainMapperTableHandler::startTable(const TablePropertyMapPtr& pProps)
m_aTableProperties = pProps;
m_aTableRanges.clear();
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("tablehandler.table");
if (pProps.get() != nullptr)
......@@ -168,7 +168,7 @@ static void lcl_computeCellBorders( const PropertyMapPtr& pTableBorders, const P
}
}
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
static void lcl_debug_BorderLine(table::BorderLine const & rLine)
{
......@@ -413,7 +413,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
aGrabBag["TableStyleRightBorder"] <<= aBorderLine;
}
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("mergedProps");
if (pMergedProperties)
pMergedProperties->dumpXml();
......@@ -423,7 +423,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
m_aTableProperties->InsertProps(pMergedProperties);
m_aTableProperties->InsertProps(pTableProps);
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("TableProperties");
m_aTableProperties->dumpXml();
TagLogger::getInstance().endElement();
......@@ -450,7 +450,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
// Set the table default attributes for the cells
rInfo.pTableDefaults->InsertProps(m_aTableProperties.get());
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("TableDefaults");
rInfo.pTableDefaults->dumpXml();
TagLogger::getInstance().endElement();
......@@ -533,7 +533,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
m_aTableProperties->Insert( PROP_TABLE_BORDER, uno::makeAny( aTableBorder ) );
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
lcl_debug_TableBorder(aTableBorder);
#endif
......@@ -620,7 +620,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
rInfo.aTableProperties = m_aTableProperties->GetPropertyValues();
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("debug.tableprops");
m_aTableProperties->dumpXml();
TagLogger::getInstance().endElement();
......@@ -646,7 +646,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(TableInfo & rInfo, std::vector<HorizontallyMergedCell>& rMerges)
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("getCellProperties");
#endif
......@@ -654,7 +654,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
if ( m_aCellProperties.empty() )
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().endElement();
#endif
return aCellProperties;
......@@ -811,7 +811,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
pAllCellProps->InsertProps(*aCellIterator);
std::swap(*(*aCellIterator), *pAllCellProps );
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("cell");
TagLogger::getInstance().attribute("cell", nCell);
TagLogger::getInstance().attribute("row", nRow);
......@@ -864,7 +864,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
}
pSingleCellProperties[nCell] = (*aCellIterator)->GetPropertyValues();
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().endElement();
#endif
}
......@@ -876,7 +876,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
++aRowIter;
}
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().endElement();
#endif
......@@ -940,7 +940,7 @@ static bool lcl_emptyRow(std::vector<RowSequence_t>& rTableRanges, sal_Int32 nRo
css::uno::Sequence<css::beans::PropertyValues> DomainMapperTableHandler::endTableGetRowProperties()
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("getRowProperties");
#endif
......@@ -948,7 +948,7 @@ css::uno::Sequence<css::beans::PropertyValues> DomainMapperTableHandler::endTabl
sal_Int32 nRow = 0;
for( const auto& rRow : m_aRowProperties )
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("rowProps.row");
#endif
if (rRow)
......@@ -966,18 +966,18 @@ css::uno::Sequence<css::beans::PropertyValues> DomainMapperTableHandler::endTabl
}
aRowProperties[nRow] = rRow->GetPropertyValues();
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
rRow->dumpXml();
lcl_DumpPropertyValues(aRowProperties[nRow]);
#endif
}
++nRow;
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().endElement();
#endif
}
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().endElement();
#endif
......@@ -1003,7 +1003,7 @@ static void lcl_ApplyCellParaProps(uno::Reference<table::XCell> const& xCell,
void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTableStartsAtCellStart)
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("tablehandler.endTable");
#endif
......@@ -1020,7 +1020,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab
css::uno::Sequence<css::beans::PropertyValues> aRowProperties = endTableGetRowProperties();
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
lcl_DumpPropertyValueSeq(aRowProperties);
#endif
......@@ -1123,7 +1123,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab
{
SAL_INFO("writerfilter.dmapper",
"Conversion to table error: " << e);
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().chars(std::string("failed to import table!"));
#endif
}
......@@ -1197,7 +1197,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab
m_aRowProperties.clear();
m_bHadFootOrEndnote = false;
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().endElement();
TagLogger::getInstance().endElement();
#endif
......@@ -1208,7 +1208,7 @@ void DomainMapperTableHandler::startRow(const TablePropertyMapPtr& pProps)
m_aRowProperties.push_back( pProps.get() );
m_aCellProperties.emplace_back( );
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("table.row");
if (pProps != nullptr)
pProps->dumpXml();
......@@ -1220,7 +1220,7 @@ void DomainMapperTableHandler::startRow(const TablePropertyMapPtr& pProps)
void DomainMapperTableHandler::endRow()
{
m_aTableRanges.push_back(comphelper::containerToSequence(m_aRowRanges));
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().endElement();
#endif
}
......@@ -1239,7 +1239,7 @@ void DomainMapperTableHandler::startCell(const css::uno::Reference< css::text::X
m_aCellProperties[nRow - 1].push_back( pEmptyProps.get() );
}
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("table.cell");
TagLogger::getInstance().startElement("table.cell.start");
TagLogger::getInstance().chars(XTextRangeToString(start));
......@@ -1258,7 +1258,7 @@ void DomainMapperTableHandler::startCell(const css::uno::Reference< css::text::X
void DomainMapperTableHandler::endCell(const css::uno::Reference< css::text::XTextRange > & end)
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("table.cell.end");
TagLogger::getInstance().chars(XTextRangeToString(end));
TagLogger::getInstance().endElement();
......
......@@ -116,7 +116,7 @@ void DomainMapperTableManager::finishTableLook()
bool DomainMapperTableManager::sprm(Sprm & rSprm)
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("tablemanager.sprm");
string sSprm = rSprm.toString();
TagLogger::getInstance().chars(sSprm);
......@@ -189,7 +189,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
}
}
}
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
pPropMap->dumpXml();
#endif
insertTableProps(pPropMap);
......@@ -268,7 +268,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
break;
case NS_ooxml::LN_CT_TcPrBase_gridSpan: //number of grid positions spanned by this cell
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("tablemanager.GridSpan");
TagLogger::getInstance().attribute("gridSpan", nIntValue);
TagLogger::getInstance().endElement();
......@@ -379,7 +379,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
default:
bRet = false;
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().element("unhandled");
#endif
}
......@@ -490,7 +490,7 @@ void DomainMapperTableManager::endLevel( )
m_aTmpTableProperties.pop_back( );
TableManager::endLevel( );
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("dmappertablemanager.endLevel");
PropertyMapPtr pProps = getTableProps().get();
if (pProps.get() != nullptr)
......@@ -506,7 +506,7 @@ void DomainMapperTableManager::endLevel( )
void DomainMapperTableManager::endOfCellAction()
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().element("endOFCellAction");
#endif
......@@ -519,7 +519,7 @@ void DomainMapperTableManager::endOfCellAction()
void DomainMapperTableManager::endOfRowAction()
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("endOfRowAction");
#endif
......@@ -566,13 +566,13 @@ void DomainMapperTableManager::endOfRowAction()
IntVectorPtr pCellWidths = getCurrentCellWidths( );
if(!m_nTableWidth && !pTableGrid->empty())
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("tableWidth");
#endif
for( const auto& rCell : *pTableGrid )
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("col");
TagLogger::getInstance().attribute("width", rCell);
TagLogger::getInstance().endElement();
......@@ -588,7 +588,7 @@ void DomainMapperTableManager::endOfRowAction()
insertTableProps(pPropMap);
}
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().endElement();
#endif
}
......@@ -600,7 +600,7 @@ void DomainMapperTableManager::endOfRowAction()
pCurrentSpans->insert( pCurrentSpans->end( ), m_nCell.back( ) - pCurrentSpans->size(), 1 );
}
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("gridSpans");
{
for (const auto& rGridSpan : *pCurrentSpans)
......@@ -676,7 +676,7 @@ void DomainMapperTableManager::endOfRowAction()
TablePropertyMapPtr pPropMap( new TablePropertyMap );
pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::makeAny( aSeparators ) );
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("rowProperties");
pPropMap->dumpXml();
TagLogger::getInstance().endElement();
......@@ -722,7 +722,7 @@ void DomainMapperTableManager::endOfRowAction()
TablePropertyMapPtr pPropMap( new TablePropertyMap );
pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::makeAny( aSeparators ) );
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("rowProperties");
pPropMap->dumpXml();
TagLogger::getInstance().endElement();
......@@ -746,7 +746,7 @@ void DomainMapperTableManager::endOfRowAction()
m_nGridBefore = m_nGridAfter = 0;
m_bTableSizeTypeInserted = false;
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().endElement();
#endif
}
......
......@@ -1178,7 +1178,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con
{
if (m_bDiscardHeaderFooter)
return;
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("finishParagraph");
#endif
......@@ -1188,7 +1188,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con
return;
TextAppendContext& rAppendContext = m_aTextAppendStack.top();
uno::Reference< text::XTextAppend > xTextAppend(rAppendContext.xTextAppend);
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().attribute("isTextAppend", sal_uInt32(xTextAppend.is()));
#endif
......@@ -1602,7 +1602,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con
m_bParaAutoBefore = false;
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().endElement();
#endif
......@@ -2304,7 +2304,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
m_aAnchoredStack.push( AnchoredContext(xTxtContent) );
uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW );
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().unoPropertySet(xProps);
#endif
text::TextContentAnchorType nAnchorType(text::TextContentAnchorType_AT_PARAGRAPH);
......@@ -3107,7 +3107,7 @@ void DomainMapper_Impl::PushFieldContext()
m_bParaHadField = true;
if(m_bDiscardHeaderFooter)
return;
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().element("pushFieldContext");
#endif
......@@ -3231,7 +3231,7 @@ void FieldContext::AppendCommand(const OUString& rPart)
-----------------------------------------------------------------------*/
void DomainMapper_Impl::AppendFieldCommand(OUString const & rPartOfCommand)
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("appendFieldCommand");
TagLogger::getInstance().chars(rPartOfCommand);
TagLogger::getInstance().endElement();
......@@ -4111,7 +4111,7 @@ void DomainMapper_Impl::CloseFieldCommand()
{
if(m_bDiscardHeaderFooter)
return;
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().element("closeFieldCommand");
#endif
......@@ -4202,7 +4202,7 @@ void DomainMapper_Impl::CloseFieldCommand()
sServiceName += OUString::createFromAscii(aIt->second.cFieldServiceName );
}
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("fieldService");
TagLogger::getInstance().chars(sServiceName);
TagLogger::getInstance().endElement();
......@@ -4921,7 +4921,7 @@ static util::DateTime lcl_dateTimeFromSerial(const double& dSerial)
void DomainMapper_Impl::SetFieldResult(OUString const& rResult)
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("setFieldResult");
TagLogger::getInstance().chars(rResult);
#endif
......@@ -5043,7 +5043,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult)
void DomainMapper_Impl::SetFieldFFData(const FFDataHandler::Pointer_t& pFFDataHandler)
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().startElement("setFieldFFData");
#endif
......@@ -5056,7 +5056,7 @@ void DomainMapper_Impl::SetFieldFFData(const FFDataHandler::Pointer_t& pFFDataHa
}
}
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().endElement();
#endif
}
......@@ -5065,7 +5065,7 @@ void DomainMapper_Impl::PopFieldContext()
{
if(m_bDiscardHeaderFooter)
return;
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().element("popFieldContext");
#endif
......
......@@ -149,7 +149,7 @@ void FFDataHandler::lcl_sprm(Sprm & r_Sprm)
}
break;
default:
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().element("unhandled");
#endif
break;
......@@ -178,7 +178,7 @@ void FFDataHandler::lcl_attribute(Id name, Value & val)
}
break;
default:
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().element("unhandled");
#endif
break;
......
......@@ -125,7 +125,7 @@ void PositionHandler::lcl_attribute( Id aName, Value& rVal )
}
break;
default:
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().element("unhandled");
#endif
break;
......
......@@ -924,7 +924,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
}
break;
default:
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().element("unhandled");
#endif
break;
......
......@@ -49,7 +49,7 @@ void LatentStyleHandler::lcl_attribute(Id nId, Value& rVal)
break;
default:
bFound = false;
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
TagLogger::getInstance().element("unhandled");
#endif
break;
......
......@@ -26,7 +26,7 @@ using namespace ::com::sun::star;
namespace writerfilter
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
// class: LoggedResourcesHelper
LoggedResourcesHelper::LoggedResourcesHelper(const std::string & sPrefix)
......@@ -73,7 +73,7 @@ void LoggedResourcesHelper::attribute(const std::string & rName, sal_uInt32 nVal
// class: LoggedStream
LoggedStream::LoggedStream(
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
const std::string & sPrefix
) : mHelper(sPrefix)
#else
......@@ -89,7 +89,7 @@ LoggedStream::~LoggedStream()
void LoggedStream::startSectionGroup()
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
mHelper.startElement("section");
#endif
......@@ -100,14 +100,14 @@ void LoggedStream::endSectionGroup()
{
lcl_endSectionGroup();
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
LoggedResourcesHelper::endElement();
#endif
}
void LoggedStream::startParagraphGroup()
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
mHelper.startElement("paragraph");
#endif
......@@ -118,7 +118,7 @@ void LoggedStream::endParagraphGroup()
{
lcl_endParagraphGroup();
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
LoggedResourcesHelper::endElement();
#endif
}
......@@ -126,7 +126,7 @@ void LoggedStream::endParagraphGroup()
void LoggedStream::startCharacterGroup()
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
mHelper.startElement("charactergroup");
#endif
......@@ -137,14 +137,14 @@ void LoggedStream::endCharacterGroup()
{
lcl_endCharacterGroup();
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
LoggedResourcesHelper::endElement();
#endif
}
void LoggedStream::startShape(uno::Reference<drawing::XShape> const& xShape)
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
mHelper.startElement("shape");
#endif
......@@ -155,14 +155,14 @@ void LoggedStream::endShape()
{
lcl_endShape();
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
LoggedResourcesHelper::endElement();
#endif
}
void LoggedStream::text(const sal_uInt8 * data, size_t len)
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
mHelper.startElement("text");
OUString sText( reinterpret_cast<const char*>(data), len, RTL_TEXTENCODING_MS_1252 );
......@@ -174,14 +174,14 @@ void LoggedStream::text(const sal_uInt8 * data, size_t len)
lcl_text(data, len);
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
LoggedResourcesHelper::endElement();
#endif
}
void LoggedStream::utext(const sal_uInt8 * data, size_t len)
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
mHelper.startElement("utext");
mHelper.startElement("data");
......@@ -197,14 +197,14 @@ void LoggedStream::utext(const sal_uInt8 * data, size_t len)
lcl_utext(data, len);
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
LoggedResourcesHelper::endElement();
#endif
}
void LoggedStream::positionOffset(const OUString& rText, bool bVertical)
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
mHelper.startElement("positionOffset");
LoggedResourcesHelper::attribute("vertical", static_cast<int>(bVertical));
LoggedResourcesHelper::chars(rText);
......@@ -212,14 +212,14 @@ void LoggedStream::positionOffset(const OUString& rText, bool bVertical)
lcl_positionOffset(rText, bVertical);
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
LoggedResourcesHelper::endElement();
#endif
}
void LoggedStream::align(const OUString& rText, bool bVertical)
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
mHelper.startElement("align");
LoggedResourcesHelper::attribute("vertical", static_cast<int>(bVertical));
LoggedResourcesHelper::chars(rText);
......@@ -227,109 +227,109 @@ void LoggedStream::align(const OUString& rText, bool bVertical)
lcl_align(rText, bVertical);
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
LoggedResourcesHelper::endElement();
#endif
}
void LoggedStream::positivePercentage(const OUString& rText)
{
#ifdef DEBUG_WRITERFILTER
#ifdef DBG_UTIL
mHelper.startElement("positivePercentage");