[Libreoffice-commits] core.git: writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Thu Oct 16 23:13:31 PDT 2014
writerfilter/Library_writerfilter.mk | 2
writerfilter/inc/resourcemodel/LoggedResources.hxx | 8 -
writerfilter/inc/resourcemodel/TableManager.hxx | 50 ++++++------
writerfilter/inc/resourcemodel/TagLogger.hxx | 6 -
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx | 6 -
writerfilter/source/dmapper/DomainMapper.cxx | 4
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 54 ++++++-------
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 30 +++----
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 26 +++---
writerfilter/source/dmapper/FFDataHandler.cxx | 4
writerfilter/source/dmapper/GraphicHelpers.cxx | 2
writerfilter/source/dmapper/GraphicImport.cxx | 2
writerfilter/source/dmapper/LatentStyleHandler.cxx | 2
writerfilter/source/dmapper/NumberingManager.cxx | 4
writerfilter/source/dmapper/PropertyMap.cxx | 14 +--
writerfilter/source/dmapper/PropertyMap.hxx | 2
writerfilter/source/dmapper/PropertyMapHelper.cxx | 8 -
writerfilter/source/dmapper/PropertyMapHelper.hxx | 4
writerfilter/source/dmapper/SettingsTable.cxx | 4
writerfilter/source/dmapper/StyleSheetTable.cxx | 4
writerfilter/source/dmapper/TablePositionHandler.cxx | 2
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 6 -
writerfilter/source/dmapper/TblStylePrHandler.cxx | 6 -
writerfilter/source/dmapper/ThemeTable.cxx | 18 ++--
writerfilter/source/filter/ImportFilter.cxx | 6 -
writerfilter/source/filter/RtfFilter.cxx | 4
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 8 -
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 4
writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx | 30 +++----
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx | 2
writerfilter/source/ooxml/OOXMLParserState.cxx | 2
writerfilter/source/ooxml/OOXMLParserState.hxx | 4
writerfilter/source/ooxml/OOXMLPropertySet.hxx | 4
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 28 +++---
writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx | 26 +++---
writerfilter/source/ooxml/factoryimpl.py | 2
writerfilter/source/ooxml/qnametostr.py | 2
writerfilter/source/resourcemodel/LoggedResources.cxx | 62 +++++++--------
writerfilter/source/resourcemodel/TagLogger.cxx | 6 -
writerfilter/source/resourcemodel/qnametostrcore.cxx | 2
writerfilter/source/resourcemodel/util.cxx | 2
writerfilter/source/rtftok/rtfsprm.cxx | 4
writerfilter/source/rtftok/rtfsprm.hxx | 2
writerfilter/source/rtftok/rtfvalue.cxx | 2
writerfilter/source/rtftok/rtfvalue.hxx | 2
45 files changed, 236 insertions(+), 236 deletions(-)
New commits:
commit 3beae0f05d1c8c976dfcebe02c8830752d708c74
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Oct 17 08:10:02 2014 +0200
DEBUG_DOMAINMAPPER -> DEBUG_WRITERFILTER
As it's used in the tokenizers as well.
Change-Id: I7a78cad0414c724f33b50315a45a5ff2c941f4db
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index f4c2c9e..3ce1dd7 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writer
$(eval $(call gb_Library_add_defs,writerfilter,\
$(if $(filter-out 0,$(gb_DEBUGLEVEL)), \
- -DDEBUG_DOMAINMAPPER \
+ -DDEBUG_WRITERFILTER \
) \
))
diff --git a/writerfilter/inc/resourcemodel/LoggedResources.hxx b/writerfilter/inc/resourcemodel/LoggedResources.hxx
index a914ec3..ccb3363 100644
--- a/writerfilter/inc/resourcemodel/LoggedResources.hxx
+++ b/writerfilter/inc/resourcemodel/LoggedResources.hxx
@@ -27,7 +27,7 @@
namespace writerfilter
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
class LoggedResourcesHelper
{
public:
@@ -86,7 +86,7 @@ protected:
virtual void lcl_substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref) = 0;
virtual void lcl_info(const std::string & info) = 0;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
LoggedResourcesHelper mHelper;
#endif
};
@@ -104,7 +104,7 @@ protected:
virtual void lcl_attribute(Id name, Value & val) = 0;
virtual void lcl_sprm(Sprm & sprm) = 0;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
LoggedResourcesHelper mHelper;
#endif
};
@@ -120,7 +120,7 @@ public:
protected:
virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) = 0;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
LoggedResourcesHelper mHelper;
#endif
};
diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx
index 02700d8..4b2a3d6 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -104,7 +104,7 @@ template <typename T, typename PropertiesPointer>
*/
class TableManager
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
TagLogger::Pointer_t mpTableLogger;
#endif
@@ -622,7 +622,7 @@ public:
virtual bool isIgnore() const;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
void setTagLogger(TagLogger::Pointer_t _tagLogger)
{
mpTableLogger = _tagLogger;
@@ -642,7 +642,7 @@ TableManager<T, PropertiesPointer>::TableManager()
template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::cellDepth(sal_uInt32 nDepth)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
{
mpTableLogger->startElement("tablemanager.cellDepth");
@@ -657,7 +657,7 @@ void TableManager<T, PropertiesPointer>::cellDepth(sal_uInt32 nDepth)
template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::inCell()
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
mpTableLogger->element("tablemanager.inCell");
#endif
@@ -670,7 +670,7 @@ void TableManager<T, PropertiesPointer>::inCell()
template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::endCell()
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
mpTableLogger->element("tablemanager.endCell");
#endif
@@ -681,7 +681,7 @@ void TableManager<T, PropertiesPointer>::endCell()
template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::endRow()
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
mpTableLogger->element("tablemanager.endRow");
#endif
@@ -699,7 +699,7 @@ void TableManager<T, PropertiesPointer>::setHandler
template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::handle(const T & rHandle)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger)
{
mpTableLogger->startElement("tablemanager.handle");
@@ -723,7 +723,7 @@ bool TableManager<T, PropertiesPointer>::isInTable()
template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::startLevel()
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
{
typename TableData<T, PropertiesPointer>::Pointer_t pTableData;
@@ -773,7 +773,7 @@ void TableManager<T, PropertiesPointer>::endLevel()
mState.endLevel();
mTableDataStack.pop();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
{
typename TableData<T, PropertiesPointer>::Pointer_t pTableData;
@@ -885,7 +885,7 @@ void TableManager<T, PropertiesPointer>::props(PropertiesPointer pProps)
template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::handle0x7()
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
mpTableLogger->startElement("tablemanager.handle0x7");
#endif
@@ -898,7 +898,7 @@ void TableManager<T, PropertiesPointer>::handle0x7()
else
endRow();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
mpTableLogger->endElement();
#endif
@@ -931,7 +931,7 @@ void TableManager<T, PropertiesPointer>::utext(const sal_uInt8 * data, size_t le
template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::cellProps(PropertiesPointer pProps)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
mpTableLogger->startElement("tablemanager.cellProps");
#endif
@@ -941,7 +941,7 @@ void TableManager<T, PropertiesPointer>::cellProps(PropertiesPointer pProps)
else
setCellProps(pProps);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
mpTableLogger->endElement();
#endif
@@ -951,14 +951,14 @@ template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::cellPropsByCell
(unsigned int i, PropertiesPointer pProps)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
mpTableLogger->startElement("tablemanager.cellPropsByCell");
#endif
mTableDataStack.top()->insertCellProperties(i, pProps);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
mpTableLogger->endElement();
#endif
@@ -967,7 +967,7 @@ void TableManager<T, PropertiesPointer>::cellPropsByCell
template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::insertRowProps(PropertiesPointer pProps)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
mpTableLogger->startElement("tablemanager.insertRowProps");
#endif
@@ -977,7 +977,7 @@ void TableManager<T, PropertiesPointer>::insertRowProps(PropertiesPointer pProps
else
setRowProps(pProps);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
mpTableLogger->endElement();
#endif
@@ -986,7 +986,7 @@ void TableManager<T, PropertiesPointer>::insertRowProps(PropertiesPointer pProps
template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::insertTableProps(PropertiesPointer pProps)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
mpTableLogger->startElement("tablemanager.insertTableProps");
#endif
@@ -996,7 +996,7 @@ void TableManager<T, PropertiesPointer>::insertTableProps(PropertiesPointer pPro
else
setTableProps(pProps);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
mpTableLogger->endElement();
#endif
@@ -1005,7 +1005,7 @@ void TableManager<T, PropertiesPointer>::insertTableProps(PropertiesPointer pPro
template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::resolveCurrentTable()
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
mpTableLogger->startElement("tablemanager.resolveCurrentTable");
#endif
@@ -1051,7 +1051,7 @@ void TableManager<T, PropertiesPointer>::resolveCurrentTable()
resetTableProps();
clearData();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != NULL)
mpTableLogger->endElement();
#endif
@@ -1082,7 +1082,7 @@ template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::openCell
(const T & rHandle, PropertiesPointer pProps)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mpTableLogger->startElement("tablemanager.openCell");
mpTableLogger->chars(toString(rHandle));
mpTableLogger->endElement();
@@ -1101,7 +1101,7 @@ template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::closeCell
(const T & rHandle)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mpTableLogger->startElement("tablemanager.closeCell");
mpTableLogger->chars(toString(rHandle));
mpTableLogger->endElement();
@@ -1119,7 +1119,7 @@ void TableManager<T, PropertiesPointer>::closeCell
template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::ensureOpenCell(PropertiesPointer pProps)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mpTableLogger->startElement("tablemanager.ensureOpenCell");
#endif
@@ -1136,7 +1136,7 @@ void TableManager<T, PropertiesPointer>::ensureOpenCell(PropertiesPointer pProp
pTableData->insertCellProperties(pProps);
}
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mpTableLogger->endElement();
#endif
}
diff --git a/writerfilter/inc/resourcemodel/TagLogger.hxx b/writerfilter/inc/resourcemodel/TagLogger.hxx
index 37a9078..d693e98 100644
--- a/writerfilter/inc/resourcemodel/TagLogger.hxx
+++ b/writerfilter/inc/resourcemodel/TagLogger.hxx
@@ -29,7 +29,7 @@
namespace writerfilter
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
class IdToString
{
public:
@@ -57,7 +57,7 @@ namespace writerfilter
static Pointer_t getInstance(const char * name);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
void setFileName(const std::string & filename);
void startDocument();
void endDocument();
@@ -67,7 +67,7 @@ namespace writerfilter
void startElement(const std::string & name);
#endif
void attribute(const std::string & name, const std::string & value);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
void attribute(const std::string & name, const OUString & value);
void attribute(const std::string & name, sal_uInt32 value);
void attribute(const std::string & name, const css::uno::Any aAny);
diff --git a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
index 730ae8b..e30a771 100644
--- a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
+++ b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
@@ -334,7 +334,7 @@ public:
/**
Returns string representation of this value.
*/
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string toString() const = 0;
#endif
};
@@ -377,14 +377,14 @@ public:
/**
Returns name of sprm.
*/
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string getName() const = 0;
#endif
/**
Returns string repesentation of sprm.
*/
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string toString() const = 0;
#endif
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 01101c2..e8c6e42 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2491,7 +2491,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
break;
default:
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("unhandled");
dmapper_logger->attribute("id", nSprmId);
dmapper_logger->attribute("name", rSprm.getName());
@@ -2774,7 +2774,7 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len)
{
//TODO: Determine the right text encoding (FIB?)
OUString sText( (const sal_Char*) data_, len, RTL_TEXTENCODING_MS_1252 );
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("text");
dmapper_logger->chars(sText);
dmapper_logger->endElement();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 0aa4be1..cf23230 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -36,7 +36,7 @@
#include <TablePositionHandler.hxx>
#include <ConversionHelper.hxx>
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
#include <PropertyMapHelper.hxx>
#include <rtl/ustring.hxx>
#endif
@@ -70,7 +70,7 @@ void DomainMapperTableHandler::startTable(unsigned int nRows,
m_pTableSeq = TableSequencePointer_t(new TableSequence_t(nRows));
m_nRowIndex = 0;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("tablehandler.table");
dmapper_logger->attribute("rows", nRows);
@@ -200,7 +200,7 @@ void lcl_computeCellBorders( PropertyMapPtr pTableBorders, PropertyMapPtr pCellP
}
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
void lcl_debug_BorderLine(table::BorderLine & rLine)
{
@@ -413,7 +413,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
aGrabBag["TableStyleRightBorder"] = uno::makeAny( aBorderLine );
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("mergedProps");
if (pMergedProperties)
pMergedProperties->dumpXml( dmapper_logger );
@@ -423,7 +423,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
m_aTableProperties->InsertProps(pMergedProperties);
m_aTableProperties->InsertProps(pTableProps);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("TableProperties");
m_aTableProperties->dumpXml( dmapper_logger );
dmapper_logger->endElement();
@@ -450,7 +450,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
// Set the table default attributes for the cells
rInfo.pTableDefaults->InsertProps(m_aTableProperties);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("TableDefaults");
rInfo.pTableDefaults->dumpXml( dmapper_logger );
dmapper_logger->endElement();
@@ -540,7 +540,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
m_aTableProperties->Insert( PROP_TABLE_BORDER, uno::makeAny( aTableBorder ) );
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
lcl_debug_TableBorder(aTableBorder);
#endif
@@ -580,7 +580,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
rInfo.aTableProperties = m_aTableProperties->GetPropertyValues();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("debug.tableprops");
m_aTableProperties->dumpXml( dmapper_logger );
dmapper_logger->endElement();
@@ -606,7 +606,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(TableInfo & rInfo, std::vector<HorizontallyMergedCell>& rMerges)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("getCellProperties");
#endif
@@ -614,7 +614,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
if ( !m_aCellProperties.size() )
{
- #ifdef DEBUG_DOMAINMAPPER
+ #ifdef DEBUG_WRITERFILTER
dmapper_logger->endElement();
#endif
return aCellProperties;
@@ -768,7 +768,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
pAllCellProps->InsertProps(*aCellIterator);
std::swap(*(*aCellIterator), *pAllCellProps );
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("cell");
dmapper_logger->attribute("cell", nCell);
dmapper_logger->attribute("row", nRow);
@@ -821,14 +821,14 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
}
pSingleCellProperties[nCell] = (*aCellIterator)->GetPropertyValues();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->endElement();
#endif
}
++nCell;
++aCellIterator;
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
//-->debug cell properties
{
OUString sNames;
@@ -856,7 +856,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
++aRowIter;
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->endElement();
#endif
@@ -908,7 +908,7 @@ bool lcl_emptyRow(TableSequence_t& rTableSeq, sal_Int32 nRow)
RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties()
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("getRowProperties");
#endif
@@ -919,7 +919,7 @@ RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties()
sal_Int32 nRow = 0;
while( aRowIter != aRowIterEnd )
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("rowProps.row");
#endif
if( aRowIter->get() )
@@ -938,19 +938,19 @@ RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties()
}
aRowProperties[nRow] = (*aRowIter)->GetPropertyValues();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
((*aRowIter)->dumpXml( dmapper_logger ));
lcl_DumpPropertyValues(dmapper_logger, aRowProperties[nRow]);
#endif
}
++nRow;
++aRowIter;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->endElement();
#endif
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->endElement();
#endif
@@ -976,7 +976,7 @@ static void lcl_ApplyCellParaProps(uno::Reference<table::XCell> const& xCell,
void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("tablehandler.endTable");
#endif
@@ -992,7 +992,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
RowPropertyValuesSeq_t aRowProperties = endTableGetRowProperties();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
lcl_DumpPropertyValueSeq(dmapper_logger, aRowProperties);
#endif
@@ -1066,7 +1066,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
{
SAL_INFO("writerfilter.dmapper",
"Conversion to table error: " << e.Message);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->chars(std::string("failed to import table!"));
#endif
}
@@ -1123,7 +1123,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
m_aCellProperties.clear();
m_aRowProperties.clear();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->endElement();
dmapper_logger->endElement();
#endif
@@ -1135,7 +1135,7 @@ void DomainMapperTableHandler::startRow(unsigned int nCells,
m_aRowProperties.push_back( pProps );
m_aCellProperties.push_back( PropertyMapVector1() );
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("table.row");
dmapper_logger->attribute("cells", nCells);
if (pProps != NULL)
@@ -1151,7 +1151,7 @@ void DomainMapperTableHandler::endRow()
(*m_pTableSeq)[m_nRowIndex] = *m_pRowSeq;
++m_nRowIndex;
m_nCellIndex = 0;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->endElement();
#endif
}
@@ -1170,7 +1170,7 @@ void DomainMapperTableHandler::startCell(const Handle_t & start,
m_aCellProperties[nRow - 1].push_back( pEmptyProps );
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("table.cell");
dmapper_logger->startElement("table.cell.start");
dmapper_logger->chars(toString(start));
@@ -1188,7 +1188,7 @@ void DomainMapperTableHandler::startCell(const Handle_t & start,
void DomainMapperTableHandler::endCell(const Handle_t & end)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("table.cell.end");
dmapper_logger->chars(toString(end));
dmapper_logger->endElement();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 0efd6cd..9cb8eaf 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -63,7 +63,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) :
{
m_pTablePropsHandler->SetTableManager( this );
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
setTagLogger(dmapper_logger);
#endif
}
@@ -124,7 +124,7 @@ void DomainMapperTableManager::finishTableLook()
bool DomainMapperTableManager::sprm(Sprm & rSprm)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("tablemanager.sprm");
string sSprm = rSprm.toString();
dmapper_logger->chars(sSprm);
@@ -219,7 +219,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
}
m_bTableSizeTypeInserted = true;
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
pPropMap->dumpXml( dmapper_logger );
#endif
insertTableProps(pPropMap);
@@ -357,7 +357,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
break;
case NS_ooxml::LN_CT_TcPrBase_gridSpan: //number of grid positions spanned by this cell
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("tablemanager.GridSpan");
dmapper_logger->attribute("gridSpan", nIntValue);
dmapper_logger->endElement();
@@ -473,7 +473,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
default:
bRet = false;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->element("unhandled");
#endif
}
@@ -570,7 +570,7 @@ void DomainMapperTableManager::endLevel( )
m_aTmpTableProperties.pop_back( );
DomainMapperTableManager_Base_t::endLevel( );
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("dmappertablemanager.endLevel");
PropertyMapPtr pProps = getTableProps();
if (pProps.get() != NULL)
@@ -588,7 +588,7 @@ void DomainMapperTableManager::endLevel( )
void DomainMapperTableManager::endOfCellAction()
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->element("endOFCellAction");
#endif
@@ -600,7 +600,7 @@ void DomainMapperTableManager::endOfCellAction()
void DomainMapperTableManager::endOfRowAction()
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("endOfRowAction");
#endif
@@ -646,13 +646,13 @@ void DomainMapperTableManager::endOfRowAction()
{
::std::vector<sal_Int32>::const_iterator aCellIter = pTableGrid->begin();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("tableWidth");
#endif
while( aCellIter != pTableGrid->end() )
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("col");
dmapper_logger->attribute("width", *aCellIter);
dmapper_logger->endElement();
@@ -668,7 +668,7 @@ void DomainMapperTableManager::endOfRowAction()
insertTableProps(pPropMap);
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->endElement();
#endif
}
@@ -680,7 +680,7 @@ void DomainMapperTableManager::endOfRowAction()
pCurrentSpans->insert( pCurrentSpans->end( ), m_nCell.back( ) - pCurrentSpans->size(), 1 );
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("gridSpans");
{
::std::vector<sal_Int32>::const_iterator aGridSpanIter = pCurrentSpans->begin();
@@ -758,7 +758,7 @@ void DomainMapperTableManager::endOfRowAction()
TablePropertyMapPtr pPropMap( new TablePropertyMap );
pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::makeAny( aSeparators ) );
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("rowProperties");
pPropMap->dumpXml( dmapper_logger );
dmapper_logger->endElement();
@@ -797,7 +797,7 @@ void DomainMapperTableManager::endOfRowAction()
TablePropertyMapPtr pPropMap( new TablePropertyMap );
pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::makeAny( aSeparators ) );
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("rowProperties");
pPropMap->dumpXml( dmapper_logger );
dmapper_logger->endElement();
@@ -824,7 +824,7 @@ void DomainMapperTableManager::endOfRowAction()
m_bHasBtlrCell = false;
m_bTableSizeTypeInserted = false;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->endElement();
#endif
}
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index adee004..3a86394 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -68,7 +68,7 @@
#include <oox/mathml/import.hxx>
#include <GraphicHelpers.hxx>
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
#include <resourcemodel/QNameToString.hxx>
#include <resourcemodel/util.hxx>
#include <dmapperLoggers.hxx>
@@ -992,7 +992,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("finishParagraph");
#endif
@@ -1005,7 +1005,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
xTextAppend = rAppendContext.xTextAppend;
PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->attribute("isTextAppend", xTextAppend.is());
#endif
@@ -1178,7 +1178,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
SetIsOutsideAParagraph(true);
m_bParaHadField = false;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->endElement();
#endif
}
@@ -1837,7 +1837,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW );
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->unoPropertySet(xProps);
#endif
text::TextContentAnchorType nAnchorType(text::TextContentAnchorType_AT_PARAGRAPH);
@@ -2542,7 +2542,7 @@ void DomainMapper_Impl::PushFieldContext()
m_bParaHadField = true;
if(m_bDiscardHeaderFooter)
return;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->element("pushFieldContext");
#endif
@@ -2657,7 +2657,7 @@ void FieldContext::AppendCommand(const OUString& rPart)
-----------------------------------------------------------------------*/
void DomainMapper_Impl::AppendFieldCommand(OUString& rPartOfCommand)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("appendFieldCommand");
dmapper_logger->chars(rPartOfCommand);
dmapper_logger->endElement();
@@ -3371,7 +3371,7 @@ void DomainMapper_Impl::CloseFieldCommand()
{
if(m_bDiscardHeaderFooter)
return;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->element("closeFieldCommand");
#endif
@@ -3458,7 +3458,7 @@ void DomainMapper_Impl::CloseFieldCommand()
sServiceName += OUString::createFromAscii(aIt->second.cFieldServiceName );
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("fieldService");
dmapper_logger->chars(sServiceName);
dmapper_logger->endElement();
@@ -4061,7 +4061,7 @@ void DomainMapper_Impl::AppendFieldResult(OUString const& rString)
void DomainMapper_Impl::SetFieldResult(OUString const& rResult)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("setFieldResult");
dmapper_logger->chars(rResult);
#endif
@@ -4169,7 +4169,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult)
void DomainMapper_Impl::SetFieldFFData(FFDataHandler::Pointer_t pFFDataHandler)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("setFieldFFData");
#endif
@@ -4182,7 +4182,7 @@ void DomainMapper_Impl::SetFieldFFData(FFDataHandler::Pointer_t pFFDataHandler)
}
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->endElement();
#endif
}
@@ -4194,7 +4194,7 @@ void DomainMapper_Impl::PopFieldContext()
{
if(m_bDiscardHeaderFooter)
return;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->element("popFieldContext");
#endif
diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx b/writerfilter/source/dmapper/FFDataHandler.cxx
index 6717caa..d076d40 100644
--- a/writerfilter/source/dmapper/FFDataHandler.cxx
+++ b/writerfilter/source/dmapper/FFDataHandler.cxx
@@ -130,7 +130,7 @@ void FFDataHandler::lcl_sprm(Sprm & r_Sprm)
}
break;
default:
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->element("unhandled");
#endif
break;
@@ -159,7 +159,7 @@ void FFDataHandler::lcl_attribute(Id name, Value & val)
}
break;
default:
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->element("unhandled");
#endif
break;
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 4756478..c0ba37b 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -123,7 +123,7 @@ void PositionHandler::lcl_attribute( Id aName, Value& rVal )
}
break;
default:
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->element("unhandled");
#endif
break;
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 7562c01..63c71da 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -917,7 +917,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
}
break;
default:
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->element("unhandled");
#endif
break;
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.cxx b/writerfilter/source/dmapper/LatentStyleHandler.cxx
index 39b677e..287c571 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.cxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.cxx
@@ -52,7 +52,7 @@ void LatentStyleHandler::lcl_attribute(Id rName, Value& rVal)
break;
default:
bFound = false;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->element("unhandled");
#endif
break;
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index eb420b7..825ccaa 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -48,7 +48,7 @@ namespace dmapper {
//--------------------------------------------------- Utility functions
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
void lcl_printProperties( uno::Sequence< beans::PropertyValue > aProps )
{
sal_Int32 nLen = aProps.getLength( );
@@ -578,7 +578,7 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper,
// Get the merged level properties
uno::Sequence< beans::PropertyValue > aLvlProps = aProps[sal_Int32( nLevel )];
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
lcl_printProperties( aLvlProps );
#endif
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 2d9c77d..bb50c74 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -226,7 +226,7 @@ uno::Sequence< beans::PropertyValue > PropertyMap::GetPropertyValues(bool bCharG
return m_aValues;
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
static void lcl_AnyToTag(const uno::Any & rAny)
{
try {
@@ -253,7 +253,7 @@ static void lcl_AnyToTag(const uno::Any & rAny)
void PropertyMap::Insert( PropertyIds eId, const uno::Any& rAny, bool bOverwrite, GrabBagType i_GrabBagType )
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
const OUString& rInsert = PropertyNameSupplier::
GetPropertyNameSupplier().GetName(eId);
@@ -293,7 +293,7 @@ bool PropertyMap::isSet( PropertyIds eId) const
return m_vMap.find(eId)!=m_vMap.end();
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
void PropertyMap::dumpXml( const TagLogger::Pointer_t pLogger ) const
{
pLogger->startElement("PropertyMap");
@@ -363,14 +363,14 @@ void PropertyMap::InsertProps(const PropertyMapPtr pMap)
void PropertyMap::insertTableProperties( const PropertyMap* )
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->element("PropertyMap.insertTableProperties");
#endif
}
void PropertyMap::printProperties()
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("properties");
MapIterator aMapIter = m_vMap.begin();
@@ -1590,7 +1590,7 @@ void TablePropertyMap::setValue( TablePropertyMapTarget eWhich, sal_Int32 nSet )
void TablePropertyMap::insertTableProperties( const PropertyMap* pMap )
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("TablePropertyMap.insertTableProperties");
pMap->dumpXml(dmapper_logger);
#endif
@@ -1608,7 +1608,7 @@ void TablePropertyMap::insertTableProperties( const PropertyMap* pMap )
}
}
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dumpXml( dmapper_logger );
dmapper_logger->endElement();
#endif
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 2369cf3..36d7705 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -171,7 +171,7 @@ public:
std::vector< RedlineParamsPtr >& Redlines() { return m_aRedlines; }
void printProperties();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual void dumpXml( const TagLogger::Pointer_t pLogger ) const;
#endif
static com::sun::star::table::ShadowFormat getShadowFromBorder(com::sun::star::table::BorderLine2 aBorder);
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx
index 0c22146..be20db9 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.cxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star;
void lcl_DumpTableColumnSeparators(const TagLogger::Pointer_t pLogger, const uno::Any & rTableColumnSeparators)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
uno::Sequence<text::TableColumnSeparator> aSeq;
rTableColumnSeparators >>= aSeq;
@@ -48,10 +48,10 @@ void lcl_DumpTableColumnSeparators(const TagLogger::Pointer_t pLogger, const uno
}
pLogger->endElement();
-#endif // DEBUG_DOMAINMAPPER
+#endif // DEBUG_WRITERFILTER
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
void lcl_DumpPropertyValues(const TagLogger::Pointer_t pLogger, beans::PropertyValues & rValues)
{
pLogger->startElement("propertyValues");
@@ -111,7 +111,7 @@ void lcl_DumpPropertyValueSeqSeq(const TagLogger::Pointer_t pLogger, PropertyVal
pLogger->endElement();
}
-#endif // DEBUG_DOMAINMAPPER
+#endif // DEBUG_WRITERFILTER
}
}
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/writerfilter/source/dmapper/PropertyMapHelper.hxx
index fe22298..a102fc8 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.hxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx
@@ -30,7 +30,7 @@ namespace dmapper
void lcl_DumpTableColumnSeparators(const TagLogger::Pointer_t pLogger,
const css::uno::Any & rTableColumnSeparators);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
void lcl_DumpPropertyValues(const TagLogger::Pointer_t pLogger,
css::beans::PropertyValues & rValues);
@@ -41,7 +41,7 @@ void lcl_DumpPropertyValueSeq(const TagLogger::Pointer_t pLogger,
typedef css::uno::Sequence<PropertyValueSeq_t> PropertyValueSeqSeq_t;
void lcl_DumpPropertyValueSeqSeq(const TagLogger::Pointer_t pLogger,
PropertyValueSeqSeq_t & rPropValSeqSeq);
-#endif // DEBUG_DOMAINMAPPER
+#endif // DEBUG_WRITERFILTER
}
}
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index f0bc088..dd2cef5 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -167,7 +167,7 @@ void SettingsTable::lcl_attribute(Id nName, Value & val)
break;
default:
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->element("unhandled");
#endif
}
@@ -283,7 +283,7 @@ void SettingsTable::lcl_sprm(Sprm& rSprm)
break;
default:
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->element("unhandled");
#endif
}
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 9b3782c..b923ce8 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -513,7 +513,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
break;
default:
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->element("unhandled");
#endif
}
@@ -1177,7 +1177,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
catch( const lang::WrappedTargetException& rWrapped)
{
(void) rWrapped;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
OUString aMessage("StyleSheetTable::ApplyStyleSheets: Some style properties could not be set");
beans::UnknownPropertyException aUnknownPropertyException;
diff --git a/writerfilter/source/dmapper/TablePositionHandler.cxx b/writerfilter/source/dmapper/TablePositionHandler.cxx
index 2c65271..f45656c 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.cxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.cxx
@@ -80,7 +80,7 @@ void TablePositionHandler::lcl_attribute(Id rName, Value& rVal)
m_nBottomFromText = rVal.getInt();
break;
default:
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->element("unhandled");
#endif
break;
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index a46387f..de7d4c5 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -57,7 +57,7 @@ namespace dmapper {
bool TablePropertiesHandler::sprm(Sprm & rSprm)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("TablePropertiesHandler.sprm");
dmapper_logger->attribute("sprm", rSprm.toString());
#endif
@@ -245,7 +245,7 @@ namespace dmapper {
TablePropertyMapPtr pTablePropMap( new TablePropertyMap );
pTablePropMap->InsertProps(pBorderHandler->getProperties());
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
pTablePropMap->dumpXml( dmapper_logger );
#endif
insertTableProps( pTablePropMap );
@@ -411,7 +411,7 @@ namespace dmapper {
break;
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->endElement();
#endif
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index 2d05756..2311c6f 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -68,7 +68,7 @@ OUString TblStylePrHandler::getTypeString()
void TblStylePrHandler::lcl_attribute(Id rName, Value & rVal)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("TblStylePrHandler.attribute");
dmapper_logger->attribute("name", (*QNameToString::Instance())(rName));
dmapper_logger->chars(rVal.toString());
@@ -128,7 +128,7 @@ void TblStylePrHandler::lcl_attribute(Id rName, Value & rVal)
void TblStylePrHandler::lcl_sprm(Sprm & rSprm)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("TblStylePrHandler.sprm");
dmapper_logger->attribute("sprm", rSprm.toString());
#endif
@@ -187,7 +187,7 @@ void TblStylePrHandler::lcl_sprm(Sprm & rSprm)
}
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->endElement();
#endif
}
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx
index 68efb48..f7d8c3c 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -21,7 +21,7 @@
#include <ooxml/resourceids.hxx>
#include "dmapperLoggers.hxx"
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
#include <resourcemodel/QNameToString.hxx>
#endif
@@ -62,7 +62,7 @@ ThemeTable::~ThemeTable()
void ThemeTable::lcl_attribute(Id Name, Value & val)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("ThemeTable.attribute");
dmapper_logger->attribute("name", (*QNameToString::Instance())(Name));
dmapper_logger->attribute("value", val.toString());
@@ -89,7 +89,7 @@ void ThemeTable::lcl_attribute(Id Name, Value & val)
break;
default:
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->element("unhandled");
#endif
}
@@ -100,14 +100,14 @@ void ThemeTable::lcl_attribute(Id Name, Value & val)
m_pImpl->m_supplementalFontName = "";
m_pImpl->m_supplementalFontId = 0;
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->endElement();
#endif
}
void ThemeTable::lcl_sprm(Sprm& rSprm)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("ThemeTable.sprm");
dmapper_logger->chars(rSprm.toString());
#endif
@@ -154,25 +154,25 @@ void ThemeTable::lcl_sprm(Sprm& rSprm)
break;
default:
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->element("unhandled");
#endif
}
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->endElement();
#endif
}
void ThemeTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("ThemeTable.entry");
#endif
ref->resolve(*this);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->endElement();
#endif
}
diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx
index 1eb2670..4cddcc9 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -29,7 +29,7 @@
#include <dmapper/DomainMapper.hxx>
#include <WriterFilter.hxx>
#include <ooxml/OOXMLDocument.hxx>
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
#include <iostream>
#include <osl/process.h>
#endif
@@ -77,7 +77,7 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes
if ( !xInputStream.is() )
return sal_False;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
OUString sURL = aMediaDesc.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_URL(), OUString() );
::std::string sURLc = OUStringToOString(sURL, RTL_TEXTENCODING_ASCII_US).getStr();
@@ -164,7 +164,7 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes
pStream.reset();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->endDocument();
#endif
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index 01a5895..2161de4 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -72,7 +72,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescrip
bool bRepairStorage = aMediaDesc.getUnpackedValueOrDefault("RepairPackage", false);
bool bIsNewDoc = !aMediaDesc.getUnpackedValueOrDefault("InsertMode", false);
uno::Reference<text::XTextRange> xInsertTextRange = aMediaDesc.getUnpackedValueOrDefault("TextInsertModeRange", uno::Reference<text::XTextRange>());
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
OUString sURL = aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(), OUString());
std::string sURLc = OUStringToOString(sURL, RTL_TEXTENCODING_ASCII_US).getStr();
@@ -122,7 +122,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescrip
writerfilter::rtftok::RTFDocumentFactory::createDocument(m_xContext, xInputStream, m_xDstDoc, xFrame, xStatusIndicator));
pDocument->resolve(*pStream);
bResult = true;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
dmapper_logger->endDocument();
#endif
sal_uInt32 nEndTime = osl_getGlobalTimer();
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 2a381be..4b1c36a 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -57,7 +57,7 @@ using namespace ::com::sun::star;
using namespace oox;
using namespace ::std;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
static string resourceToString(OOXMLFastContextHandler::ResourceEnum_t eResource)
{
string sResult;
@@ -86,7 +86,7 @@ static string resourceToString(OOXMLFastContextHandler::ResourceEnum_t eResource
set<OOXMLFastContextHandler *> aSetContexts;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
class OOXMLIdToString : public IdToString
{
public:
@@ -375,7 +375,7 @@ void OOXMLFastContextHandler::endAction(Token_t Element)
OOXMLFactory::getInstance()->endAction(this, Element);
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
void OOXMLFastContextHandler::dumpXml( const TagLogger::Pointer_t pLogger ) const
{
pLogger->startElement("context");
@@ -1093,7 +1093,7 @@ OOXMLValue::Pointer_t OOXMLFastContextHandlerProperties::getValue() const
return OOXMLValue::Pointer_t(new OOXMLPropertySetValue(mpPropertySet));
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
void OOXMLFastContextHandlerProperties::dumpXml( const TagLogger::Pointer_t pLogger) const
{
pLogger->startElement("context");
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 61d42cd..0dc54bb 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -203,7 +203,7 @@ public:
void sendPropertyToParent();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual void dumpXml( const TagLogger::Pointer_t pLogger ) const;
#endif
@@ -306,7 +306,7 @@ public:
virtual void setPropertySet(OOXMLPropertySet::Pointer_t pPropertySet) SAL_OVERRIDE;
virtual OOXMLPropertySet::Pointer_t getPropertySet() const SAL_OVERRIDE;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual void dumpXml( const TagLogger::Pointer_t pLogger ) const;
#endif
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index 22ee567..fc793de 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -38,7 +38,7 @@ OOXMLFastDocumentHandler::OOXMLFastDocumentHandler(
sal_Int32 nXNoteId )
: m_xContext(context)
, mpStream( pStream )
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
, mpTmpStream()
#endif
, mpDocument( pDocument )
@@ -50,13 +50,13 @@ OOXMLFastDocumentHandler::OOXMLFastDocumentHandler(
// ::com::sun::star::xml::sax::XFastContextHandler:
void SAL_CALL OOXMLFastDocumentHandler::startFastElement
(::sal_Int32
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
Element
#endif
, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
clog << this << ":start element:"
<< fastTokenToId(Element)
<< endl;
@@ -65,18 +65,18 @@ Element
void SAL_CALL OOXMLFastDocumentHandler::startUnknownElement
(const OUString &
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
Namespace
#endif
, const OUString &
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
Name
#endif
,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
clog << this << ":start unknown element:"
<< OUStringToOString(Namespace, RTL_TEXTENCODING_ASCII_US).getStr()
<< ":"
@@ -86,13 +86,13 @@ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
}
void SAL_CALL OOXMLFastDocumentHandler::endFastElement(::sal_Int32
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
Element
#endif
)
throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
clog << this << ":end element:"
<< fastTokenToId(Element)
<< endl;
@@ -101,17 +101,17 @@ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
void SAL_CALL OOXMLFastDocumentHandler::endUnknownElement
(const OUString &
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
Namespace
#endif
, const OUString &
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
Name
#endif
)
throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
clog << this << ":end unknown element:"
<< OUStringToOString(Namespace, RTL_TEXTENCODING_ASCII_US).getStr()
<< ":"
@@ -142,7 +142,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
clog << this << ":createFastChildContext:"
<< fastTokenToId(Element)
<< endl;
@@ -161,18 +161,18 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
OOXMLFastDocumentHandler::createUnknownChildContext
(const OUString &
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
Namespace
#endif
,
const OUString &
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
Name
#endif
, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
clog << this << ":createUnknownChildContext:"
<< OUStringToOString(Namespace, RTL_TEXTENCODING_ASCII_US).getStr()
<< ":"
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index 4036a3e..f446d43 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -94,7 +94,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
Stream * mpStream;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
Stream::Pointer_t mpTmpStream;
#endif
OOXMLDocumentImpl* mpDocument;
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx
index 88f0258..0028d37 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -264,7 +264,7 @@ void OOXMLParserState::endTxbxContent()
inTxbxContent = false;
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
void OOXMLParserState::dumpXml( const TagLogger::Pointer_t& pLogger )
{
pLogger->startElement("parserstate");
diff --git a/writerfilter/source/ooxml/OOXMLParserState.hxx b/writerfilter/source/ooxml/OOXMLParserState.hxx
index f3909a0..eff9d87 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.hxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.hxx
@@ -23,7 +23,7 @@
#include "OOXMLDocumentImpl.hxx"
#include "OOXMLPropertySetImpl.hxx"
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
#include <resourcemodel/TagLogger.hxx>
#endif
@@ -115,7 +115,7 @@ public:
void startTxbxContent();
void endTxbxContent();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
public:
void dumpXml( const TagLogger::Pointer_t& pLogger );
#endif
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
index 354bdd7..3476ae8 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
@@ -37,7 +37,7 @@ public:
virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE = 0;
virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE = 0;
virtual writerfilter::Reference<Properties>::Pointer_t getProps() SAL_OVERRIDE = 0;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string getName() const SAL_OVERRIDE = 0;
virtual std::string toString() const SAL_OVERRIDE = 0;
#endif
@@ -60,7 +60,7 @@ public:
virtual OOXMLPropertySet * clone() const = 0;
virtual void setType(const std::string & rsType) = 0;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string toString() = 0;
#endif
};
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
index f338037..7c4cdd4 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
@@ -104,7 +104,7 @@ writerfilter::Reference<Properties>::Pointer_t OOXMLPropertyImpl::getProps()
return pResult;
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
string OOXMLPropertyImpl::getName() const
{
string sResult;
@@ -126,7 +126,7 @@ string OOXMLPropertyImpl::getName() const
}
#endif
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
string OOXMLPropertyImpl::toString() const
{
string sResult = "(";
@@ -212,7 +212,7 @@ writerfilter::Reference<BinaryObj>::Pointer_t OOXMLValue::getBinary()
return writerfilter::Reference<BinaryObj>::Pointer_t();
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
string OOXMLValue::toString() const
{
return "OOXMLValue";
@@ -243,7 +243,7 @@ writerfilter::Reference<BinaryObj>::Pointer_t OOXMLBinaryValue::getBinary()
return mpBinaryObj;
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
string OOXMLBinaryValue::toString() const
{
return "BinaryObj";
@@ -307,7 +307,7 @@ uno::Any OOXMLBooleanValue::getAny() const
return aResult;
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
string OOXMLBooleanValue::toString() const
{
return mbValue ? "true" : "false";
@@ -344,7 +344,7 @@ OUString OOXMLStringValue::getString() const
return mStr;
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
string OOXMLStringValue::toString() const
{
return OUStringToOString(mStr, RTL_TEXTENCODING_ASCII_US).getStr();
@@ -375,7 +375,7 @@ uno::Any OOXMLInputStreamValue::getAny() const
return aAny;
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
string OOXMLInputStreamValue::toString() const
{
return "InputStream";
@@ -495,7 +495,7 @@ void OOXMLPropertySetImpl::setType(const string & rsType)
maType = OString(rsType.c_str(), rsType.size());
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
string OOXMLPropertySetImpl::toString()
{
string sResult = "[";
@@ -544,7 +544,7 @@ writerfilter::Reference<Properties>::Pointer_t OOXMLPropertySetValue::getPropert
(mpPropertySet->clone());
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
string OOXMLPropertySetValue::toString() const
{
char sBuffer[256];
@@ -622,7 +622,7 @@ OOXMLValue * OOXMLIntegerValue::clone() const
return new OOXMLIntegerValue(*this);
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
string OOXMLIntegerValue::toString() const
{
char buffer[256];
@@ -660,7 +660,7 @@ OOXMLValue * OOXMLHexValue::clone() const
return new OOXMLHexValue(*this);
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
string OOXMLHexValue::toString() const
{
char buffer[256];
@@ -699,7 +699,7 @@ OOXMLValue* OOXMLUniversalMeasureValue::clone() const
return new OOXMLUniversalMeasureValue(*this);
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
string OOXMLUniversalMeasureValue::toString() const
{
return OString::number(mnValue).getStr();
@@ -725,7 +725,7 @@ uno::Any OOXMLShapeValue::getAny() const
return uno::Any(mrShape);
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
string OOXMLShapeValue::toString() const
{
return "Shape";
@@ -756,7 +756,7 @@ uno::Any OOXMLStarMathValue::getAny() const
return uno::Any(component);
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
string OOXMLStarMathValue::toString() const
{
return "StarMath";
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
index af9e1d7..02c1d31 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
@@ -49,7 +49,7 @@ public:
virtual writerfilter::Reference<Properties>::Pointer_t getProperties() SAL_OVERRIDE;
virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE;
virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string toString() const SAL_OVERRIDE;
#endif
virtual OOXMLValue * clone() const;
@@ -76,7 +76,7 @@ public:
virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE;
virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE;
virtual writerfilter::Reference<Properties>::Pointer_t getProps() SAL_OVERRIDE;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string getName() const SAL_OVERRIDE;
virtual std::string toString() const SAL_OVERRIDE;
#endif
@@ -93,7 +93,7 @@ public:
virtual ~OOXMLBinaryValue();
virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string toString() const SAL_OVERRIDE;
#endif
virtual OOXMLValue * clone() const SAL_OVERRIDE;
@@ -113,7 +113,7 @@ public:
virtual int getInt() const SAL_OVERRIDE;
virtual bool getBool() const SAL_OVERRIDE;
virtual css::uno::Any getAny() const SAL_OVERRIDE;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string toString() const SAL_OVERRIDE;
#endif
virtual OOXMLValue * clone() const SAL_OVERRIDE;
@@ -129,7 +129,7 @@ public:
virtual css::uno::Any getAny() const SAL_OVERRIDE;
virtual OUString getString() const SAL_OVERRIDE;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string toString() const SAL_OVERRIDE;
#endif
virtual OOXMLValue * clone() const SAL_OVERRIDE;
@@ -145,7 +145,7 @@ public:
virtual ~OOXMLInputStreamValue();
virtual css::uno::Any getAny() const SAL_OVERRIDE;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string toString() const SAL_OVERRIDE;
#endif
virtual OOXMLValue * clone() const SAL_OVERRIDE;
@@ -181,7 +181,7 @@ public:
virtual void setType(const std::string & rsType) SAL_OVERRIDE;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string toString() SAL_OVERRIDE;
#endif
};
@@ -194,7 +194,7 @@ public:
virtual ~OOXMLPropertySetValue();
virtual writerfilter::Reference<Properties>::Pointer_t getProperties() SAL_OVERRIDE;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string toString() const SAL_OVERRIDE;
#endif
virtual OOXMLValue * clone() const SAL_OVERRIDE;
@@ -211,7 +211,7 @@ public:
virtual int getInt() const SAL_OVERRIDE;
virtual css::uno::Any getAny() const SAL_OVERRIDE;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string toString() const SAL_OVERRIDE;
#endif
virtual OOXMLValue * clone() const SAL_OVERRIDE;
@@ -227,7 +227,7 @@ public:
virtual ~OOXMLHexValue();
virtual int getInt() const SAL_OVERRIDE;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string toString() const SAL_OVERRIDE;
#endif
virtual OOXMLValue * clone() const SAL_OVERRIDE;
@@ -243,7 +243,7 @@ public:
virtual ~OOXMLUniversalMeasureValue();
virtual int getInt() const SAL_OVERRIDE;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string toString() const SAL_OVERRIDE;
#endif
virtual OOXMLValue* clone() const SAL_OVERRIDE;
@@ -258,7 +258,7 @@ public:
virtual ~OOXMLShapeValue();
virtual css::uno::Any getAny() const SAL_OVERRIDE;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string toString() const SAL_OVERRIDE;
#endif
virtual OOXMLValue * clone() const SAL_OVERRIDE;
@@ -273,7 +273,7 @@ public:
virtual ~OOXMLStarMathValue();
virtual css::uno::Any getAny() const SAL_OVERRIDE;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string toString() const SAL_OVERRIDE;
#endif
virtual OOXMLValue * clone() const SAL_OVERRIDE;
diff --git a/writerfilter/source/ooxml/factoryimpl.py b/writerfilter/source/ooxml/factoryimpl.py
index 3e18083..122dbf1 100644
--- a/writerfilter/source/ooxml/factoryimpl.py
+++ b/writerfilter/source/ooxml/factoryimpl.py
@@ -119,7 +119,7 @@ public:
std::string fastTokenToId(sal_uInt32 nToken)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
std::string sResult;
switch (oox::getNamespace(nToken))
diff --git a/writerfilter/source/ooxml/qnametostr.py b/writerfilter/source/ooxml/qnametostr.py
index e03d6bf..4a98d4f 100644
--- a/writerfilter/source/ooxml/qnametostr.py
+++ b/writerfilter/source/ooxml/qnametostr.py
@@ -26,7 +26,7 @@ namespace writerfilter
void QNameToString::init_ooxml()
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
/* ooxml */
""")
diff --git a/writerfilter/source/resourcemodel/LoggedResources.cxx b/writerfilter/source/resourcemodel/LoggedResources.cxx
index 9217035..3b730bd 100644
--- a/writerfilter/source/resourcemodel/LoggedResources.cxx
+++ b/writerfilter/source/resourcemodel/LoggedResources.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star;
namespace writerfilter
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
// class: LoggedResourcesHelper
LoggedResourcesHelper::LoggedResourcesHelper(TagLogger::Pointer_t pLogger, const std::string & sPrefix)
@@ -73,7 +73,7 @@ void LoggedResourcesHelper::attribute(const std::string & rName, sal_uInt32 nVal
// class: LoggedStream
LoggedStream::LoggedStream(
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
TagLogger::Pointer_t pLogger,
const std::string & sPrefix
) : mHelper(pLogger, sPrefix)
@@ -91,7 +91,7 @@ LoggedStream::~LoggedStream()
void LoggedStream::startSectionGroup()
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.startElement("section");
#endif
@@ -102,14 +102,14 @@ void LoggedStream::endSectionGroup()
{
lcl_endSectionGroup();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.endElement("section");
#endif
}
void LoggedStream::startParagraphGroup()
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.startElement("paragraph");
#endif
@@ -120,7 +120,7 @@ void LoggedStream::endParagraphGroup()
{
lcl_endParagraphGroup();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.endElement("paragraph");
#endif
}
@@ -128,7 +128,7 @@ void LoggedStream::endParagraphGroup()
void LoggedStream::startCharacterGroup()
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.startElement("charactergroup");
#endif
@@ -139,14 +139,14 @@ void LoggedStream::endCharacterGroup()
{
lcl_endCharacterGroup();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.endElement("charactergroup");
#endif
}
void LoggedStream::startShape(uno::Reference<drawing::XShape> const& xShape)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.startElement("shape");
#endif
@@ -157,14 +157,14 @@ void LoggedStream::endShape()
{
lcl_endShape();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.endElement("shape");
#endif
}
void LoggedStream::text(const sal_uInt8 * data, size_t len)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.startElement("text");
OUString sText( (const sal_Char*) data, len, RTL_TEXTENCODING_MS_1252 );
@@ -176,14 +176,14 @@ void LoggedStream::text(const sal_uInt8 * data, size_t len)
lcl_text(data, len);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.endElement("text");
#endif
}
void LoggedStream::utext(const sal_uInt8 * data, size_t len)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.startElement("utext");
mHelper.startElement("data");
@@ -199,83 +199,83 @@ void LoggedStream::utext(const sal_uInt8 * data, size_t len)
lcl_utext(data, len);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.endElement("utext");
#endif
}
void LoggedStream::positivePercentage(const OUString& rText)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.startElement("positivePercentage");
mHelper.chars(rText);
#endif
lcl_positivePercentage(rText);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.endElement("positivePercentage");
#endif
}
void LoggedStream::props(writerfilter::Reference<Properties>::Pointer_t ref)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.startElement("props");
#endif
lcl_props(ref);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.endElement("props");
#endif
}
void LoggedStream::table(Id name, writerfilter::Reference<Table>::Pointer_t ref)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.startElement("table");
mHelper.attribute("name", (*QNameToString::Instance())(name));
#endif
lcl_table(name, ref);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.endElement("table");
#endif
}
void LoggedStream::substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.startElement("substream");
mHelper.attribute("name", (*QNameToString::Instance())(name));
#endif
lcl_substream(name, ref);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.endElement("substream");
#endif
}
void LoggedStream::info(const std::string & _info)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.startElement("info");
mHelper.attribute("text", _info);
#endif
lcl_info(_info);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.endElement("info");
#endif
}
// class LoggedProperties
LoggedProperties::LoggedProperties(
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
TagLogger::Pointer_t pLogger,
const std::string & sPrefix
) : mHelper(pLogger, sPrefix)
@@ -293,7 +293,7 @@ LoggedProperties::~LoggedProperties()
void LoggedProperties::attribute(Id name, Value & val)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.startElement("attribute");
mHelper.attribute("name", (*QNameToString::Instance())(name));
mHelper.attribute("value", val.toString());
@@ -305,7 +305,7 @@ void LoggedProperties::attribute(Id name, Value & val)
void LoggedProperties::sprm(Sprm & rSprm)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.startElement("sprm");
mHelper.attribute("name", (*QNameToString::Instance())(rSprm.getId()));
mHelper.chars(rSprm.toString());
@@ -313,13 +313,13 @@ void LoggedProperties::sprm(Sprm & rSprm)
lcl_sprm(rSprm);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.endElement("sprm");
#endif
}
LoggedTable::LoggedTable(
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
TagLogger::Pointer_t pLogger,
const std::string & sPrefix
) : mHelper(pLogger, sPrefix)
@@ -337,14 +337,14 @@ LoggedTable::~LoggedTable()
void LoggedTable::entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.startElement("entry");
mHelper.attribute("pos", pos);
#endif
lcl_entry(pos, ref);
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
mHelper.endElement("entry");
#endif
}
diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx
index d65566d..6a6fa19 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -39,7 +39,7 @@ namespace writerfilter
pName = NULL;
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
void TagLogger::setFileName( const std::string & filename )
{
if ( pWriter )
@@ -112,7 +112,7 @@ namespace writerfilter
return aIt->second;
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
void TagLogger::element(const std::string & name)
{
startElement(name);
@@ -173,7 +173,7 @@ namespace writerfilter
xmlFree( xmlName );
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
void TagLogger::attribute(const std::string & name, const OUString & value)
{
attribute( name, OUStringToOString( value, RTL_TEXTENCODING_ASCII_US ).getStr() );
diff --git a/writerfilter/source/resourcemodel/qnametostrcore.cxx b/writerfilter/source/resourcemodel/qnametostrcore.cxx
index d9f7ace..4e9a563 100644
--- a/writerfilter/source/resourcemodel/qnametostrcore.cxx
+++ b/writerfilter/source/resourcemodel/qnametostrcore.cxx
@@ -34,7 +34,7 @@ QNameToString::Pointer_t QNameToString::Instance()
std::string QNameToString::operator()(Id qName)
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
Map::const_iterator aIt = mMap.find(qName);
if (aIt != mMap.end())
diff --git a/writerfilter/source/resourcemodel/util.cxx b/writerfilter/source/resourcemodel/util.cxx
index e8e973a..2bbeb26 100644
--- a/writerfilter/source/resourcemodel/util.cxx
+++ b/writerfilter/source/resourcemodel/util.cxx
@@ -40,7 +40,7 @@ string toString(uno::Reference< text::XTextRange > textRange)
{
string result;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
if (textRange.get())
{
OUString aOUStr = textRange->getString();
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index b2fd96c..02e29cf 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -51,14 +51,14 @@ writerfilter::Reference<Properties>::Pointer_t RTFSprm::getProps()
return m_pValue->getProperties();
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
std::string RTFSprm::getName() const
{
return "RTFSprm";
}
#endif
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
std::string RTFSprm::toString() const
{
OStringBuffer aBuf("RTFSprm");
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/writerfilter/source/rtftok/rtfsprm.hxx
index b1142cf..818eb87 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -110,7 +110,7 @@ public:
virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE;
virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE;
virtual writerfilter::Reference<Properties>::Pointer_t getProps() SAL_OVERRIDE;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string getName() const SAL_OVERRIDE;
virtual std::string toString() const SAL_OVERRIDE;
#endif
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx
index 986cd76..7ff6c13 100644
--- a/writerfilter/source/rtftok/rtfvalue.cxx
+++ b/writerfilter/source/rtftok/rtfvalue.cxx
@@ -213,7 +213,7 @@ writerfilter::Reference<BinaryObj>::Pointer_t RTFValue::getBinary()
return writerfilter::Reference<BinaryObj>::Pointer_t();
}
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
std::string RTFValue::toString() const
{
if (!m_sValue.isEmpty() || m_bForceString)
diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx
index 7c084dd..4af08db 100644
--- a/writerfilter/source/rtftok/rtfvalue.hxx
+++ b/writerfilter/source/rtftok/rtfvalue.hxx
@@ -48,7 +48,7 @@ public:
virtual writerfilter::Reference<Properties>::Pointer_t getProperties() SAL_OVERRIDE;
virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE;
virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
virtual std::string toString() const SAL_OVERRIDE;
#endif
virtual RTFValue* Clone();
More information about the Libreoffice-commits
mailing list