[Libreoffice-commits] core.git: writerfilter/source
Noel Grandin
noelgrandin at gmail.com
Tue May 19 00:58:01 PDT 2015
writerfilter/source/dmapper/BorderHandler.cxx | 3
writerfilter/source/dmapper/CellColorHandler.cxx | 3
writerfilter/source/dmapper/CellMarginHandler.cxx | 3
writerfilter/source/dmapper/DomainMapper.cxx | 24 +-
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 123 +++++++-------
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 65 +++----
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 37 ++--
writerfilter/source/dmapper/FFDataHandler.cxx | 7
writerfilter/source/dmapper/FontTable.cxx | 10 -
writerfilter/source/dmapper/GraphicHelpers.cxx | 7
writerfilter/source/dmapper/GraphicImport.cxx | 9 -
writerfilter/source/dmapper/LatentStyleHandler.cxx | 5
writerfilter/source/dmapper/LoggedResources.cxx | 28 +--
writerfilter/source/dmapper/LoggedResources.hxx | 9 -
writerfilter/source/dmapper/MeasureHandler.cxx | 3
writerfilter/source/dmapper/NumberingManager.cxx | 6
writerfilter/source/dmapper/OLEHandler.cxx | 4
writerfilter/source/dmapper/PageBordersHandler.cxx | 4
writerfilter/source/dmapper/PropertyMap.cxx | 71 ++++----
writerfilter/source/dmapper/PropertyMap.hxx | 2
writerfilter/source/dmapper/PropertyMapHelper.cxx | 39 ++--
writerfilter/source/dmapper/PropertyMapHelper.hxx | 9 -
writerfilter/source/dmapper/SectionColumnHandler.cxx | 4
writerfilter/source/dmapper/SettingsTable.cxx | 9 -
writerfilter/source/dmapper/StyleSheetTable.cxx | 9 -
writerfilter/source/dmapper/TDefTableHandler.cxx | 4
writerfilter/source/dmapper/TableManager.cxx | 125 +++++----------
writerfilter/source/dmapper/TableManager.hxx | 10 -
writerfilter/source/dmapper/TablePositionHandler.cxx | 5
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 9 -
writerfilter/source/dmapper/TagLogger.cxx | 28 ---
writerfilter/source/dmapper/TagLogger.hxx | 10 -
writerfilter/source/dmapper/TblStylePrHandler.cxx | 9 -
writerfilter/source/dmapper/TextEffectsHandler.cxx | 3
writerfilter/source/dmapper/ThemeTable.cxx | 19 +-
writerfilter/source/dmapper/TrackChangesHandler.cxx | 3
writerfilter/source/dmapper/WrapPolygonHandler.cxx | 3
writerfilter/source/dmapper/dmapperLoggers.hxx | 33 ---
writerfilter/source/dmapper/domainmapperfactory.cxx | 5
39 files changed, 311 insertions(+), 448 deletions(-)
New commits:
commit bf41d6df35ce9d023b9865cbb007a405d6be02e6
Author: Noel Grandin <noelgrandin at gmail.com>
Date: Sat May 16 19:59:36 2015 +0200
TagLogger can be static
since we only ever instantiate one of them
Change-Id: I48b3b976b4f33044c4bf6542ac5cce58f26e6244
Reviewed-on: https://gerrit.libreoffice.org/15759
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx
index 5b0ea80..38fd788 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -22,7 +22,6 @@
#include <ConversionHelper.hxx>
#include <com/sun/star/table/BorderLine2.hpp>
#include <ooxml/resourceids.hxx>
-#include <dmapperLoggers.hxx>
#include <filter/msfilter/util.hxx>
#include <comphelper/sequence.hxx>
@@ -34,7 +33,7 @@ using namespace ::com::sun::star;
BorderHandler::BorderHandler( bool bOOXML ) :
-LoggedProperties(dmapper_logger, "BorderHandler"),
+LoggedProperties("BorderHandler"),
m_nCurrentBorderPosition( BORDER_TOP ),
m_nLineWidth(15), // Word default, in twips
m_nLineType(0),
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx
index 98a4e5e..6845c8a 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -26,7 +26,6 @@
#include <sal/macros.h>
#include <filter/msfilter/util.hxx>
#include <comphelper/sequence.hxx>
-#include "dmapperLoggers.hxx"
namespace writerfilter {
namespace dmapper {
@@ -34,7 +33,7 @@ namespace dmapper {
using namespace ::com::sun::star;
CellColorHandler::CellColorHandler() :
-LoggedProperties(dmapper_logger, "CellColorHandler"),
+LoggedProperties("CellColorHandler"),
m_nShadingPattern( drawing::ShadingPattern::CLEAR ),
m_nColor( 0xffffffff ),
m_nFillColor( 0xffffffff ),
diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/writerfilter/source/dmapper/CellMarginHandler.cxx
index 32a745a..922a50b 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.cxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.cxx
@@ -20,7 +20,6 @@
#include <PropertyMap.hxx>
#include <ConversionHelper.hxx>
#include <ooxml/resourceids.hxx>
-#include "dmapperLoggers.hxx"
#include <osl/diagnose.h>
namespace writerfilter {
@@ -30,7 +29,7 @@ using namespace ::com::sun::star;
using namespace ::writerfilter;
CellMarginHandler::CellMarginHandler() :
-LoggedProperties(dmapper_logger, "CellMarginHandler"),
+LoggedProperties("CellMarginHandler"),
m_nValue( 0 ),
m_nWidth( 0 ),
m_nType( 0 ),
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 5634ff3..abe1069 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -80,8 +80,6 @@ namespace writerfilter {
namespace dmapper{
-TagLogger::Pointer_t dmapper_logger(TagLogger::getInstance("DOMAINMAPPER"));
-
struct _PageSz
{
sal_Int32 code;
@@ -98,9 +96,9 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon
SourceDocumentType eDocumentType,
uno::Reference<text::XTextRange> const& xInsertTextRange,
utl::MediaDescriptor& rMediaDesc) :
-LoggedProperties(dmapper_logger, "DomainMapper"),
-LoggedTable(dmapper_logger, "DomainMapper"),
-LoggedStream(dmapper_logger, "DomainMapper"),
+ LoggedProperties("DomainMapper"),
+ LoggedTable("DomainMapper"),
+ LoggedStream("DomainMapper"),
m_pImpl( new DomainMapper_Impl( *this, xContext, xModel, eDocumentType, xInsertTextRange, !rMediaDesc.getUnpackedValueOrDefault("InsertMode", false))),
mbIsSplitPara(false)
{
@@ -194,7 +192,7 @@ DomainMapper::~DomainMapper()
delete m_pImpl;
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->endDocument();
+ TagLogger::getInstance().endDocument();
#endif
}
@@ -2548,10 +2546,10 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
default:
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("unhandled");
- dmapper_logger->attribute("id", nSprmId);
- dmapper_logger->attribute("name", rSprm.getName());
- dmapper_logger->endElement();
+ TagLogger::getInstance().startElement("unhandled");
+ TagLogger::getInstance().attribute("id", nSprmId);
+ TagLogger::getInstance().attribute("name", rSprm.getName());
+ TagLogger::getInstance().endElement();
#endif
}
}
@@ -2832,9 +2830,9 @@ 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
- dmapper_logger->startElement("text");
- dmapper_logger->chars(sText);
- dmapper_logger->endElement();
+ TagLogger::getInstance().startElement("text");
+ TagLogger::getInstance().chars(sText);
+ TagLogger::getInstance().endElement();
#endif
try
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index e85036f..809429d 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -32,7 +32,6 @@
#include <com/sun/star/text/VertOrientation.hpp>
#include <com/sun/star/text/XTextRangeCompare.hpp>
#include <com/sun/star/style/ParagraphAdjust.hpp>
-#include <dmapperLoggers.hxx>
#include <TablePositionHandler.hxx>
#include <ConversionHelper.hxx>
#include <util.hxx>
@@ -74,11 +73,11 @@ void DomainMapperTableHandler::startTable(unsigned int nRows,
m_nRowIndex = 0;
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("tablehandler.table");
- dmapper_logger->attribute("rows", nRows);
+ TagLogger::getInstance().startElement("tablehandler.table");
+ TagLogger::getInstance().attribute("rows", nRows);
if (pProps.get() != nullptr)
- pProps->dumpXml( dmapper_logger );
+ pProps->dumpXml();
#endif
}
@@ -207,32 +206,32 @@ void lcl_computeCellBorders( PropertyMapPtr pTableBorders, PropertyMapPtr pCellP
void lcl_debug_BorderLine(table::BorderLine & rLine)
{
- dmapper_logger->startElement("BorderLine");
- dmapper_logger->attribute("Color", rLine.Color);
- dmapper_logger->attribute("InnerLineWidth", rLine.InnerLineWidth);
- dmapper_logger->attribute("OuterLineWidth", rLine.OuterLineWidth);
- dmapper_logger->attribute("LineDistance", rLine.LineDistance);
- dmapper_logger->endElement();
+ TagLogger::getInstance().startElement("BorderLine");
+ TagLogger::getInstance().attribute("Color", rLine.Color);
+ TagLogger::getInstance().attribute("InnerLineWidth", rLine.InnerLineWidth);
+ TagLogger::getInstance().attribute("OuterLineWidth", rLine.OuterLineWidth);
+ TagLogger::getInstance().attribute("LineDistance", rLine.LineDistance);
+ TagLogger::getInstance().endElement();
}
void lcl_debug_TableBorder(table::TableBorder & rBorder)
{
- dmapper_logger->startElement("TableBorder");
+ TagLogger::getInstance().startElement("TableBorder");
lcl_debug_BorderLine(rBorder.TopLine);
- dmapper_logger->attribute("IsTopLineValid", sal_uInt32(rBorder.IsTopLineValid));
+ TagLogger::getInstance().attribute("IsTopLineValid", sal_uInt32(rBorder.IsTopLineValid));
lcl_debug_BorderLine(rBorder.BottomLine);
- dmapper_logger->attribute("IsBottomLineValid", sal_uInt32(rBorder.IsBottomLineValid));
+ TagLogger::getInstance().attribute("IsBottomLineValid", sal_uInt32(rBorder.IsBottomLineValid));
lcl_debug_BorderLine(rBorder.LeftLine);
- dmapper_logger->attribute("IsLeftLineValid", sal_uInt32(rBorder.IsLeftLineValid));
+ TagLogger::getInstance().attribute("IsLeftLineValid", sal_uInt32(rBorder.IsLeftLineValid));
lcl_debug_BorderLine(rBorder.RightLine);
- dmapper_logger->attribute("IsRightLineValid", sal_uInt32(rBorder.IsRightLineValid));
+ TagLogger::getInstance().attribute("IsRightLineValid", sal_uInt32(rBorder.IsRightLineValid));
lcl_debug_BorderLine(rBorder.VerticalLine);
- dmapper_logger->attribute("IsVerticalLineValid", sal_uInt32(rBorder.IsVerticalLineValid));
+ TagLogger::getInstance().attribute("IsVerticalLineValid", sal_uInt32(rBorder.IsVerticalLineValid));
lcl_debug_BorderLine(rBorder.HorizontalLine);
- dmapper_logger->attribute("IsHorizontalLineValid", sal_uInt32(rBorder.IsHorizontalLineValid));
- dmapper_logger->attribute("Distance", rBorder.Distance);
- dmapper_logger->attribute("IsDistanceValid", sal_uInt32(rBorder.IsDistanceValid));
- dmapper_logger->endElement();
+ TagLogger::getInstance().attribute("IsHorizontalLineValid", sal_uInt32(rBorder.IsHorizontalLineValid));
+ TagLogger::getInstance().attribute("Distance", rBorder.Distance);
+ TagLogger::getInstance().attribute("IsDistanceValid", sal_uInt32(rBorder.IsDistanceValid));
+ TagLogger::getInstance().endElement();
}
#endif
@@ -417,19 +416,19 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
}
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("mergedProps");
+ TagLogger::getInstance().startElement("mergedProps");
if (pMergedProperties)
- pMergedProperties->dumpXml( dmapper_logger );
- dmapper_logger->endElement();
+ pMergedProperties->dumpXml();
+ TagLogger::getInstance().endElement();
#endif
m_aTableProperties->InsertProps(pMergedProperties);
m_aTableProperties->InsertProps(pTableProps);
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("TableProperties");
- m_aTableProperties->dumpXml( dmapper_logger );
- dmapper_logger->endElement();
+ TagLogger::getInstance().startElement("TableProperties");
+ m_aTableProperties->dumpXml();
+ TagLogger::getInstance().endElement();
#endif
}
}
@@ -454,9 +453,9 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
rInfo.pTableDefaults->InsertProps(m_aTableProperties);
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("TableDefaults");
- rInfo.pTableDefaults->dumpXml( dmapper_logger );
- dmapper_logger->endElement();
+ TagLogger::getInstance().startElement("TableDefaults");
+ rInfo.pTableDefaults->dumpXml();
+ TagLogger::getInstance().endElement();
#endif
if (!aGrabBag.empty())
@@ -584,9 +583,9 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
rInfo.aTableProperties = m_aTableProperties->GetPropertyValues();
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("debug.tableprops");
- m_aTableProperties->dumpXml( dmapper_logger );
- dmapper_logger->endElement();
+ TagLogger::getInstance().startElement("debug.tableprops");
+ m_aTableProperties->dumpXml();
+ TagLogger::getInstance().endElement();
#endif
}
@@ -610,7 +609,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(TableInfo & rInfo, std::vector<HorizontallyMergedCell>& rMerges)
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("getCellProperties");
+ TagLogger::getInstance().startElement("getCellProperties");
#endif
CellPropertyValuesSeq_t aCellProperties( m_aCellProperties.size() );
@@ -618,7 +617,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
if ( !m_aCellProperties.size() )
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
return aCellProperties;
}
@@ -772,9 +771,9 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
std::swap(*(*aCellIterator), *pAllCellProps );
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("cell");
- dmapper_logger->attribute("cell", nCell);
- dmapper_logger->attribute("row", nRow);
+ TagLogger::getInstance().startElement("cell");
+ TagLogger::getInstance().attribute("cell", nCell);
+ TagLogger::getInstance().attribute("row", nRow);
#endif
lcl_computeCellBorders( rInfo.pTableBorders, *aCellIterator, nCell, nRow, bIsEndCol, bIsEndRow );
@@ -825,7 +824,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
pSingleCellProperties[nCell] = (*aCellIterator)->GetPropertyValues();
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
++nCell;
@@ -860,7 +859,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
}
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
return aCellProperties;
@@ -912,7 +911,7 @@ bool lcl_emptyRow(TableSequence_t& rTableSeq, sal_Int32 nRow)
RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties()
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("getRowProperties");
+ TagLogger::getInstance().startElement("getRowProperties");
#endif
static const int MINLAY = 23; // sw/inc/swtypes.hxx, minimal possible size of frames.
@@ -923,7 +922,7 @@ RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties()
while( aRowIter != aRowIterEnd )
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("rowProps.row");
+ TagLogger::getInstance().startElement("rowProps.row");
#endif
if( aRowIter->get() )
{
@@ -942,19 +941,19 @@ RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties()
aRowProperties[nRow] = (*aRowIter)->GetPropertyValues();
#ifdef DEBUG_WRITERFILTER
- ((*aRowIter)->dumpXml( dmapper_logger ));
- lcl_DumpPropertyValues(dmapper_logger, aRowProperties[nRow]);
+ (*aRowIter)->dumpXml();
+ lcl_DumpPropertyValues(aRowProperties[nRow]);
#endif
}
++nRow;
++aRowIter;
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
return aRowProperties;
@@ -980,7 +979,7 @@ static void lcl_ApplyCellParaProps(uno::Reference<table::XCell> const& xCell,
void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("tablehandler.endTable");
+ TagLogger::getInstance().startElement("tablehandler.endTable");
#endif
// If we want to make this table a floating one.
@@ -997,7 +996,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
RowPropertyValuesSeq_t aRowProperties = endTableGetRowProperties();
#ifdef DEBUG_WRITERFILTER
- lcl_DumpPropertyValueSeq(dmapper_logger, aRowProperties);
+ lcl_DumpPropertyValueSeq(aRowProperties);
#endif
if (m_pTableSeq->getLength() > 0)
@@ -1071,7 +1070,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
SAL_INFO("writerfilter.dmapper",
"Conversion to table error: " << e.Message);
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->chars(std::string("failed to import table!"));
+ TagLogger::getInstance().chars(std::string("failed to import table!"));
#endif
}
catch ( const uno::Exception &e )
@@ -1128,8 +1127,8 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
m_aRowProperties.clear();
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->endElement();
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
+ TagLogger::getInstance().endElement();
#endif
}
@@ -1140,10 +1139,10 @@ void DomainMapperTableHandler::startRow(unsigned int nCells,
m_aCellProperties.push_back( PropertyMapVector1() );
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("table.row");
- dmapper_logger->attribute("cells", nCells);
+ TagLogger::getInstance().startElement("table.row");
+ TagLogger::getInstance().attribute("cells", nCells);
if (pProps != nullptr)
- pProps->dumpXml(dmapper_logger);
+ pProps->dumpXml();
#endif
m_pRowSeq = RowSequencePointer_t(new RowSequence_t(nCells));
@@ -1156,7 +1155,7 @@ void DomainMapperTableHandler::endRow()
++m_nRowIndex;
m_nCellIndex = 0;
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
@@ -1175,10 +1174,10 @@ void DomainMapperTableHandler::startCell(const Handle_t & start,
}
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("table.cell");
- dmapper_logger->startElement("table.cell.start");
- dmapper_logger->chars(XTextRangeToString(start));
- dmapper_logger->endElement();
+ TagLogger::getInstance().startElement("table.cell");
+ TagLogger::getInstance().startElement("table.cell.start");
+ TagLogger::getInstance().chars(XTextRangeToString(start));
+ TagLogger::getInstance().endElement();
if (pProps.get())
pProps->printProperties();
#endif
@@ -1193,10 +1192,10 @@ void DomainMapperTableHandler::startCell(const Handle_t & start,
void DomainMapperTableHandler::endCell(const Handle_t & end)
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("table.cell.end");
- dmapper_logger->chars(XTextRangeToString(end));
- dmapper_logger->endElement();
- dmapper_logger->endElement();
+ TagLogger::getInstance().startElement("table.cell.end");
+ TagLogger::getInstance().chars(XTextRangeToString(end));
+ TagLogger::getInstance().endElement();
+ TagLogger::getInstance().endElement();
#endif
if (!end.get())
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index beac235..08cc318 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/text/WritingMode2.hpp>
#include <o3tl/numeric.hxx>
#include <ooxml/resourceids.hxx>
-#include <dmapperLoggers.hxx>
#include <DomainMapper.hxx>
#include <rtl/math.hxx>
@@ -62,10 +61,6 @@ DomainMapperTableManager::DomainMapperTableManager() :
m_pTablePropsHandler(new TablePropertiesHandler())
{
m_pTablePropsHandler->SetTableManager( this );
-
-#ifdef DEBUG_WRITERFILTER
- setTagLogger(dmapper_logger);
-#endif
}
@@ -125,10 +120,10 @@ void DomainMapperTableManager::finishTableLook()
bool DomainMapperTableManager::sprm(Sprm & rSprm)
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("tablemanager.sprm");
+ TagLogger::getInstance().startElement("tablemanager.sprm");
string sSprm = rSprm.toString();
- dmapper_logger->chars(sSprm);
- dmapper_logger->endElement();
+ TagLogger::getInstance().chars(sSprm);
+ TagLogger::getInstance().endElement();
#endif
bool bRet = TableManager::sprm(rSprm);
if( !bRet )
@@ -209,7 +204,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
m_bTableSizeTypeInserted = true;
}
#ifdef DEBUG_WRITERFILTER
- pPropMap->dumpXml( dmapper_logger );
+ pPropMap->dumpXml();
#endif
insertTableProps(pPropMap);
}
@@ -270,9 +265,9 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
case NS_ooxml::LN_CT_TcPrBase_gridSpan: //number of grid positions spanned by this cell
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("tablemanager.GridSpan");
- dmapper_logger->attribute("gridSpan", nIntValue);
- dmapper_logger->endElement();
+ TagLogger::getInstance().startElement("tablemanager.GridSpan");
+ TagLogger::getInstance().attribute("gridSpan", nIntValue);
+ TagLogger::getInstance().endElement();
#endif
m_nGridSpan = nIntValue;
}
@@ -394,7 +389,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
bRet = false;
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->element("unhandled");
+ TagLogger::getInstance().element("unhandled");
#endif
}
}
@@ -496,12 +491,12 @@ void DomainMapperTableManager::endLevel( )
TableManager::endLevel( );
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("dmappertablemanager.endLevel");
+ TagLogger::getInstance().startElement("dmappertablemanager.endLevel");
PropertyMapPtr pProps = getTableProps();
if (pProps.get() != nullptr)
- getTableProps()->dumpXml( dmapper_logger );
+ getTableProps()->dumpXml();
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
// Pop back the table position after endLevel as it's used
@@ -512,7 +507,7 @@ void DomainMapperTableManager::endLevel( )
void DomainMapperTableManager::endOfCellAction()
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->element("endOFCellAction");
+ TagLogger::getInstance().element("endOFCellAction");
#endif
getCurrentSpans()->push_back(m_nGridSpan);
@@ -523,7 +518,7 @@ void DomainMapperTableManager::endOfCellAction()
void DomainMapperTableManager::endOfRowAction()
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("endOfRowAction");
+ TagLogger::getInstance().startElement("endOfRowAction");
#endif
// Compare the table position with the previous ones. We may need to split
@@ -569,15 +564,15 @@ void DomainMapperTableManager::endOfRowAction()
::std::vector<sal_Int32>::const_iterator aCellIter = pTableGrid->begin();
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("tableWidth");
+ TagLogger::getInstance().startElement("tableWidth");
#endif
while( aCellIter != pTableGrid->end() )
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("col");
- dmapper_logger->attribute("width", *aCellIter);
- dmapper_logger->endElement();
+ TagLogger::getInstance().startElement("col");
+ TagLogger::getInstance().attribute("width", *aCellIter);
+ TagLogger::getInstance().endElement();
#endif
m_nTableWidth += *aCellIter++;
@@ -591,7 +586,7 @@ void DomainMapperTableManager::endOfRowAction()
}
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
@@ -603,21 +598,21 @@ void DomainMapperTableManager::endOfRowAction()
}
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("gridSpans");
+ TagLogger::getInstance().startElement("gridSpans");
{
::std::vector<sal_Int32>::const_iterator aGridSpanIter = pCurrentSpans->begin();
::std::vector<sal_Int32>::const_iterator aGridSpanIterEnd = pCurrentSpans->end();
while (aGridSpanIter != aGridSpanIterEnd)
{
- dmapper_logger->startElement("gridSpan");
- dmapper_logger->attribute("span", *aGridSpanIter);
- dmapper_logger->endElement();
+ TagLogger::getInstance().startElement("gridSpan");
+ TagLogger::getInstance().attribute("span", *aGridSpanIter);
+ TagLogger::getInstance().endElement();
++aGridSpanIter;
}
}
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
//calculate number of used grids - it has to match the size of m_aTableGrid
@@ -687,9 +682,9 @@ void DomainMapperTableManager::endOfRowAction()
pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::makeAny( aSeparators ) );
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("rowProperties");
- pPropMap->dumpXml( dmapper_logger );
- dmapper_logger->endElement();
+ TagLogger::getInstance().startElement("rowProperties");
+ pPropMap->dumpXml();
+ TagLogger::getInstance().endElement();
#endif
insertRowProps(pPropMap);
}
@@ -733,9 +728,9 @@ void DomainMapperTableManager::endOfRowAction()
TablePropertyMapPtr pPropMap( new TablePropertyMap );
pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::makeAny( aSeparators ) );
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("rowProperties");
- pPropMap->dumpXml( dmapper_logger );
- dmapper_logger->endElement();
+ TagLogger::getInstance().startElement("rowProperties");
+ pPropMap->dumpXml();
+ TagLogger::getInstance().endElement();
#endif
insertRowProps(pPropMap);
}
@@ -760,7 +755,7 @@ void DomainMapperTableManager::endOfRowAction()
m_bTableSizeTypeInserted = false;
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 90f517f..c7066f6 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -70,9 +70,6 @@
#include <GraphicHelpers.hxx>
#include <dmapper/GraphicZOrderHelper.hxx>
-#ifdef DEBUG_WRITERFILTER
-#include <dmapperLoggers.hxx>
-#endif
#include <oox/token/tokens.hxx>
#include <map>
@@ -1024,7 +1021,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("finishParagraph");
+ TagLogger::getInstance().startElement("finishParagraph");
#endif
ParagraphPropertyMap* pParaContext = dynamic_cast< ParagraphPropertyMap* >( pPropertyMap.get() );
@@ -1037,7 +1034,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->attribute("isTextAppend", sal_uInt32(xTextAppend.is()));
+ TagLogger::getInstance().attribute("isTextAppend", sal_uInt32(xTextAppend.is()));
#endif
if (xTextAppend.is() && !getTableManager( ).isIgnore() && pParaContext != nullptr)
@@ -1208,7 +1205,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
SetIsOutsideAParagraph(true);
m_bParaHadField = false;
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
@@ -1878,7 +1875,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW );
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->unoPropertySet(xProps);
+ TagLogger::getInstance().unoPropertySet(xProps);
#endif
text::TextContentAnchorType nAnchorType(text::TextContentAnchorType_AT_PARAGRAPH);
xProps->getPropertyValue(rPropNameSupplier.GetName( PROP_ANCHOR_TYPE )) >>= nAnchorType;
@@ -2583,7 +2580,7 @@ void DomainMapper_Impl::PushFieldContext()
if(m_bDiscardHeaderFooter)
return;
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->element("pushFieldContext");
+ TagLogger::getInstance().element("pushFieldContext");
#endif
uno::Reference< text::XTextAppend > xTextAppend;
@@ -2706,9 +2703,9 @@ void FieldContext::AppendCommand(const OUString& rPart)
void DomainMapper_Impl::AppendFieldCommand(OUString& rPartOfCommand)
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("appendFieldCommand");
- dmapper_logger->chars(rPartOfCommand);
- dmapper_logger->endElement();
+ TagLogger::getInstance().startElement("appendFieldCommand");
+ TagLogger::getInstance().chars(rPartOfCommand);
+ TagLogger::getInstance().endElement();
#endif
FieldContextPtr pContext = m_aFieldStack.top();
@@ -3417,7 +3414,7 @@ void DomainMapper_Impl::CloseFieldCommand()
if(m_bDiscardHeaderFooter)
return;
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->element("closeFieldCommand");
+ TagLogger::getInstance().element("closeFieldCommand");
#endif
FieldContextPtr pContext;
@@ -3505,9 +3502,9 @@ void DomainMapper_Impl::CloseFieldCommand()
}
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("fieldService");
- dmapper_logger->chars(sServiceName);
- dmapper_logger->endElement();
+ TagLogger::getInstance().startElement("fieldService");
+ TagLogger::getInstance().chars(sServiceName);
+ TagLogger::getInstance().endElement();
#endif
if (m_xTextFactory.is())
@@ -4158,8 +4155,8 @@ util::DateTime lcl_dateTimeFromSerial(const double& dSerial)
void DomainMapper_Impl::SetFieldResult(OUString const& rResult)
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("setFieldResult");
- dmapper_logger->chars(rResult);
+ TagLogger::getInstance().startElement("setFieldResult");
+ TagLogger::getInstance().chars(rResult);
#endif
FieldContextPtr pContext = m_aFieldStack.top();
@@ -4281,7 +4278,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult)
void DomainMapper_Impl::SetFieldFFData(FFDataHandler::Pointer_t pFFDataHandler)
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("setFieldFFData");
+ TagLogger::getInstance().startElement("setFieldFFData");
#endif
if (m_aFieldStack.size())
@@ -4294,7 +4291,7 @@ void DomainMapper_Impl::SetFieldFFData(FFDataHandler::Pointer_t pFFDataHandler)
}
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
@@ -4303,7 +4300,7 @@ void DomainMapper_Impl::PopFieldContext()
if(m_bDiscardHeaderFooter)
return;
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->element("popFieldContext");
+ TagLogger::getInstance().element("popFieldContext");
#endif
if (m_aFieldStack.empty())
diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx b/writerfilter/source/dmapper/FFDataHandler.cxx
index d076d40..4726b59 100644
--- a/writerfilter/source/dmapper/FFDataHandler.cxx
+++ b/writerfilter/source/dmapper/FFDataHandler.cxx
@@ -19,7 +19,6 @@
#include "FFDataHandler.hxx"
#include <ooxml/resourceids.hxx>
-#include "dmapperLoggers.hxx"
namespace writerfilter {
namespace dmapper {
@@ -29,7 +28,7 @@ namespace dmapper {
************************/
FFDataHandler::FFDataHandler() :
-LoggedProperties(dmapper_logger, "FFDataHandler"),
+LoggedProperties("FFDataHandler"),
m_nCheckboxHeight(0),
m_bCheckboxAutoHeight(false),
m_nCheckboxChecked(-1),
@@ -131,7 +130,7 @@ void FFDataHandler::lcl_sprm(Sprm & r_Sprm)
break;
default:
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->element("unhandled");
+ TagLogger::getInstance().element("unhandled");
#endif
break;
}
@@ -160,7 +159,7 @@ void FFDataHandler::lcl_attribute(Id name, Value & val)
break;
default:
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->element("unhandled");
+ TagLogger::getInstance().element("unhandled");
#endif
break;
}
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index 6510997..ed63d8e 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -27,8 +27,6 @@
#include <unotools/fontdefs.hxx>
#include <com/sun/star/awt/FontPitch.hpp>
-#include "dmapperLoggers.hxx"
-
using namespace com::sun::star;
namespace writerfilter {
@@ -43,9 +41,9 @@ struct FontTable_Impl
};
FontTable::FontTable()
-: LoggedProperties(dmapper_logger, "FontTable")
-, LoggedTable(dmapper_logger, "FontTable")
-, LoggedStream(dmapper_logger, "FontTable")
+: LoggedProperties("FontTable")
+, LoggedTable("FontTable")
+, LoggedStream("FontTable")
, m_pImpl( new FontTable_Impl )
{
}
@@ -237,7 +235,7 @@ sal_uInt32 FontTable::size()
}
EmbeddedFontHandler::EmbeddedFontHandler( const OUString& _fontName, const char* _style )
-: LoggedProperties(dmapper_logger, "EmbeddedFontHandler")
+: LoggedProperties("EmbeddedFontHandler")
, fontName( _fontName )
, style( _style )
{
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 7287bbf..f44431c 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -28,7 +28,6 @@
#include <com/sun/star/text/RelOrientation.hpp>
#include <com/sun/star/text/WrapTextMode.hpp>
-#include "dmapperLoggers.hxx"
#include <oox/drawingml/drawingmltypes.hxx>
#include <iostream>
@@ -39,7 +38,7 @@ namespace dmapper {
using namespace com::sun::star;
PositionHandler::PositionHandler( std::pair<OUString, OUString>& rPositionOffsets, std::pair<OUString, OUString>& rAligns ) :
-LoggedProperties(dmapper_logger, "PositionHandler"),
+LoggedProperties("PositionHandler"),
m_nOrient(text::VertOrientation::NONE),
m_nPosition(0),
m_rPositionOffsets(rPositionOffsets),
@@ -111,7 +110,7 @@ void PositionHandler::lcl_attribute( Id aName, Value& rVal )
break;
default:
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->element("unhandled");
+ TagLogger::getInstance().element("unhandled");
#endif
break;
}
@@ -176,7 +175,7 @@ sal_Int16 PositionHandler::orientation() const
}
WrapHandler::WrapHandler( ) :
-LoggedProperties(dmapper_logger, "WrapHandler"),
+LoggedProperties("WrapHandler"),
m_nType( 0 ),
m_nSide( 0 )
{
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index a97da37..a04c833 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -62,7 +62,6 @@
#include "GraphicImport.hxx"
#include "PropertyMap.hxx"
#include "WrapPolygonHandler.hxx"
-#include "dmapperLoggers.hxx"
#include "util.hxx"
namespace writerfilter {
@@ -449,9 +448,9 @@ GraphicImport::GraphicImport(uno::Reference<uno::XComponentContext> const& xComp
std::pair<OUString, OUString>& rPositionOffsets,
std::pair<OUString, OUString>& rAligns,
std::queue<OUString>& rPositivePercentages)
-: LoggedProperties(dmapper_logger, "GraphicImport")
-, LoggedTable(dmapper_logger, "GraphicImport")
-, LoggedStream(dmapper_logger, "GraphicImport")
+: LoggedProperties("GraphicImport")
+, LoggedTable("GraphicImport")
+, LoggedStream("GraphicImport")
, m_pImpl(new GraphicImport_Impl(eImportType, rDMapper, rPositionOffsets, rAligns, rPositivePercentages))
, m_xComponentContext(xComponentContext)
, m_xTextFactory(xTextFactory)
@@ -936,7 +935,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
break;
default:
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->element("unhandled");
+ TagLogger::getInstance().element("unhandled");
#endif
break;
}
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.cxx b/writerfilter/source/dmapper/LatentStyleHandler.cxx
index 287c571..67e2cb6f 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.cxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.cxx
@@ -8,7 +8,6 @@
*/
#include <LatentStyleHandler.hxx>
#include <ooxml/resourceids.hxx>
-#include "dmapperLoggers.hxx"
namespace writerfilter
{
@@ -18,7 +17,7 @@ namespace dmapper
using namespace ::com::sun::star;
LatentStyleHandler::LatentStyleHandler() :
- LoggedProperties(dmapper_logger, "LatentStyleHandler")
+ LoggedProperties("LatentStyleHandler")
{
}
@@ -53,7 +52,7 @@ void LatentStyleHandler::lcl_attribute(Id rName, Value& rVal)
default:
bFound = false;
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->element("unhandled");
+ TagLogger::getInstance().element("unhandled");
#endif
break;
}
diff --git a/writerfilter/source/dmapper/LoggedResources.cxx b/writerfilter/source/dmapper/LoggedResources.cxx
index 1cb2ffa..a4e495e 100644
--- a/writerfilter/source/dmapper/LoggedResources.cxx
+++ b/writerfilter/source/dmapper/LoggedResources.cxx
@@ -29,8 +29,8 @@ namespace writerfilter
#ifdef DEBUG_WRITERFILTER
// class: LoggedResourcesHelper
-LoggedResourcesHelper::LoggedResourcesHelper(TagLogger::Pointer_t pLogger, const std::string & sPrefix)
-: mpLogger(pLogger), msPrefix(sPrefix)
+LoggedResourcesHelper::LoggedResourcesHelper(const std::string & sPrefix)
+: msPrefix(sPrefix)
{
}
@@ -40,32 +40,32 @@ LoggedResourcesHelper::~LoggedResourcesHelper()
void LoggedResourcesHelper::startElement(const std::string & sElement)
{
- mpLogger->startElement(msPrefix + "." + sElement);
+ TagLogger::getInstance().startElement(msPrefix + "." + sElement);
}
void LoggedResourcesHelper::endElement(const std::string & /*sElement*/)
{
- mpLogger->endElement();
+ TagLogger::getInstance().endElement();
}
void LoggedResourcesHelper::chars(const OUString & rChars)
{
- mpLogger->chars(rChars);
+ TagLogger::getInstance().chars(rChars);
}
void LoggedResourcesHelper::chars(const std::string & rChars)
{
- mpLogger->chars(rChars);
+ TagLogger::getInstance().chars(rChars);
}
void LoggedResourcesHelper::attribute(const std::string & rName, const std::string & rValue)
{
- mpLogger->attribute(rName, rValue);
+ TagLogger::getInstance().attribute(rName, rValue);
}
void LoggedResourcesHelper::attribute(const std::string & rName, sal_uInt32 nValue)
{
- mpLogger->attribute(rName, nValue);
+ TagLogger::getInstance().attribute(rName, nValue);
}
#endif
@@ -74,11 +74,9 @@ void LoggedResourcesHelper::attribute(const std::string & rName, sal_uInt32 nVal
LoggedStream::LoggedStream(
#ifdef DEBUG_WRITERFILTER
- TagLogger::Pointer_t pLogger,
const std::string & sPrefix
-) : mHelper(pLogger, sPrefix)
+) : mHelper(sPrefix)
#else
- TagLogger::Pointer_t,
const std::string&
)
#endif
@@ -306,11 +304,9 @@ void LoggedStream::info(const std::string & _info)
// class LoggedProperties
LoggedProperties::LoggedProperties(
#ifdef DEBUG_WRITERFILTER
- TagLogger::Pointer_t pLogger,
const std::string & sPrefix
-) : mHelper(pLogger, sPrefix)
+) : mHelper(sPrefix)
#else
- TagLogger::Pointer_t,
const std::string&
)
#endif
@@ -350,11 +346,9 @@ void LoggedProperties::sprm(Sprm & rSprm)
LoggedTable::LoggedTable(
#ifdef DEBUG_WRITERFILTER
- TagLogger::Pointer_t pLogger,
const std::string & sPrefix
-) : mHelper(pLogger, sPrefix)
+) : mHelper(sPrefix)
#else
- TagLogger::Pointer_t,
const std::string&
)
#endif
diff --git a/writerfilter/source/dmapper/LoggedResources.hxx b/writerfilter/source/dmapper/LoggedResources.hxx
index 3fc391d..9ccf8c8 100644
--- a/writerfilter/source/dmapper/LoggedResources.hxx
+++ b/writerfilter/source/dmapper/LoggedResources.hxx
@@ -31,7 +31,7 @@ namespace writerfilter
class LoggedResourcesHelper
{
public:
- explicit LoggedResourcesHelper(TagLogger::Pointer_t pLogger, const std::string & sPrefix);
+ explicit LoggedResourcesHelper(const std::string & sPrefix);
virtual ~LoggedResourcesHelper();
void startElement(const std::string & sElement);
@@ -42,7 +42,6 @@ public:
void attribute(const std::string & rName, sal_uInt32 nValue);
private:
- TagLogger::Pointer_t mpLogger;
std::string msPrefix;
};
#endif
@@ -50,7 +49,7 @@ private:
class LoggedStream : public Stream
{
public:
- explicit LoggedStream(TagLogger::Pointer_t pLogger, const std::string & sPrefix);
+ explicit LoggedStream(const std::string & sPrefix);
virtual ~LoggedStream();
void startSectionGroup() SAL_OVERRIDE;
@@ -99,7 +98,7 @@ protected:
class LoggedProperties : public Properties
{
public:
- explicit LoggedProperties(TagLogger::Pointer_t pLogger, const std::string & sPrefix);
+ explicit LoggedProperties(const std::string & sPrefix);
virtual ~LoggedProperties();
void attribute(Id name, Value & val) SAL_OVERRIDE;
@@ -117,7 +116,7 @@ protected:
class LoggedTable : public Table
{
public:
- explicit LoggedTable(TagLogger::Pointer_t pLogger, const std::string & sPrefix);
+ explicit LoggedTable(const std::string & sPrefix);
virtual ~LoggedTable();
void entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
diff --git a/writerfilter/source/dmapper/MeasureHandler.cxx b/writerfilter/source/dmapper/MeasureHandler.cxx
index e17dcf9..9b41676 100644
--- a/writerfilter/source/dmapper/MeasureHandler.cxx
+++ b/writerfilter/source/dmapper/MeasureHandler.cxx
@@ -22,7 +22,6 @@
#include <ooxml/resourceids.hxx>
#include <osl/diagnose.h>
#include <com/sun/star/text/SizeType.hpp>
-#include "dmapperLoggers.hxx"
namespace writerfilter {
namespace dmapper {
@@ -32,7 +31,7 @@ using namespace ::com::sun::star;
MeasureHandler::MeasureHandler() :
-LoggedProperties(dmapper_logger, "MeasureHandler"),
+LoggedProperties("MeasureHandler"),
m_nMeasureValue( 0 ),
m_nUnit( -1 ),
m_nRowHeightSizeType( text::SizeType::MIN )
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 3377c53..481dbdf 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -36,8 +36,6 @@
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/sequence.hxx>
-#include "dmapperLoggers.hxx"
-
using namespace com::sun::star;
#define MAKE_PROPVAL(NameId, Value) \
@@ -695,8 +693,8 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper,
ListsManager::ListsManager(DomainMapper& rDMapper,
const uno::Reference<lang::XMultiServiceFactory> & xFactory)
- : LoggedProperties(dmapper_logger, "ListsManager")
- , LoggedTable(dmapper_logger, "ListsManager")
+ : LoggedProperties("ListsManager")
+ , LoggedTable("ListsManager")
, m_rDMapper(rDMapper)
, m_xFactory(xFactory)
, m_bIsLFOImport(false)
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index 328d2d7..f72d8ef 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -45,8 +45,6 @@
#include <com/sun/star/text/XTextDocument.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include "dmapperLoggers.hxx"
-
namespace writerfilter {
namespace dmapper {
@@ -54,7 +52,7 @@ using namespace ::com::sun::star;
OLEHandler::OLEHandler(DomainMapper& rDomainMapper) :
-LoggedProperties(dmapper_logger, "OLEHandler"),
+LoggedProperties("OLEHandler"),
m_nDxaOrig(0),
m_nDyaOrig(0),
m_nWrapMode(1),
diff --git a/writerfilter/source/dmapper/PageBordersHandler.cxx b/writerfilter/source/dmapper/PageBordersHandler.cxx
index 10b36e6..f0790ea 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.cxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.cxx
@@ -21,8 +21,6 @@
#include <ooxml/resourceids.hxx>
-#include "dmapperLoggers.hxx"
-
namespace writerfilter {
namespace dmapper {
@@ -38,7 +36,7 @@ _PgBorder::~_PgBorder( )
}
PageBordersHandler::PageBordersHandler( ) :
-LoggedProperties(dmapper_logger, "PageBordersHandler"),
+LoggedProperties("PageBordersHandler"),
m_nDisplay( 0 ),
m_nOffset( 0 )
{
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 6b3a76d..f2f49b1 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -42,7 +42,6 @@
#include <com/sun/star/text/TextGridMode.hpp>
#include <com/sun/star/text/XTextCopy.hpp>
#include <comphelper/sequence.hxx>
-#include "dmapperLoggers.hxx"
#include "PropertyMapHelper.hxx"
using namespace ::com::sun::star;
@@ -228,25 +227,25 @@ static void lcl_AnyToTag(const uno::Any & rAny)
try {
sal_Int32 aInt = 0;
if (rAny >>= aInt) {
- dmapper_logger->attribute("value", rAny);
+ TagLogger::getInstance().attribute("value", rAny);
} else {
- dmapper_logger->attribute("unsignedValue", 0);
+ TagLogger::getInstance().attribute("unsignedValue", 0);
}
sal_uInt32 auInt = 0;
rAny >>= auInt;
- dmapper_logger->attribute("unsignedValue", auInt);
+ TagLogger::getInstance().attribute("unsignedValue", auInt);
float aFloat = 0.0f;
if (rAny >>= aFloat) {
- dmapper_logger->attribute("floatValue", rAny);
+ TagLogger::getInstance().attribute("floatValue", rAny);
} else {
- dmapper_logger->attribute("unsignedValue", 0);
+ TagLogger::getInstance().attribute("unsignedValue", 0);
}
OUString aStr;
rAny >>= aStr;
- dmapper_logger->attribute("stringValue", aStr);
+ TagLogger::getInstance().attribute("stringValue", aStr);
}
catch (...) {
}
@@ -259,10 +258,10 @@ void PropertyMap::Insert( PropertyIds eId, const uno::Any& rAny, bool bOverwrite
const OUString& rInsert = PropertyNameSupplier::
GetPropertyNameSupplier().GetName(eId);
- dmapper_logger->startElement("propertyMap.insert");
- dmapper_logger->attribute("name", rInsert);
+ TagLogger::getInstance().startElement("propertyMap.insert");
+ TagLogger::getInstance().attribute("name", rInsert);
lcl_AnyToTag(rAny);
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
if (!bOverwrite)
@@ -296,41 +295,41 @@ bool PropertyMap::isSet( PropertyIds eId) const
}
#ifdef DEBUG_WRITERFILTER
-void PropertyMap::dumpXml( const TagLogger::Pointer_t pLogger ) const
+void PropertyMap::dumpXml() const
{
- pLogger->startElement("PropertyMap");
+ TagLogger::getInstance().startElement("PropertyMap");
PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
MapIterator aMapIter = m_vMap.begin();
while (aMapIter != m_vMap.end())
{
- pLogger->startElement("property");
+ TagLogger::getInstance().startElement("property");
- pLogger->attribute("name", rPropNameSupplier.GetName( aMapIter->first ));
+ TagLogger::getInstance().attribute("name", rPropNameSupplier.GetName( aMapIter->first ));
switch (aMapIter->first)
{
case PROP_TABLE_COLUMN_SEPARATORS:
- lcl_DumpTableColumnSeparators(pLogger, aMapIter->second.getValue());
+ lcl_DumpTableColumnSeparators(aMapIter->second.getValue());
break;
default:
{
try {
sal_Int32 aInt = 0;
aMapIter->second.getValue() >>= aInt;
- pLogger->attribute("value", aInt);
+ TagLogger::getInstance().attribute("value", aInt);
sal_uInt32 auInt = 0;
aMapIter->second.getValue() >>= auInt;
- pLogger->attribute("unsignedValue", auInt);
+ TagLogger::getInstance().attribute("unsignedValue", auInt);
float aFloat = 0.0;
aMapIter->second.getValue() >>= aFloat;
- pLogger->attribute("floatValue", aFloat);
+ TagLogger::getInstance().attribute("floatValue", aFloat);
OUString aStr;
aMapIter->second.getValue() >>= auInt;
- pLogger->attribute("stringValue", aStr);
+ TagLogger::getInstance().attribute("stringValue", aStr);
}
catch (...) {
}
@@ -338,12 +337,12 @@ void PropertyMap::dumpXml( const TagLogger::Pointer_t pLogger ) const
break;
}
- pLogger->endElement();
+ TagLogger::getInstance().endElement();
++aMapIter;
}
- pLogger->endElement();
+ TagLogger::getInstance().endElement();
}
#endif
@@ -364,14 +363,14 @@ void PropertyMap::InsertProps(const PropertyMapPtr& rMap)
void PropertyMap::insertTableProperties( const PropertyMap* )
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->element("PropertyMap.insertTableProperties");
+ TagLogger::getInstance().element("PropertyMap.insertTableProperties");
#endif
}
void PropertyMap::printProperties()
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("properties");
+ TagLogger::getInstance().startElement("properties");
MapIterator aMapIter = m_vMap.begin();
MapIterator aEndIter = m_vMap.end();
@@ -384,21 +383,21 @@ void PropertyMap::printProperties()
sal_Int32 nColor;
if ( aMapIter->second.getValue() >>= aLine )
{
- dmapper_logger->startElement("borderline");
- dmapper_logger->attribute("color", aLine.Color);
- dmapper_logger->attribute("inner", aLine.InnerLineWidth);
- dmapper_logger->attribute("outer", aLine.OuterLineWidth);
- dmapper_logger->endElement();
+ TagLogger::getInstance().startElement("borderline");
+ TagLogger::getInstance().attribute("color", aLine.Color);
+ TagLogger::getInstance().attribute("inner", aLine.InnerLineWidth);
+ TagLogger::getInstance().attribute("outer", aLine.OuterLineWidth);
+ TagLogger::getInstance().endElement();
}
else if ( aMapIter->second.getValue() >>= nColor )
{
- dmapper_logger->startElement("color");
- dmapper_logger->attribute("number", nColor);
- dmapper_logger->endElement();
+ TagLogger::getInstance().startElement("color");
+ TagLogger::getInstance().attribute("number", nColor);
+ TagLogger::getInstance().endElement();
}
}
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
@@ -1585,8 +1584,8 @@ void TablePropertyMap::setValue( TablePropertyMapTarget eWhich, sal_Int32 nSet )
void TablePropertyMap::insertTableProperties( const PropertyMap* pMap )
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("TablePropertyMap.insertTableProperties");
- pMap->dumpXml(dmapper_logger);
+ TagLogger::getInstance().startElement("TablePropertyMap.insertTableProperties");
+ pMap->dumpXml();
#endif
const TablePropertyMap* pSource = dynamic_cast< const TablePropertyMap* >(pMap);
@@ -1603,8 +1602,8 @@ void TablePropertyMap::insertTableProperties( const PropertyMap* pMap )
}
}
#ifdef DEBUG_WRITERFILTER
- dumpXml( dmapper_logger );
- dmapper_logger->endElement();
+ dumpXml();
+ TagLogger::getInstance().endElement();
#endif
}
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 1221bac..55c7cec 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -172,7 +172,7 @@ public:
void printProperties();
#ifdef DEBUG_WRITERFILTER
- void dumpXml( const TagLogger::Pointer_t pLogger ) const;
+ void dumpXml() const;
#endif
static css::table::ShadowFormat getShadowFromBorder(const css::table::BorderLine2& rBorder);
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx
index 2bc504e..405141a 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.cxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx
@@ -28,49 +28,48 @@ namespace dmapper
using namespace ::com::sun::star;
-void lcl_DumpTableColumnSeparators(const TagLogger::Pointer_t& pLogger, const uno::Any & rTableColumnSeparators)
+void lcl_DumpTableColumnSeparators(const uno::Any & rTableColumnSeparators)
{
- (void) pLogger;
(void) rTableColumnSeparators;
#ifdef DEBUG_WRITERFILTER
uno::Sequence<text::TableColumnSeparator> aSeq;
rTableColumnSeparators >>= aSeq;
- pLogger->startElement("property.TableColumnSeparators");
+ TagLogger::getInstance().startElement("property.TableColumnSeparators");
sal_uInt32 nLength = aSeq.getLength();
for (sal_uInt32 n = 0; n < nLength; ++n)
{
- pLogger->startElement("separator");
+ TagLogger::getInstance().startElement("separator");
- pLogger->attribute("position", aSeq[n].Position);
- pLogger->attribute("visible", sal_uInt32(aSeq[n].IsVisible));
+ TagLogger::getInstance().attribute("position", aSeq[n].Position);
+ TagLogger::getInstance().attribute("visible", sal_uInt32(aSeq[n].IsVisible));
- pLogger->endElement();
+ TagLogger::getInstance().endElement();
}
- pLogger->endElement();
+ TagLogger::getInstance().endElement();
#endif // DEBUG_WRITERFILTER
}
#ifdef DEBUG_WRITERFILTER
-void lcl_DumpPropertyValues(const TagLogger::Pointer_t pLogger, beans::PropertyValues & rValues)
+void lcl_DumpPropertyValues(beans::PropertyValues & rValues)
{
- pLogger->startElement("propertyValues");
+ TagLogger::getInstance().startElement("propertyValues");
beans::PropertyValue * pValues = rValues.getArray();
for (sal_Int32 n = 0; n < rValues.getLength(); ++n)
{
- pLogger->startElement("propertyValue");
+ TagLogger::getInstance().startElement("propertyValue");
- pLogger->attribute("name", pValues[n].Name);
+ TagLogger::getInstance().attribute("name", pValues[n].Name);
try
{
sal_Int32 aInt = 0;
pValues[n].Value >>= aInt;
- pLogger->attribute("value", aInt);
+ TagLogger::getInstance().attribute("value", aInt);
}
catch (...)
{
@@ -78,26 +77,26 @@ void lcl_DumpPropertyValues(const TagLogger::Pointer_t pLogger, beans::PropertyV
if ( pValues[n].Name == "TableColumnSeparators" )
{
- lcl_DumpTableColumnSeparators(pLogger, pValues[n].Value);
+ lcl_DumpTableColumnSeparators(pValues[n].Value);
}
- pLogger->endElement();
+ TagLogger::getInstance().endElement();
}
- pLogger->endElement();
+ TagLogger::getInstance().endElement();
}
-void lcl_DumpPropertyValueSeq(const TagLogger::Pointer_t pLogger, PropertyValueSeq_t & rPropValSeq)
+void lcl_DumpPropertyValueSeq(PropertyValueSeq_t & rPropValSeq)
{
- pLogger->startElement("PropertyValueSeq");
+ TagLogger::getInstance().startElement("PropertyValueSeq");
beans::PropertyValues * pValues = rPropValSeq.getArray();
for (sal_Int32 n = 0; n < rPropValSeq.getLength(); ++n)
{
- lcl_DumpPropertyValues(pLogger, pValues[n]);
+ lcl_DumpPropertyValues(pValues[n]);
}
- pLogger->endElement();
+ TagLogger::getInstance().endElement();
}
#endif // DEBUG_WRITERFILTER
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/writerfilter/source/dmapper/PropertyMapHelper.hxx
index 819fc8b..4472fea 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.hxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx
@@ -28,15 +28,12 @@ namespace writerfilter
namespace dmapper
{
-void lcl_DumpTableColumnSeparators(const TagLogger::Pointer_t& rLogger,
- const css::uno::Any & rTableColumnSeparators);
+void lcl_DumpTableColumnSeparators(const css::uno::Any & rTableColumnSeparators);
#ifdef DEBUG_WRITERFILTER
-void lcl_DumpPropertyValues(const TagLogger::Pointer_t pLogger,
- css::beans::PropertyValues & rValues);
+void lcl_DumpPropertyValues(css::beans::PropertyValues & rValues);
typedef css::uno::Sequence<css::beans::PropertyValues> PropertyValueSeq_t;
-void lcl_DumpPropertyValueSeq(const TagLogger::Pointer_t pLogger,
- PropertyValueSeq_t & rPropValSeq);
+void lcl_DumpPropertyValueSeq(PropertyValueSeq_t & rPropValSeq);
#endif // DEBUG_WRITERFILTER
}
}
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.cxx b/writerfilter/source/dmapper/SectionColumnHandler.cxx
index dbc5ac9..3a35754 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.cxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.cxx
@@ -22,8 +22,6 @@
#include <ooxml/resourceids.hxx>
#include <osl/diagnose.h>
-#include "dmapperLoggers.hxx"
-
namespace writerfilter {
namespace dmapper {
@@ -31,7 +29,7 @@ using namespace ::com::sun::star;
SectionColumnHandler::SectionColumnHandler()
- : LoggedProperties(dmapper_logger, "SectionColumnHandler")
+ : LoggedProperties("SectionColumnHandler")
, bEqualWidth(false)
, nSpace(0)
, nNum(0)
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index cd73226..ef4ed92 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -30,7 +30,6 @@
#include <comphelper/sequence.hxx>
#include <ooxml/resourceids.hxx>
#include <ConversionHelper.hxx>
-#include "dmapperLoggers.hxx"
#include "util.hxx"
using namespace com::sun::star;
@@ -121,8 +120,8 @@ struct SettingsTable_Impl
};
SettingsTable::SettingsTable(DomainMapper& rDMapper, const uno::Reference< lang::XMultiServiceFactory > & xTextFactory)
-: LoggedProperties(dmapper_logger, "SettingsTable")
-, LoggedTable(dmapper_logger, "SettingsTable")
+: LoggedProperties("SettingsTable")
+, LoggedTable("SettingsTable")
, m_pImpl( new SettingsTable_Impl(rDMapper, xTextFactory) )
{
@@ -173,7 +172,7 @@ void SettingsTable::lcl_attribute(Id nName, Value & val)
default:
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->element("unhandled");
+ TagLogger::getInstance().element("unhandled");
#endif
}
}
@@ -292,7 +291,7 @@ void SettingsTable::lcl_sprm(Sprm& rSprm)
default:
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->element("unhandled");
+ TagLogger::getInstance().element("unhandled");
#endif
}
}
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 50e9fa9..211d2a0 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -44,9 +44,8 @@
#include <comphelper/string.hxx>
#include <comphelper/sequence.hxx>
-#include <dmapperLoggers.hxx>
-
using namespace ::com::sun::star;
+
namespace writerfilter {
namespace dmapper
{
@@ -383,8 +382,8 @@ void StyleSheetTable_Impl::AppendLatentStyleProperty(const OUString& aName, Valu
StyleSheetTable::StyleSheetTable(DomainMapper& rDMapper,
uno::Reference< text::XTextDocument> const& xTextDocument,
bool const bIsNewDoc)
-: LoggedProperties(dmapper_logger, "StyleSheetTable")
-, LoggedTable(dmapper_logger, "StyleSheetTable")
+: LoggedProperties("StyleSheetTable")
+, LoggedTable("StyleSheetTable")
, m_pImpl( new StyleSheetTable_Impl(rDMapper, xTextDocument, bIsNewDoc) )
{
}
@@ -514,7 +513,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
default:
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->element("unhandled");
+ TagLogger::getInstance().element("unhandled");
#endif
}
break;
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx
index 677781b..8c38956 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -25,8 +25,6 @@
#include <com/sun/star/text/TableColumnSeparator.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
-#include "dmapperLoggers.hxx"
-
namespace writerfilter {
namespace dmapper {
@@ -35,7 +33,7 @@ using namespace ::com::sun::star;
TDefTableHandler::TDefTableHandler() :
-LoggedProperties(dmapper_logger, "TDefTableHandler"),
+LoggedProperties("TDefTableHandler"),
m_nLineWidth(0),
m_nLineType(0),
m_nLineColor(0),
diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx
index 9047bea..4f8595a 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -32,9 +32,9 @@ void TableManager::clearData()
void TableManager::openCell(const css::uno::Reference<css::text::XTextRange>& rHandle, TablePropertyMapPtr pProps)
{
#ifdef DEBUG_WRITERFILTER
- mpTableLogger->startElement("tablemanager.openCell");
- mpTableLogger->chars(XTextRangeToString(rHandle));
- mpTableLogger->endElement();
+ TagLogger::getInstance().startElement("tablemanager.openCell");
+ TagLogger::getInstance().chars(XTextRangeToString(rHandle));
+ TagLogger::getInstance().endElement();
#endif
if (mTableDataStack.size() > 0)
@@ -61,8 +61,7 @@ void TableManager::endOfCellAction()
void TableManager::insertTableProps(TablePropertyMapPtr pProps)
{
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- mpTableLogger->startElement("tablemanager.insertTableProps");
+ TagLogger::getInstance().startElement("tablemanager.insertTableProps");
#endif
if (getTableProps().get() && getTableProps() != pProps)
@@ -71,16 +70,14 @@ void TableManager::insertTableProps(TablePropertyMapPtr pProps)
setTableProps(pProps);
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- mpTableLogger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
void TableManager::insertRowProps(TablePropertyMapPtr pProps)
{
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- mpTableLogger->startElement("tablemanager.insertRowProps");
+ TagLogger::getInstance().startElement("tablemanager.insertRowProps");
#endif
if (getRowProps().get())
@@ -89,31 +86,27 @@ void TableManager::insertRowProps(TablePropertyMapPtr pProps)
setRowProps(pProps);
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- mpTableLogger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
void TableManager::cellPropsByCell(unsigned int i, TablePropertyMapPtr pProps)
{
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- mpTableLogger->startElement("tablemanager.cellPropsByCell");
+ TagLogger::getInstance().startElement("tablemanager.cellPropsByCell");
#endif
mTableDataStack.top()->insertCellProperties(i, pProps);
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- mpTableLogger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
void TableManager::cellProps(TablePropertyMapPtr pProps)
{
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- mpTableLogger->startElement("tablemanager.cellProps");
+ TagLogger::getInstance().startElement("tablemanager.cellProps");
#endif
if (getCellProps().get())
@@ -122,8 +115,7 @@ void TableManager::cellProps(TablePropertyMapPtr pProps)
setCellProps(pProps);
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- mpTableLogger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
@@ -152,8 +144,7 @@ void TableManager::text(const sal_uInt8* data, size_t len)
void TableManager::handle0x7()
{
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- mpTableLogger->startElement("tablemanager.handle0x7");
+ TagLogger::getInstance().startElement("tablemanager.handle0x7");
#endif
if (mnTableDepthNew < 1)
@@ -165,8 +156,7 @@ void TableManager::handle0x7()
endRow();
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- mpTableLogger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
@@ -200,9 +190,9 @@ bool TableManager::sprm(Sprm& rSprm)
void TableManager::closeCell(const css::uno::Reference<css::text::XTextRange>& rHandle)
{
#ifdef DEBUG_WRITERFILTER
- mpTableLogger->startElement("tablemanager.closeCell");
- mpTableLogger->chars(XTextRangeToString(rHandle));
- mpTableLogger->endElement();
+ TagLogger::getInstance().startElement("tablemanager.closeCell");
+ TagLogger::getInstance().chars(XTextRangeToString(rHandle));
+ TagLogger::getInstance().endElement();
#endif
if (mTableDataStack.size() > 0)
@@ -216,7 +206,7 @@ void TableManager::closeCell(const css::uno::Reference<css::text::XTextRange>& r
void TableManager::ensureOpenCell(TablePropertyMapPtr pProps)
{
#ifdef DEBUG_WRITERFILTER
- mpTableLogger->startElement("tablemanager.ensureOpenCell");
+ TagLogger::getInstance().startElement("tablemanager.ensureOpenCell");
#endif
if (mTableDataStack.size() > 0)
@@ -232,7 +222,7 @@ void TableManager::ensureOpenCell(TablePropertyMapPtr pProps)
}
}
#ifdef DEBUG_WRITERFILTER
- mpTableLogger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
@@ -292,8 +282,7 @@ void TableManager::startParagraphGroup()
void TableManager::resolveCurrentTable()
{
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- mpTableLogger->startElement("tablemanager.resolveCurrentTable");
+ TagLogger::getInstance().startElement("tablemanager.resolveCurrentTable");
#endif
if (mpTableDataHandler.get() != nullptr)
@@ -335,8 +324,7 @@ void TableManager::resolveCurrentTable()
clearData();
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- mpTableLogger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
@@ -352,58 +340,52 @@ void TableManager::endLevel()
mTableDataStack.pop();
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- {
- TableData::Pointer_t pTableData;
+ TableData::Pointer_t pTableData;
- if (mTableDataStack.size() > 0)
- pTableData = mTableDataStack.top();
+ if (mTableDataStack.size() > 0)
+ pTableData = mTableDataStack.top();
- mpTableLogger->startElement("tablemanager.endLevel");
- mpTableLogger->attribute("level", mTableDataStack.size());
+ TagLogger::getInstance().startElement("tablemanager.endLevel");
+ TagLogger::getInstance().attribute("level", mTableDataStack.size());
- if (pTableData.get() != nullptr)
- mpTableLogger->attribute("openCell", pTableData->isCellOpen() ? "yes" : "no");
+ if (pTableData.get() != nullptr)
+ TagLogger::getInstance().attribute("openCell", pTableData->isCellOpen() ? "yes" : "no");
- mpTableLogger->endElement();
- }
+ TagLogger::getInstance().endElement();
#endif
}
void TableManager::startLevel()
{
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- {
- TableData::Pointer_t pTableData;
+ TableData::Pointer_t pTableData;
- if (mTableDataStack.size() > 0)
- pTableData = mTableDataStack.top();
+ if (mTableDataStack.size() > 0)
+ pTableData = mTableDataStack.top();
- mpTableLogger->startElement("tablemanager.startLevel");
- mpTableLogger->attribute("level", mTableDataStack.size());
+ TagLogger::getInstance().startElement("tablemanager.startLevel");
+ TagLogger::getInstance().attribute("level", mTableDataStack.size());
- if (pTableData.get() != nullptr)
- mpTableLogger->attribute("openCell", pTableData->isCellOpen() ? "yes" : "no");
+ if (pTableData.get() != nullptr)
+ TagLogger::getInstance().attribute("openCell", pTableData->isCellOpen() ? "yes" : "no");
- mpTableLogger->endElement();
- }
+ TagLogger::getInstance().endElement();
#endif
- TableData::Pointer_t pTableData(new TableData(mTableDataStack.size()));
+ TableData::Pointer_t pTableData2(new TableData(mTableDataStack.size()));
// If we have an unfinished row stored here, then push it to the new TableData
if (mpUnfinishedRow)
{
for (unsigned int i = 0; i < mpUnfinishedRow->getCellCount(); ++i)
{
- pTableData->addCell(mpUnfinishedRow->getCellStart(i), mpUnfinishedRow->getCellProperties(i));
- pTableData->endCell(mpUnfinishedRow->getCellEnd(i));
+ pTableData2->addCell(mpUnfinishedRow->getCellStart(i), mpUnfinishedRow->getCellProperties(i));
+ pTableData2->endCell(mpUnfinishedRow->getCellEnd(i));
}
mpUnfinishedRow.reset();
}
- mTableDataStack.push(pTableData);
+ mTableDataStack.push(pTableData2);
mState.startLevel();
}
@@ -418,12 +400,9 @@ bool TableManager::isInTable()
void TableManager::handle(const css::uno::Reference<css::text::XTextRange>& rHandle)
{
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger)
- {
- mpTableLogger->startElement("tablemanager.handle");
- mpTableLogger->chars(XTextRangeToString(rHandle));
- mpTableLogger->endElement();
- }
+ TagLogger::getInstance().startElement("tablemanager.handle");
+ TagLogger::getInstance().chars(XTextRangeToString(rHandle));
+ TagLogger::getInstance().endElement();
#endif
setHandle(rHandle);
@@ -437,8 +416,7 @@ void TableManager::setHandler(TableDataHandler::Pointer_t pTableDataHandler)
void TableManager::endRow()
{
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- mpTableLogger->element("tablemanager.endRow");
+ TagLogger::getInstance().element("tablemanager.endRow");
#endif
setRowEnd(true);
@@ -447,8 +425,7 @@ void TableManager::endRow()
void TableManager::endCell()
{
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- mpTableLogger->element("tablemanager.endCell");
+ TagLogger::getInstance().element("tablemanager.endCell");
#endif
setCellEnd(true);
@@ -457,8 +434,7 @@ void TableManager::endCell()
void TableManager::inCell()
{
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- mpTableLogger->element("tablemanager.inCell");
+ TagLogger::getInstance().element("tablemanager.inCell");
#endif
setInCell(true);
@@ -469,12 +445,9 @@ void TableManager::inCell()
void TableManager::cellDepth(sal_uInt32 nDepth)
{
#ifdef DEBUG_WRITERFILTER
- if (mpTableLogger != nullptr)
- {
- mpTableLogger->startElement("tablemanager.cellDepth");
- mpTableLogger->attribute("depth", nDepth);
- mpTableLogger->endElement();
- }
+ TagLogger::getInstance().startElement("tablemanager.cellDepth");
+ TagLogger::getInstance().attribute("depth", nDepth);
+ TagLogger::getInstance().endElement();
#endif
mnTableDepthNew = nDepth;
diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx
index 526c195..3d44e24 100644
--- a/writerfilter/source/dmapper/TableManager.hxx
+++ b/writerfilter/source/dmapper/TableManager.hxx
@@ -101,10 +101,6 @@ protected:
*/
class TableManager
{
-#ifdef DEBUG_WRITERFILTER
- TagLogger::Pointer_t mpTableLogger;
-#endif
-
class TableManagerState
{
/**
@@ -610,12 +606,6 @@ public:
bool isIgnore() const;
-#ifdef DEBUG_WRITERFILTER
- void setTagLogger(TagLogger::Pointer_t _tagLogger)
- {
- mpTableLogger = _tagLogger;
- }
-#endif
};
}
diff --git a/writerfilter/source/dmapper/TablePositionHandler.cxx b/writerfilter/source/dmapper/TablePositionHandler.cxx
index 2c7e921..0db1efb 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.cxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.cxx
@@ -12,7 +12,6 @@
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
#include <com/sun/star/text/RelOrientation.hpp>
-#include "dmapperLoggers.hxx"
#include <comphelper/sequenceashashmap.hxx>
namespace writerfilter
@@ -23,7 +22,7 @@ namespace dmapper
using namespace ::com::sun::star;
TablePositionHandler::TablePositionHandler() :
- LoggedProperties(dmapper_logger, "TablePositionHandler"),
+ LoggedProperties("TablePositionHandler"),
m_aVertAnchor("margin"),
m_aYSpec(),
m_aHorzAnchor("text"),
@@ -78,7 +77,7 @@ void TablePositionHandler::lcl_attribute(Id rName, Value& rVal)
break;
default:
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->element("unhandled");
+ TagLogger::getInstance().element("unhandled");
#endif
break;
}
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index 52f8ea1..eb29b48 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/text/SizeType.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
-#include <dmapperLoggers.hxx>
#include <oox/token/tokens.hxx>
#include <DomainMapper.hxx>
@@ -57,8 +56,8 @@ namespace dmapper {
bool TablePropertiesHandler::sprm(Sprm & rSprm)
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("TablePropertiesHandler.sprm");
- dmapper_logger->attribute("sprm", rSprm.toString());
+ TagLogger::getInstance().startElement("TablePropertiesHandler.sprm");
+ TagLogger::getInstance().attribute("sprm", rSprm.toString());
#endif
bool bRet = true;
@@ -218,7 +217,7 @@ namespace dmapper {
pTablePropMap->InsertProps(pBorderHandler->getProperties());
#ifdef DEBUG_WRITERFILTER
- pTablePropMap->dumpXml( dmapper_logger );
+ pTablePropMap->dumpXml();
#endif
insertTableProps( pTablePropMap );
}
@@ -380,7 +379,7 @@ namespace dmapper {
}
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
return bRet;
diff --git a/writerfilter/source/dmapper/TagLogger.cxx b/writerfilter/source/dmapper/TagLogger.cxx
index e67b447..f1e0810 100644
--- a/writerfilter/source/dmapper/TagLogger.cxx
+++ b/writerfilter/source/dmapper/TagLogger.cxx
@@ -27,8 +27,8 @@ using namespace css;
namespace writerfilter
{
- TagLogger::TagLogger(const char* name)
- : pWriter( nullptr ), pName( name )
+ TagLogger::TagLogger()
+ : pWriter( nullptr ), pName( "DOMAINMAPPER" )
{
}
@@ -90,25 +90,13 @@ namespace writerfilter
#endif
- TagLogger::Pointer_t TagLogger::getInstance(const char * name)
- {
- typedef std::unordered_map<std::string, TagLogger::Pointer_t> TagLoggerHashMap_t;
- static TagLoggerHashMap_t tagLoggers;
-
- TagLoggerHashMap_t::iterator aIt = tagLoggers.end();
+struct TheTagLogger:
+ public rtl::Static<TagLogger, TheTagLogger>
+{};
- std::string sName = name;
- if (! tagLoggers.empty())
- aIt = tagLoggers.find(sName);
-
- if (aIt == tagLoggers.end())
- {
- TagLogger::Pointer_t pTagLogger(new TagLogger(name));
- std::pair<std::string, TagLogger::Pointer_t> entry(sName, pTagLogger);
- aIt = tagLoggers.insert(entry).first;
- }
-
- return aIt->second;
+ TagLogger& TagLogger::getInstance()
+ {
+ return TheTagLogger::get();
}
#ifdef DEBUG_WRITERFILTER
diff --git a/writerfilter/source/dmapper/TagLogger.hxx b/writerfilter/source/dmapper/TagLogger.hxx
index 141a534..5bd2128 100644
--- a/writerfilter/source/dmapper/TagLogger.hxx
+++ b/writerfilter/source/dmapper/TagLogger.hxx
@@ -32,19 +32,17 @@ namespace writerfilter
class TagLogger
{
- public:
- typedef std::shared_ptr<TagLogger> Pointer_t;
-
private:
+ static std::shared_ptr<TagLogger> instance;
+
xmlTextWriterPtr pWriter;
const char* pName;
- explicit TagLogger(const char* name);
-
public:
+ explicit TagLogger();
~TagLogger();
- static Pointer_t getInstance(const char * name);
+ static TagLogger& getInstance();
#ifdef DEBUG_WRITERFILTER
void setFileName(const std::string & filename);
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index 1bd6a6d..d1c28ba 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -22,7 +22,6 @@
#include <ooxml/resourceids.hxx>
#include <comphelper/sequence.hxx>
-#include "dmapperLoggers.hxx"
using namespace css;
@@ -30,7 +29,7 @@ namespace writerfilter {
namespace dmapper {
TblStylePrHandler::TblStylePrHandler( DomainMapper & rDMapper ) :
-LoggedProperties(dmapper_logger, "TblStylePrHandler"),
+LoggedProperties("TblStylePrHandler"),
m_rDMapper( rDMapper ),
m_pTablePropsHandler(new TablePropertiesHandler()),
m_nType( TBL_STYLE_UNKNOWN ),
@@ -122,8 +121,8 @@ void TblStylePrHandler::lcl_attribute(Id rName, Value & rVal)
void TblStylePrHandler::lcl_sprm(Sprm & rSprm)
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("TblStylePrHandler.sprm");
- dmapper_logger->attribute("sprm", rSprm.toString());
+ TagLogger::getInstance().startElement("TblStylePrHandler.sprm");
+ TagLogger::getInstance().attribute("sprm", rSprm.toString());
#endif
Value::Pointer_t pValue = rSprm.getValue();
@@ -181,7 +180,7 @@ void TblStylePrHandler::lcl_sprm(Sprm & rSprm)
}
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx
index 23484c7..244a15c 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx
@@ -17,7 +17,6 @@
#include <rtl/ustrbuf.hxx>
#include <comphelper/string.hxx>
#include <ooxml/resourceids.hxx>
-#include "dmapperLoggers.hxx"
namespace writerfilter {
namespace dmapper
@@ -481,7 +480,7 @@ void TextEffectsHandler::convertElementIdToPropertyId(sal_Int32 aElementId)
}
TextEffectsHandler::TextEffectsHandler(sal_uInt32 aElementId) :
- LoggedProperties(dmapper_logger, "TextEffectsHandler"),
+ LoggedProperties("TextEffectsHandler"),
mpGrabBagStack(nullptr)
{
convertElementIdToPropertyId(aElementId);
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx
index 83a4d98..9e4d8f7 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -19,7 +19,6 @@
#include <ThemeTable.hxx>
#include <ooxml/resourceids.hxx>
-#include "dmapperLoggers.hxx"
using namespace com::sun::star;
@@ -44,8 +43,8 @@ struct ThemeTable_Impl
};
ThemeTable::ThemeTable()
-: LoggedProperties(dmapper_logger, "ThemeTable")
-, LoggedTable(dmapper_logger, "ThemeTable")
+: LoggedProperties("ThemeTable")
+, LoggedTable("ThemeTable")
, m_pImpl( new ThemeTable_Impl )
{
@@ -81,7 +80,7 @@ void ThemeTable::lcl_attribute(Id Name, Value & val)
default:
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->element("unhandled");
+ TagLogger::getInstance().element("unhandled");
#endif
}
}
@@ -96,8 +95,8 @@ void ThemeTable::lcl_attribute(Id Name, Value & val)
void ThemeTable::lcl_sprm(Sprm& rSprm)
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("ThemeTable.sprm");
- dmapper_logger->chars(rSprm.toString());
+ TagLogger::getInstance().startElement("ThemeTable.sprm");
+ TagLogger::getInstance().chars(rSprm.toString());
#endif
m_pImpl->m_supplementalFontName.clear();
@@ -143,25 +142,25 @@ void ThemeTable::lcl_sprm(Sprm& rSprm)
default:
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->element("unhandled");
+ TagLogger::getInstance().element("unhandled");
#endif
}
}
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
void ThemeTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref)
{
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->startElement("ThemeTable.entry");
+ TagLogger::getInstance().startElement("ThemeTable.entry");
#endif
ref->resolve(*this);
#ifdef DEBUG_WRITERFILTER
- dmapper_logger->endElement();
+ TagLogger::getInstance().endElement();
#endif
}
diff --git a/writerfilter/source/dmapper/TrackChangesHandler.cxx b/writerfilter/source/dmapper/TrackChangesHandler.cxx
index 6f52e45..877c5d7 100644
--- a/writerfilter/source/dmapper/TrackChangesHandler.cxx
+++ b/writerfilter/source/dmapper/TrackChangesHandler.cxx
@@ -12,7 +12,6 @@
#include <ooxml/resourceids.hxx>
#include <oox/token/tokens.hxx>
#include <osl/diagnose.h>
-#include "dmapperLoggers.hxx"
namespace writerfilter {
namespace dmapper {
@@ -22,7 +21,7 @@ using namespace oox;
TrackChangesHandler::TrackChangesHandler( sal_Int32 nToken ) :
-LoggedProperties(dmapper_logger, "TrackChangesHandler")
+LoggedProperties("TrackChangesHandler")
{
m_pRedlineParams = RedlineParamsPtr( new RedlineParams() );
m_pRedlineParams->m_nToken = nToken;
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
index a962670..da66696 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
@@ -24,7 +24,6 @@
#include "ConversionHelper.hxx"
#include "WrapPolygonHandler.hxx"
-#include "dmapperLoggers.hxx"
#include "util.hxx"
namespace writerfilter {
@@ -131,7 +130,7 @@ drawing::PointSequenceSequence WrapPolygon::getPointSequenceSequence() const
}
WrapPolygonHandler::WrapPolygonHandler()
- : LoggedProperties(dmapper_logger, "WrapPolygonHandler")
+ : LoggedProperties("WrapPolygonHandler")
, mpPolygon(new WrapPolygon)
, mnX(0)
, mnY(0)
diff --git a/writerfilter/source/dmapper/dmapperLoggers.hxx b/writerfilter/source/dmapper/dmapperLoggers.hxx
deleted file mode 100644
index 5e774c9..0000000
--- a/writerfilter/source/dmapper/dmapperLoggers.hxx
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_DMAPPERLOGGERS_HXX
-#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_DMAPPERLOGGERS_HXX
-
-#include "TagLogger.hxx"
-
-namespace writerfilter {
- namespace dmapper {
- extern TagLogger::Pointer_t dmapper_logger;
- }
-}
-
-#endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_DMAPPERLOGGERS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/domainmapperfactory.cxx b/writerfilter/source/dmapper/domainmapperfactory.cxx
index 5159cfe..193ae20 100644
--- a/writerfilter/source/dmapper/domainmapperfactory.cxx
+++ b/writerfilter/source/dmapper/domainmapperfactory.cxx
@@ -27,10 +27,9 @@ Stream::Pointer_t DomainMapperFactory::createMapper(css::uno::Reference<css::uno
OUString sURL = rMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(), OUString());
::std::string sURLc = OUStringToOString(sURL, RTL_TEXTENCODING_ASCII_US).getStr();
- writerfilter::TagLogger::Pointer_t dmapper_logger(writerfilter::TagLogger::getInstance("DOMAINMAPPER"));
if (getenv("SW_DEBUG_WRITERFILTER"))
- dmapper_logger->setFileName(sURLc);
- dmapper_logger->startDocument();
+ TagLogger::getInstance().setFileName(sURLc);
+ TagLogger::getInstance().startDocument();
#endif
return Stream::Pointer_t(new DomainMapper(xContext, xInputStream, xModel, bRepairStorage, eDocumentType, xInsertTextRange, rMediaDesc));
More information about the Libreoffice-commits
mailing list