[Libreoffice-commits] .: vcl/source

[Thorsten Behrens]

 vcl/source/app/dbggui.cxx    |    3 +--
 vcl/source/window/window.cxx |    8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit ed8a7876a2d5c2dfdc9646a39d2070978deef846
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri May 27 23:33:43 2011 +0200

    Fix dbgutil build after m106 merge

diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 441f7be..aff2afd 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"
@@ -1976,6 +1974,7 @@ void DbgAbort( char const * i_message )
 void ImplDbgTestSolarMutex()
 {
     bool bCheck = ImplGetSVData()->mpDefInst->CheckYieldMutex();
+    (void)bCheck;
     OSL_ENSURE( bCheck, "SolarMutex not locked" );
 }
 
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 2d6f54d..25c257e 100755
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -529,7 +529,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl
         rSettings.SetStyleSettings( aStyleSettings );
     }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
     // Evt. AppFont auf Fett schalten, damit man feststellen kann,
     // ob fuer die Texte auf anderen Systemen genuegend Platz
     // vorhanden ist
@@ -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;
@@ -4525,7 +4525,7 @@ Window::~Window()
     {
         // #122232#, this must not happen and is an application bug ! but we try some cleanup to hopefully avoid crashes, see below
         bHasFocussedChild = sal_True;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
         ByteString aTempStr( "Window (" );
         aTempStr += ByteString( GetText(), RTL_TEXTENCODING_UTF8 );
         aTempStr += ") with focussed child window destroyed ! THIS WILL LEAD TO CRASHES AND MUST BE FIXED !";
@@ -6478,7 +6478,7 @@ void Window::Show( sal_Bool bVisible, sal_uInt16 nFlags )
         if( aDogTag.IsDelete() )
             return;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
         if ( IsDialog() || (GetType() == WINDOW_TABPAGE) || (GetType() == WINDOW_DOCKINGWINDOW) )
         {
             DBG_DIALOGTEST( this );