diff options
18 files changed, 22 insertions, 22 deletions
diff --git a/writerfilter/inc/resourcemodel/Protocol.hxx b/writerfilter/inc/resourcemodel/Protocol.hxx index 8405892fd2a4..df2c98592cf3 100644 --- a/writerfilter/inc/resourcemodel/Protocol.hxx +++ b/writerfilter/inc/resourcemodel/Protocol.hxx @@ -31,7 +31,7 @@ #ifndef INCLUDE_WRITERFILTER_PROTOCOL_HXX #define INCLUDE_WRITERFILTER_PROTOCOL_HXX -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 #include <boost/shared_ptr.hpp> #include "WW8ResourceModel.hxx" diff --git a/writerfilter/inc/resourcemodel/TagLogger.hxx b/writerfilter/inc/resourcemodel/TagLogger.hxx index 5735269bee25..4101503b02e7 100644 --- a/writerfilter/inc/resourcemodel/TagLogger.hxx +++ b/writerfilter/inc/resourcemodel/TagLogger.hxx @@ -29,7 +29,7 @@ #ifndef INCLUDED_TAG_LOGGER_HXX #define INCLUDED_TAG_LOGGER_HXX -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 #include <rtl/ustring.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/writerfilter/inc/resourcemodel/util.hxx b/writerfilter/inc/resourcemodel/util.hxx index 5a0ce69790c6..be7dae0150a7 100644 --- a/writerfilter/inc/resourcemodel/util.hxx +++ b/writerfilter/inc/resourcemodel/util.hxx @@ -40,7 +40,7 @@ namespace writerfilter string WRITERFILTER_DLLPUBLIC xmlify(const string & str); -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 string WRITERFILTER_DLLPUBLIC propertysetToString (uno::Reference<beans::XPropertySet> const & rProps); diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx index 9aab90f6f197..1392b299d2b6 100644 --- a/writerfilter/source/dmapper/PropertyMapHelper.cxx +++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx @@ -33,7 +33,7 @@ #include <resourcemodel/TagLogger.hxx> #include "PropertyMapHelper.hxx" -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 namespace writerfilter { namespace dmapper diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/writerfilter/source/dmapper/PropertyMapHelper.hxx index 039a8da5df57..ba568caaf97d 100644 --- a/writerfilter/source/dmapper/PropertyMapHelper.hxx +++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx @@ -29,7 +29,7 @@ * ************************************************************************/ -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 #include "PropertyMap.hxx" #include <com/sun/star/beans/PropertyValues.hpp> diff --git a/writerfilter/source/dmapper/dmapperLoggers.hxx b/writerfilter/source/dmapper/dmapperLoggers.hxx index a053c413fae5..e9d4cf958a9f 100644 --- a/writerfilter/source/dmapper/dmapperLoggers.hxx +++ b/writerfilter/source/dmapper/dmapperLoggers.hxx @@ -32,7 +32,7 @@ #ifndef INCLUDED_DMAPPER_LOGGERS_HXX #define INCLUDED_DMAPPER_LOGGERS_HXX -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 #include <resourcemodel/TagLogger.hxx> namespace writerfilter { diff --git a/writerfilter/source/doctok/WW8DocumentImpl.cxx b/writerfilter/source/doctok/WW8DocumentImpl.cxx index 92b20f688920..4815fb83ade9 100644 --- a/writerfilter/source/doctok/WW8DocumentImpl.cxx +++ b/writerfilter/source/doctok/WW8DocumentImpl.cxx @@ -158,7 +158,7 @@ WW8Document::~WW8Document() { } -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 class WW8IdToString : public IdToString { public: diff --git a/writerfilter/source/doctok/WW8StreamImpl.cxx b/writerfilter/source/doctok/WW8StreamImpl.cxx index e60426f522c3..3f93477f206f 100644 --- a/writerfilter/source/doctok/WW8StreamImpl.cxx +++ b/writerfilter/source/doctok/WW8StreamImpl.cxx @@ -40,7 +40,7 @@ namespace doctok { using namespace ::com::sun::star; -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 TagLogger::Pointer_t debug_logger(TagLogger::getInstance("DEBUG")); #endif diff --git a/writerfilter/source/doctok/doctokLoggers.hxx b/writerfilter/source/doctok/doctokLoggers.hxx index bc39e077a5fd..aa3823dea67f 100644 --- a/writerfilter/source/doctok/doctokLoggers.hxx +++ b/writerfilter/source/doctok/doctokLoggers.hxx @@ -29,7 +29,7 @@ #ifndef INCLUDED_DOCTOK_LOGGERS_HXX #define INCLUDED_DOCTOK_LOGGERS_HXX -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 #include <resourcemodel/TagLogger.hxx> diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index 5de0f0e34421..d07410793348 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -44,7 +44,7 @@ namespace writerfilter { namespace ooxml { -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 TagLogger::Pointer_t debug_logger(TagLogger::getInstance("DEBUG")); #endif diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 491c98224f73..063154b2d3cd 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -101,7 +101,7 @@ static string resourceToString set<OOXMLFastContextHandler *> aSetContexts; -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 class OOXMLIdToString : public IdToString { public: @@ -435,7 +435,7 @@ void OOXMLFastContextHandler::lcl_endAction(Token_t Element) OOXMLFactory::getInstance()->endAction(this, Element); } -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 XMLTag::Pointer_t OOXMLFastContextHandler::toPropertiesTag (OOXMLPropertySet::Pointer_t pProps) { @@ -1360,7 +1360,7 @@ OOXMLValue::Pointer_t OOXMLFastContextHandlerProperties::getValue() const return OOXMLValue::Pointer_t(new OOXMLPropertySetValue(mpPropertySet)); } -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 XMLTag::Pointer_t OOXMLFastContextHandlerProperties::toTag() const { XMLTag::Pointer_t pTag(OOXMLFastContextHandler::toTag()); diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index a92b0e80bb43..e6a1d0abae93 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -225,7 +225,7 @@ public: void sendPropertyToParent(); -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 static XMLTag::Pointer_t toPropertiesTag(OOXMLPropertySet::Pointer_t); virtual XMLTag::Pointer_t toTag() const; virtual string toString() const; @@ -344,7 +344,7 @@ public: virtual void setPropertySet(OOXMLPropertySet::Pointer_t pPropertySet); virtual OOXMLPropertySet::Pointer_t getPropertySet() const; -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 virtual XMLTag::Pointer_t toTag() const; #endif diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx index f2d8a004dd92..fd2bb82fcabf 100644 --- a/writerfilter/source/ooxml/OOXMLParserState.cxx +++ b/writerfilter/source/ooxml/OOXMLParserState.cxx @@ -275,7 +275,7 @@ void OOXMLParserState::incContextCount() mnContexts++; } -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 unsigned int OOXMLParserState::getContextCount() const { return mnContexts; diff --git a/writerfilter/source/ooxml/OOXMLParserState.hxx b/writerfilter/source/ooxml/OOXMLParserState.hxx index 3245ac0f2eda..c265902701fe 100644 --- a/writerfilter/source/ooxml/OOXMLParserState.hxx +++ b/writerfilter/source/ooxml/OOXMLParserState.hxx @@ -32,7 +32,7 @@ #include <ooxml/OOXMLDocument.hxx> #include "OOXMLPropertySetImpl.hxx" -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 #include <resourcemodel/TagLogger.hxx> #endif @@ -105,7 +105,7 @@ public: void incContextCount(); -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 public: unsigned int getContextCount() const; string toString() const; diff --git a/writerfilter/source/ooxml/ooxmlLoggers.hxx b/writerfilter/source/ooxml/ooxmlLoggers.hxx index 67c8d606a5da..1b5d2ef2deca 100644 --- a/writerfilter/source/ooxml/ooxmlLoggers.hxx +++ b/writerfilter/source/ooxml/ooxmlLoggers.hxx @@ -29,7 +29,7 @@ #ifndef INCLUDED_OOXML_LOGGERS_HXX #define INCLUDED_OOXML_LOGGERS_HXX -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 #include <resourcemodel/TagLogger.hxx> diff --git a/writerfilter/source/resourcemodel/Protocol.cxx b/writerfilter/source/resourcemodel/Protocol.cxx index 8bbe9f83c785..5b0fe65e877f 100644 --- a/writerfilter/source/resourcemodel/Protocol.cxx +++ b/writerfilter/source/resourcemodel/Protocol.cxx @@ -29,7 +29,7 @@ * ************************************************************************/ -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 #include <stdio.h> #include <rtl/ustrbuf.hxx> #include <resourcemodel/Protocol.hxx> diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx index 7c6d081a4dda..594e0ae579f9 100644 --- a/writerfilter/source/resourcemodel/TagLogger.cxx +++ b/writerfilter/source/resourcemodel/TagLogger.cxx @@ -26,7 +26,7 @@ * ************************************************************************/ -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 #include <fstream> #include <string.h> #include <resourcemodel/TagLogger.hxx> diff --git a/writerfilter/source/resourcemodel/util.cxx b/writerfilter/source/resourcemodel/util.cxx index e69bb27e3d4d..f36a5797920c 100644 --- a/writerfilter/source/resourcemodel/util.cxx +++ b/writerfilter/source/resourcemodel/util.cxx @@ -95,7 +95,7 @@ void logger(string prefix, string message) return result; } -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 string propertysetToString(uno::Reference<beans::XPropertySet> const & xPropSet) { string sResult; |