[Libreoffice-commits] .: Branch 'integration/dev300_m106' - 2 commits - vcl/source

[David Tardon]

 vcl/source/app/dbggui.cxx    |    2 --
 vcl/source/window/window.cxx |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit bd1736a71cdf20dc7bf734fb08212dab543072fb
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 26 07:26:45 2011 +0200

    DBG_UTIL -> OSL_DEBUG_LEVEL

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 8ca2358..680783e 100755
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4382,7 +4382,7 @@ Window::~Window()
     if ( pSVData->maWinData.mpDefDialogParent == this )
         pSVData->maWinData.mpDefDialogParent = NULL;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
     if ( sal_True ) // always perform these tests in non-pro versions
     {
         ByteString  aErrorStr;
commit 7299289852920f3e23b22f386afc649b658ee466
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 26 07:24:31 2011 +0200

    vos is dead

diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index a8065b6..c87d735 100755
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -40,8 +40,6 @@
 
 #include "tools/debug.hxx"
 
-#include "vos/mutex.hxx"
-
 #include "vcl/svapp.hxx"
 #include "vcl/event.hxx"
 #include "vcl/lstbox.hxx"