[Libreoffice-commits] .: writerfilter/inc writerfilter/source

Thorsten Behrens thorsten at kemper.freedesktop.org
Tue Nov 23 12:28:05 PST 2010 

 writerfilter/inc/resourcemodel/Protocol.hxx           |    2 +-
 writerfilter/inc/resourcemodel/TagLogger.hxx          |    2 +-
 writerfilter/inc/resourcemodel/util.hxx               |    2 +-
 writerfilter/source/dmapper/PropertyMapHelper.cxx     |    2 +-
 writerfilter/source/dmapper/PropertyMapHelper.hxx     |    2 +-
 writerfilter/source/dmapper/dmapperLoggers.hxx        |    2 +-
 writerfilter/source/doctok/WW8DocumentImpl.cxx        |    2 +-
 writerfilter/source/doctok/WW8StreamImpl.cxx          |    2 +-
 writerfilter/source/doctok/doctokLoggers.hxx          |    2 +-
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx       |    2 +-
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |    6 +++---
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |    4 ++--
 writerfilter/source/ooxml/OOXMLParserState.cxx        |    2 +-
 writerfilter/source/ooxml/OOXMLParserState.hxx        |    4 ++--
 writerfilter/source/ooxml/ooxmlLoggers.hxx            |    2 +-
 writerfilter/source/resourcemodel/Protocol.cxx        |    2 +-
 writerfilter/source/resourcemodel/TagLogger.cxx       |    2 +-
 writerfilter/source/resourcemodel/util.cxx            |    2 +-
 18 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit d233deac640bdc079580c5b54fc93f2156658dc1
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Tue Nov 23 21:26:02 2010 +0100

    Coherent use of debug level for writerfilter diagnostics
    
    This amends commit 130d4a6ed54e55e3263e23288590e933425899a7, in that
    it uses the same debug level check to enable writerfilter debugging
    facilities.

diff --git a/writerfilter/inc/resourcemodel/Protocol.hxx b/writerfilter/inc/resourcemodel/Protocol.hxx
index 2b864b6..e084f7a 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 913bf2d..40444bc 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 2aee5a4..cab0b17 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 a4471c7..f559661 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 3c51ee3..f9bbb9b 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 0268c75..42a036b 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 08a3efe..0435593 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 7dc47a1..6045f56 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 4c7cf62..09cff5f 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 c5a7a2a..76a3ae5 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 1a141a2..660d909 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 81da008..f495fd5 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 d4caf5e..c343d3e 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 6b29119..e0516c0 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 dc09048..f6340d5 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 280fca4..8f7083e 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 650296c..af44ee2 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 1ab729f..85c08a9 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;

More information about the Libreoffice-commits mailing list