From faa8aa1e7278231887b60df9a302f5f3d0819f32 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Mon, 20 May 2019 20:19:33 +0300
Subject: Use DBG_UTIL instead of OSL_DEBUG_LEVEL for the OOX dumping stuff

We want it to be possible to compile an arbitrary subset of the source
files for debugging. DBG_UTIL, on the other hand, has to be consistent
across the whole build. We should not use OSL_DEBUG_LEVEL to switch
(internal) API on/off.

Change-Id: Ia5111a36326ad7ad4c72d9e8f7ad88c8dbe8e272
Reviewed-on: https://gerrit.libreoffice.org/72616
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
---
 include/oox/dump/dffdumper.hxx  | 2 +-
 include/oox/dump/dumperbase.hxx | 8 +++-----
 include/oox/dump/oledumper.hxx  | 2 +-
 include/oox/dump/pptxdumper.hxx | 2 +-
 include/oox/dump/xlsbdumper.hxx | 2 +-
 oox/source/dump/dffdumper.cxx   | 2 +-
 oox/source/dump/dumperbase.cxx  | 2 +-
 oox/source/dump/oledumper.cxx   | 2 +-
 oox/source/dump/pptxdumper.cxx  | 2 +-
 9 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx
index 19d69bb6fd9a..632650d466a1 100644
--- a/include/oox/dump/dffdumper.hxx
+++ b/include/oox/dump/dffdumper.hxx
@@ -23,7 +23,7 @@
 #include <oox/dump/dumperbase.hxx>
 #include <sal/types.h>
 
-#if OOX_INCLUDE_DUMPER
+#ifdef DBG_UTIL
 
 namespace oox { class BinaryInputStream; }
 
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 5445be3761cf..32dea6fca6f3 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -40,9 +40,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <sal/types.h>
 
-#define OOX_INCLUDE_DUMPER (OSL_DEBUG_LEVEL > 0)
-
-#if OOX_INCLUDE_DUMPER
+#ifdef DBG_UTIL
 
 namespace com { namespace sun { namespace star {
     namespace io { class XInputStream; }
@@ -1733,11 +1731,11 @@ do {                                                \
         return aDumper.isValid();                   \
 } while( false )
 
-#else   // OOX_INCLUDE_DUMPER
+#else   // DBG_UTIL
 
 #define OOX_DUMP_FILE( DumperClassName ) (void)0
 
-#endif  // OOX_INCLUDE_DUMPER
+#endif  // DBG_UTIL
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx
index a5349252c39c..6fdcc2ba5bd2 100644
--- a/include/oox/dump/oledumper.hxx
+++ b/include/oox/dump/oledumper.hxx
@@ -32,7 +32,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-#if OOX_INCLUDE_DUMPER
+#ifdef DBG_UTIL
 
 namespace com { namespace sun { namespace star {
     namespace io { class XInputStream; }
diff --git a/include/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx
index 0660447da84a..158834077dc0 100644
--- a/include/oox/dump/pptxdumper.hxx
+++ b/include/oox/dump/pptxdumper.hxx
@@ -24,7 +24,7 @@
 #include <oox/dump/dumperbase.hxx>
 #include <rtl/ustring.hxx>
 
-#if OOX_INCLUDE_DUMPER
+#ifdef DBG_UTIL
 
 namespace com { namespace sun { namespace star {
     namespace io { class XInputStream; }
diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx
index f031aef54b52..5992e879de5e 100644
--- a/include/oox/dump/xlsbdumper.hxx
+++ b/include/oox/dump/xlsbdumper.hxx
@@ -27,7 +27,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-#if OOX_INCLUDE_DUMPER
+#ifdef DBG_UTIL
 
 namespace com { namespace sun { namespace star {
     namespace io { class XInputStream; }
diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx
index 9fe67ca16671..6c03e14bb7f8 100644
--- a/oox/source/dump/dffdumper.cxx
+++ b/oox/source/dump/dffdumper.cxx
@@ -19,7 +19,7 @@
 
 #include <oox/dump/dffdumper.hxx>
 
-#if OOX_INCLUDE_DUMPER
+#ifdef DBG_UTIL
 
 namespace oox {
 namespace dump {
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 77b964b43b1e..c1a5f04b4035 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -34,7 +34,7 @@
 #include <oox/helper/textinputstream.hxx>
 #include <tools/time.hxx>
 
-#if OOX_INCLUDE_DUMPER
+#ifdef DBG_UTIL
 
 namespace oox {
 namespace dump {
diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx
index aebb5ac681c3..76b4ce61088d 100644
--- a/oox/source/dump/oledumper.cxx
+++ b/oox/source/dump/oledumper.cxx
@@ -29,7 +29,7 @@
 #include <oox/ole/olestorage.hxx>
 #include <oox/ole/vbainputstream.hxx>
 
-#if OOX_INCLUDE_DUMPER
+#ifdef DBG_UTIL
 
 namespace oox {
 namespace dump {
diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx
index 3962a5e1f195..df9555f235e8 100644
--- a/oox/source/dump/pptxdumper.cxx
+++ b/oox/source/dump/pptxdumper.cxx
@@ -24,7 +24,7 @@
 #include <oox/helper/zipstorage.hxx>
 #include <oox/ole/olestorage.hxx>
 
-#if OOX_INCLUDE_DUMPER
+#ifdef DBG_UTIL
 
 namespace oox {
 namespace dump {
-- 
cgit