[Libreoffice-commits] .: fpicker/source

[David Tardon]

 fpicker/source/unx/gnome/SalGtkFilePicker.cxx |    4 ++--
 fpicker/source/unx/kde/kdecommandthread.cxx   |    4 +++-
 fpicker/source/unx/kde/kdefilepicker.cxx      |    4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 1d0d3b0485c729494cdf0f282b4771323e865288
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Feb 2 09:28:58 2011 +0100

    do not annoy with debug printouts on dbglevel=1

diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
index 068ead5..aebb2df 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
@@ -1847,7 +1847,7 @@ case_insensitive_filter (const GtkFileFilterInfo *filter_info, gpointer data)
     if( !g_ascii_strcasecmp( pFilter, pExtn ) )
         bRetval = TRUE;
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "'%s' match extn '%s' vs '%s' yeilds %d\n",
         filter_info->uri, pExtn, pFilter, bRetval );
 #endif
@@ -1893,7 +1893,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O
 
                 OSL_TRACE( "fustering with %s\n", rtl::OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ).getStr());
             }
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 0
             else
             {
                 g_warning( "Duff filter token '%s'\n", 
diff --git a/fpicker/source/unx/kde/kdecommandthread.cxx b/fpicker/source/unx/kde/kdecommandthread.cxx
index 499c3ad..b68ddb0 100644
--- a/fpicker/source/unx/kde/kdecommandthread.cxx
+++ b/fpicker/source/unx/kde/kdecommandthread.cxx
@@ -34,7 +34,9 @@
 
 #include <kapplication.h>
 
+#if OSL_DEBUG_LEVEL > 1
 #include <iostream>
+#endif
 
 //////////////////////////////////////////////////////////////////////////
 // CommandEvent
@@ -105,7 +107,7 @@ void KDECommandThread::handleCommand( const QString &rString, bool &bQuit )
 {
     QMutexLocker qMutexLocker( &m_aMutex );
 
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 1
     ::std::cerr << "kdefilepicker received: " << rString.latin1() << ::std::endl;
 #endif
 
diff --git a/fpicker/source/unx/kde/kdefilepicker.cxx b/fpicker/source/unx/kde/kdefilepicker.cxx
index 0af35dc..11593ab 100644
--- a/fpicker/source/unx/kde/kdefilepicker.cxx
+++ b/fpicker/source/unx/kde/kdefilepicker.cxx
@@ -56,7 +56,9 @@
 #include <ktempfile.h>
 
 #include <algorithm>
+#if OSL_DEBUG_LEVEL > 1
 #include <iostream>
+#endif
 
 //////////////////////////////////////////////////////////////////////////
 // KDEFileDialog
@@ -650,7 +652,7 @@ void KDEFileDialog::selectionChangedCommand()
 
 void KDEFileDialog::sendCommand( const QString &rCommand )
 {
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 1
     ::std::cerr << "kdefilepicker sent: " << rCommand.latin1() << ::std::endl;
 #endif