align ifdefs of usage and definitions

5 files changed, 4 insertions, 14 deletions

diff --git a/unusedcode.easy b/unusedcode.easy
index 09838208bda1..4ffc46e83dc0 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2019,7 +2019,3 @@ vcl::PDFWriterImpl::drawPolyPolygon(PolyPolygon const&, int, bool)
 vcl::unx::GtkPrintWrapper::print_operation_set_has_selection(_GtkPrintOperation*, int) const
 vcl::unx::GtkPrintWrapper::print_operation_set_support_selection(_GtkPrintOperation*, int) const
 void ScCompressedArrayIterator<int, unsigned short>::Follow<unsigned char>(ScCompressedArrayIterator<int, unsigned char> const&)
-writerfilter::LoggedResourcesHelper::setPrefix(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
-writerfilter::PropertiesProtocol::PropertiesProtocol(writerfilter::Properties*, boost::shared_ptr<writerfilter::TagLogger>)
-writerfilter::StreamProtocol::StreamProtocol(writerfilter::Stream*, boost::shared_ptr<writerfilter::TagLogger>)
-writerfilter::TableProtocol::TableProtocol(writerfilter::Table*, boost::shared_ptr<writerfilter::TagLogger>)
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: */