diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-17 08:10:02 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-17 08:10:02 +0200 |
commit | 3beae0f05d1c8c976dfcebe02c8830752d708c74 (patch) | |
tree | 49e3f42e46e75c46217b74184a7c2d5831e5953c /writerfilter/inc | |
parent | 585fea6e3e92a312921bb1bff119f731ca0e87cb (diff) |
DEBUG_DOMAINMAPPER -> DEBUG_WRITERFILTER
As it's used in the tokenizers as well.
Change-Id: I7a78cad0414c724f33b50315a45a5ff2c941f4db
Diffstat (limited to 'writerfilter/inc')
-rw-r--r-- | writerfilter/inc/resourcemodel/LoggedResources.hxx | 8 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/TableManager.hxx | 50 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/TagLogger.hxx | 6 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/WW8ResourceModel.hxx | 6 |
4 files changed, 35 insertions, 35 deletions
diff --git a/writerfilter/inc/resourcemodel/LoggedResources.hxx b/writerfilter/inc/resourcemodel/LoggedResources.hxx index a914ec361a04..ccb33635316a 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 02700d86362a..4b2a3d6387ce 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 37a90789761b..d693e9878d8f 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 730ae8b69489..e30a77117ef1 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 |