diff options
| author | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2010-11-16 16:46:13 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2010-11-24 22:31:41 +0100 |
| commit | f02373e947d6e22c15b1ed0972f6dbbe9610f690 (patch) | |
| tree | dae7b95f17564e49234a44f7d2cb3ae69615c4f7 | |
| parent | db8718b9f5768608e567d84d801ed100cf2630c8 (diff) | |
Fixed DBG_UTIL vs. OSL_DEBUG_LEVEL mixup.
(cherry picked from commit 9771daa4e13ceef4917fb230cd72a2aa098f1400)
| -rw-r--r-- | sw/inc/crsrsh.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/txtfly.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/html/htmltabw.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dbui/dbinsdlg.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmoutputpage.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/docvw/srcedtw.cxx | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 307b353979e2..705450446a53 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -112,7 +112,7 @@ struct SwContentAtPos SW_CONTENT_CHECK = 0x0400, // #i43742# SW_SMARTTAG = 0x0800, SW_FORMCTRL = 0x1000 -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 ,SW_CURR_ATTRS = 0x4000 // only for debugging ,SW_TABLEBOXVALUE = 0x8000 // only for debugging #endif diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index e06a942551e9..0efab8ca4879 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -82,7 +82,7 @@ #include <svx/svdoedge.hxx> #include "doc.hxx" -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 #include "viewopt.hxx" // SwViewOptions, nur zum Testen (Test2) #endif diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 4ea8dea98e6d..a34843835e0d 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -63,7 +63,7 @@ #include <htmlnum.hxx> #include <wrthtml.hxx> #include <wrtswtbl.hxx> -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 #include <viewsh.hxx> #include <viewopt.hxx> #endif diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 1dad568b16b0..0be0c4e21f2c 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -1181,7 +1181,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, } } catch(Exception& -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 aExcept #endif ) diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index b3b65e6eb25c..ac13484457bc 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -1219,7 +1219,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) } xTempDocShell->DoClose(); -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 sal_Int32 nTarget = #endif rConfigItem.MoveResultSet(rInfo.nDBRow); diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index ad74b08ce44b..50b2677601f4 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -583,7 +583,7 @@ long AbstractMailMergeWizard_Impl::GetResult() return pDlg->GetResult(); } -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 IMPL_LINK( AbstractMailMergeWizard_Impl, EndDialogHdl, SwMailMergeWizard*, pDialog ) #else IMPL_LINK( AbstractMailMergeWizard_Impl, EndDialogHdl, SwMailMergeWizard*, EMPTYARG ) diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index 9b414a528464..d1e097d2d63c 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -763,7 +763,7 @@ void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff ) // optimiert das die TextEngine. USHORT nLastEnd = 0; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 USHORT nLine = aPortionList[0].nLine; #endif for ( USHORT i = 0; i < nCount; i++ ) |