[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 3 commits - sw/inc sw/source
Thorsten Behrens
thorsten at kemper.freedesktop.org
Wed Nov 24 15:03:01 PST 2010
sw/inc/crsrsh.hxx | 2 +-
sw/source/core/crsr/crstrvl.cxx | 6 +++---
sw/source/core/text/inftxt.cxx | 2 +-
sw/source/core/text/inftxt.hxx | 2 +-
sw/source/core/text/txtfly.cxx | 2 +-
sw/source/filter/html/htmltabw.cxx | 2 +-
sw/source/ui/dbui/dbinsdlg.cxx | 2 +-
sw/source/ui/dbui/mmoutputpage.cxx | 2 +-
sw/source/ui/dialog/swdlgfact.cxx | 2 +-
sw/source/ui/docvw/srcedtw.cxx | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 228904385d4b23962361bbd2753a46256fba1ad9
Author: David Tardon <dtardon at redhat.com>
Date: Thu Nov 18 10:21:30 2010 +0100
replace DBG_UTIL -> OSL_DEBUG_LEVEL > 1
Breaks build when configured with both --enable-debug and
--enable-dbgutil and built with dbglevel=1 .
(cherry picked from commit c3d0c4ec39417cdb1f6d7e4e23d6cd79e16d8299)
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 3f75c21..831d3fd 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1360,7 +1360,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
if( !bRet && (
SwContentAtPos::SW_TABLEBOXFML & rCntntAtPos.eCntntAtPos
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
|| SwContentAtPos::SW_TABLEBOXVALUE & rCntntAtPos.eCntntAtPos
#endif
))
@@ -1406,7 +1406,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
// erzeuge aus der internen (fuer CORE)
// die externe (fuer UI) Formel
rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_TABLEBOXFML;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
if( RES_BOXATR_VALUE == pItem->Which() )
rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_TABLEBOXVALUE;
else
@@ -1440,7 +1440,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
}
}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
if( !bRet && SwContentAtPos::SW_CURR_ATTRS & rCntntAtPos.eCntntAtPos )
{
xub_StrLen n = aPos.nContent.GetIndex();
commit 9516ff4331f2c8349de55773279c4f218d533410
Author: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
Date: Tue Nov 16 16:46:13 2010 +0100
Fixed DBG_UTIL vs. OSL_DEBUG_LEVEL mixup.
(cherry picked from commit 9771daa4e13ceef4917fb230cd72a2aa098f1400)
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 698ce07..35d27e6 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 51c5975..a2c2360 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 c5c20a0..42ecb62 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 093adfd..6656e40 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 78e87c3..fd473ab 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 3ccb52e..06f3604 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 9661ab0..a089a21 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++ )
commit 2fe4ed26217dc3f02937d7b1edd9a58bc6167920
Author: David Tardon <dtardon at redhat.com>
Date: Tue Nov 16 10:51:51 2010 +0100
fixed DBG_UTIL vs. OSL_DEBUG_LEVEL mixup
(cherry picked from commit f19fb8630f6dbf4b525bdd4ba775f05bb9d7e1a0)
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index c6a1bdf..ec518d0 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -112,7 +112,7 @@ namespace numfunc
}
// <--
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
// Test2: WYSIWYG++
// Test4: WYSIWYG debug
static sal_Bool bDbgLow = sal_False;
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 662f9fb..b11c6c3 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -380,7 +380,7 @@ public:
{ return ( pKanaComp && nKanaIdx < pKanaComp->Count() )
? (*pKanaComp)[nKanaIdx] : 0; }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
sal_Bool IsOptCalm() const;
sal_Bool IsOptLow() const;
sal_Bool IsOptDbg() const;
More information about the Libreoffice-commits
mailing list