I don't need to hear about your every little titchy success

6 files changed, 27 insertions, 27 deletions

diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx
index 411fef5095c7..f733cf0ea22a 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -45,7 +45,7 @@ ContentProvider::queryContent(
     throw( com::sun::star::ucb::IllegalIdentifierException,
            uno::RuntimeException )
 {
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     fprintf(stderr, "QueryContent: '%s'\n",
        rtl::OUStringToOString
        (Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr());
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index fab393ee9547..4303c59a9baf 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -98,7 +98,7 @@ Content::Content(
     : ContentImplHelper( rxSMgr, pProvider, Identifier ),
       m_pProvider( pProvider ), mpFile (NULL), mpInfo( NULL ), mbTransient(false)
 {
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     fprintf(stderr, "New Content ('%s')\n", rtl::OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr());
 #endif
 }
@@ -112,7 +112,7 @@ Content::Content(
     : ContentImplHelper( rxSMgr, pProvider, Identifier ),
       m_pProvider( pProvider ), mpFile (NULL), mpInfo( NULL ), mbTransient(true)
 {
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     fprintf(stderr, "Create Content ('%s')\n", rtl::OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr());
 #endif
     mpInfo = g_file_info_new();
@@ -658,7 +658,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
     for ( sal_Int32 n = 0; n < nCount; ++n )
     {
         const beans::PropertyValue& rValue = pValues[ n ];
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
         g_warning("Set prop '%s'", rtl::OUStringToOString(rValue.Name, RTL_TEXTENCODING_UTF8).getStr());
 #endif
         if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) ||
@@ -696,7 +696,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
             if (!newName || !oldName || strcmp(newName, oldName))
             {
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
                 g_warning ("Set new name to '%s'", newName);
 #endif
 
@@ -910,7 +910,7 @@ uno::Any SAL_CALL Content::execute(
            ucb::CommandAbortedException,
            uno::RuntimeException )
 {
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     fprintf(stderr, "Content::execute %s\n", rtl::OUStringToOString(aCommand.Name, RTL_TEXTENCODING_UTF8).getStr());
 #endif
     uno::Any aRet;
@@ -1029,7 +1029,7 @@ void Content::insert(const uno::Reference< io::XInputStream > &xInputStream,
          g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_TYPE) &&
          g_file_info_get_file_type(pInfo) == G_FILE_TYPE_DIRECTORY )
     {
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
         g_warning ("Make directory");
 #endif
         if( !g_file_make_directory( getGFile(), NULL, &pError))
@@ -1155,7 +1155,7 @@ uno::Reference< ucb::XContent >
         return uno::Reference< ucb::XContent >();
     }
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     g_warning( "createNewContent (%d)", (int) create_document );
 #endif
 
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index d8a63825f3ec..62e8d986fd20 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -45,7 +45,7 @@ ContentProvider::queryContent(
     throw( com::sun::star::ucb::IllegalIdentifierException,
            uno::RuntimeException )
 {
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     fprintf(stderr, "QueryContent: '%s'",
        rtl::OUStringToOString
        (Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr());
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index e787f3732799..7a9e02edd9e6 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -127,7 +127,7 @@ Content::Content(
       m_bTransient( sal_False )
 {
     CLEAR_INFO (&m_info);
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     g_warning ("New Content ('%s')", getURI());
 #endif
 }
@@ -144,7 +144,7 @@ Content::Content(
 {
     CLEAR_INFO (&m_info);
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     g_warning ("New Transient content ('%s') (%d)", getURI(), IsFolder);
 #endif
 //  m_info.name = FIXME: set name ?
@@ -298,7 +298,7 @@ uno::Any SAL_CALL Content::execute(
 {
     uno::Any aRet;
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     {
         uno::Reference< task::XInteractionHandler > xIH;
 
@@ -510,7 +510,7 @@ Content::createNewContent( const ucb::ContentInfo& Info )
         return uno::Reference< ucb::XContent >();
     }
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     g_warning( "createNewContent (%d)", (int) create_document );
 #endif
 
@@ -558,7 +558,7 @@ rtl::OUString Content::getParentURL()
     if ( nPos1 != -1 )
         aParentURL = rtl::OUString( aURL.copy( 0, nPos + 1 ) );
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     g_warning ("getParentURL '%s' -> '%s'",
            getURI(), rtl::OUStringToOString
                ( aParentURL, RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -694,7 +694,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             xRow->appendVoid( rProp );
         }
     }
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     g_warning ("getPropertyValues on '%s' %d properties returned (of %d)",
            getURI(), 0, (int)nProps);
 #endif
@@ -795,7 +795,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
     for ( sal_Int32 n = 0; n < nCount; ++n ) {
         const beans::PropertyValue& rValue = pValues[ n ];
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
         g_warning( "Set prop '%s'", OUStringToGnome( rValue.Name ) );
 #endif
         if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) ||
@@ -816,7 +816,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                     char *newName = OUStringToGnome( aNewTitle );
 
                     if( !newName || !m_info.name || strcmp( newName, m_info.name ) ) {
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
                         g_warning ("Set new name to '%s'", newName);
 #endif
 
@@ -936,7 +936,7 @@ void Content::insert(
 {
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     g_warning( "Insert '%s' (%d) (0x%x:%d)", getURI(), bReplaceExisting,
            m_info.valid_fields, m_info.type );
 #endif
@@ -961,7 +961,7 @@ void Content::insert(
              GNOME_VFS_PERM_GROUP_READ |
              GNOME_VFS_PERM_OTHER_READ );
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
         g_warning ("Make directory");
 #endif
         result = gnome_vfs_make_directory( aURI.getStr(), perm );
@@ -1073,7 +1073,7 @@ sal_Bool Content::exchangeIdentity(
 
     uno::Reference< ucb::XContent > xThis = this;
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     g_warning( "exchangeIdentity from '%s' to '%s'",
            getURI(), OUStringToGnome( xNewId->getContentIdentifier() ) );
 #endif
@@ -1144,7 +1144,7 @@ Content::getInfo( const uno::Reference< ucb::XCommandEnvironment >& xEnv )
             gnome_vfs_file_info_clear( &m_info );
     } else
         result = GNOME_VFS_OK;
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     g_warning( "getInfo on '%s' returns '%s' (%d) (0x%x)",
            getURI(), gnome_vfs_result_to_string( result ),
            result, m_info.valid_fields );
@@ -1168,7 +1168,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite
     rtl::OUString message;
     uno::Sequence< uno::Any > aArgs( 1 );
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     g_warning ("Map VFS exception '%s' (%d)",
            gnome_vfs_result_to_string( result ), result );
 #endif
@@ -1556,7 +1556,7 @@ extern "C" {
     {
         task::XInteractionHandler *xIH;
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
         g_warning ("Full authentication callback (%p) ...", callback_data);
 #endif
 
@@ -1572,7 +1572,7 @@ extern "C" {
         g_return_if_fail (sizeof (GnomeVFSModuleCallbackFullAuthenticationIn) == in_size &&
                   sizeof (GnomeVFSModuleCallbackFullAuthenticationOut) == out_size);
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 #  define NNIL(x) (x?x:"<Null>")
         g_warning (" InComing data 0x%x uri '%s' prot '%s' server '%s' object '%s' "
                    "port %d auth_t '%s' user '%s' domain '%s' "
@@ -1668,7 +1668,7 @@ extern "C" {
                 out->password = OUStringToGnome( aPassword );
                 out->save_password = xSupp->getRememberPasswordMode();
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
                 g_warning ("Got valid user/domain/password '%s' '%s' '%s', %s password",
                            out->username, out->domain, out->password,
                            out->save_password ? "save" : "don't save");
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.cxx b/ucb/source/ucp/gvfs/gvfs_directory.cxx
index d0a403d86bc6..55be8079eebe 100644
--- a/ucb/source/ucp/gvfs/gvfs_directory.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_directory.cxx
@@ -389,7 +389,7 @@ sal_Bool DataSupplier::getData()
 
         gnome_vfs_file_info_unref (fileInfo);
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
         g_warning ("Got %d directory entries", result);
 #endif
 
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx
index 9098a95ad424..6a1dc7881e1a 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx
@@ -111,7 +111,7 @@ ContentProvider::queryContent(
     throw( com::sun::star::ucb::IllegalIdentifierException,
            uno::RuntimeException )
 {
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     g_warning ("QueryContent: '%s'",
                rtl::OUStringToOString (Identifier->getContentIdentifier(),
                                        RTL_TEXTENCODING_UTF8).getStr() );