From e7fe6747c80e2038279586869e4f069adb25e975 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@novell.com>
Date: Sun, 7 Nov 2010 22:23:30 +0200
Subject: Fix compilation error caused by DBG_UTIL vs. OSL_DEBUG_LEVEL mixup

---
 sw/source/core/text/txtio.cxx | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'sw/source/core/text/txtio.cxx')

diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index d508199e0234..eaeefba1cb3b 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -287,9 +287,14 @@ SvStream &operator<<( SvStream &rOs, const SwpHints & ) //$ ostream
 
 sal_Bool IsDbg( const SwTxtFrm *pFrm )
 {
+// Hmm, so IsTest4 etc are defined only if OSL_DEBUG_LEVEL > 1,
+// but this file is compiled if DBG_UTIL is defined. So should the IsTest4 etc
+// then instead be conditional on DBG_UTIL? Such crack.
+#if OSL_DEBUG_LEVEL > 1
     if( pFrm && pFrm->GetShell() )
         return pFrm->GetShell()->GetViewOptions()->IsTest4();
     else
+#else
         return sal_False;
 }
 
-- 
cgit v1.2.3