summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-12-29 22:15:05 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-01-05 09:18:17 +0000
commitf731dc1e3506c78918b0965d77c3f51eaaf752ad (patch)
tree6a2d02b161b85a0fc986df33d7d62e157dce7c75 /writerfilter
parent2669d048bc8c38f5b75cd0ecdde8d6ae326601eb (diff)
align ifdefs of usage and definitions
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/inc/resourcemodel/LoggedResources.hxx2
-rw-r--r--writerfilter/inc/resourcemodel/Protocol.hxx4
-rw-r--r--writerfilter/source/resourcemodel/LoggedResources.cxx4
-rw-r--r--writerfilter/source/resourcemodel/Protocol.cxx4
4 files changed, 4 insertions, 10 deletions
diff --git a/writerfilter/inc/resourcemodel/LoggedResources.hxx b/writerfilter/inc/resourcemodel/LoggedResources.hxx
index 16270ca987f9..ce7c0ec27247 100644
--- a/writerfilter/inc/resourcemodel/LoggedResources.hxx
+++ b/writerfilter/inc/resourcemodel/LoggedResources.hxx
@@ -51,8 +51,6 @@ public:
void attribute(const string & rName, const string & rValue);
void attribute(const string & rName, sal_uInt32 nValue);
- void setPrefix(const string & rPrefix);
-
private:
TagLogger::Pointer_t mpLogger;
string msPrefix;
diff --git a/writerfilter/inc/resourcemodel/Protocol.hxx b/writerfilter/inc/resourcemodel/Protocol.hxx
index e63ddfbd5963..a44020e1dee7 100644
--- a/writerfilter/inc/resourcemodel/Protocol.hxx
+++ b/writerfilter/inc/resourcemodel/Protocol.hxx
@@ -28,7 +28,7 @@
#ifndef INCLUDE_WRITERFILTER_PROTOCOL_HXX
#define INCLUDE_WRITERFILTER_PROTOCOL_HXX
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_PROTOCOL
#include <boost/shared_ptr.hpp>
#include "WW8ResourceModel.hxx"
@@ -96,7 +96,7 @@ public:
}
-#endif // DEBUG
+#endif // DEBUG_PROTOCOL
#endif // INCLUDE_WRITERFILTER_PROTOCOL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/resourcemodel/LoggedResources.cxx b/writerfilter/source/resourcemodel/LoggedResources.cxx
index 65c53b20ae98..40dfdd023cf0 100644
--- a/writerfilter/source/resourcemodel/LoggedResources.cxx
+++ b/writerfilter/source/resourcemodel/LoggedResources.cxx
@@ -75,10 +75,6 @@ void LoggedResourcesHelper::attribute(const string & rName, sal_uInt32 nValue)
mpLogger->attribute(rName, nValue);
}
-void LoggedResourcesHelper::setPrefix(const string & rPrefix)
-{
- msPrefix = rPrefix;
-}
#endif
// class: LoggedStream
diff --git a/writerfilter/source/resourcemodel/Protocol.cxx b/writerfilter/source/resourcemodel/Protocol.cxx
index 0d98b509143a..8aed6831250a 100644
--- a/writerfilter/source/resourcemodel/Protocol.cxx
+++ b/writerfilter/source/resourcemodel/Protocol.cxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_PROTOCOL
#include <stdio.h>
#include <rtl/ustrbuf.hxx>
#include <resourcemodel/Protocol.hxx>
@@ -213,6 +213,6 @@ void TableProtocol::entry(int pos,
}
}
-#endif // DEBUG
+#endif // DEBUG_PROTOCOL
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */