[Libreoffice-commits] core.git: dbaccess/source

[Tor Lillqvist]

 dbaccess/source/core/recovery/dbdocrecovery.cxx |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 5907bb462de34e9cc59c178350bf9153c42d038a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Apr 25 13:53:54 2013 +0300

    Fix compilation error when OSL_DEBUG_LEVEL > 0
    
    Just use SAL_WARN, building up the message using chained << operators instead
    of constructing it into a OStringBuffer (or OUStringBuffer) and then passing
    that to OSL_FAIL.
    
    Or should we have a real assert() here?
    
    Change-Id: I2c3f64ff2b29a3d81ba444d98c2a38ef49e6d7af

diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index d5b605f..45a09f7 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -373,15 +373,12 @@ namespace dbaccess
                 const OUString sComponentName( stor->second.sName );
                 if ( !xComponentsStor->hasByName( stor->first ) )
                 {
-                #if OSL_DEBUG_LEVEL > 0
-                    OStringBuffer message;
-                    message.append( "DatabaseDocumentRecovery::recoverSubDocuments: inconsistent recovery storage: storage '" );
-                    message.append( OUStringToOString( stor->first, RTL_TEXTENCODING_ASCII_US ) );
-                    message.append( "' not found in '" );
-                    message.append( OUStringToOString( SubComponentRecovery::getComponentsStorageName( eComponentType ), RTL_TEXTENCODING_ASCII_US ) );
-                    message.append( "', but required per map file!" );
-                    OSL_FAIL( message.getStr() );
-                #endif
+                    SAL_WARN( "dbaccess",
+                              "DatabaseDocumentRecovery::recoverSubDocuments: inconsistent recovery storage: storage '" <<
+                              stor->first <<
+                              "' not found in '" <<
+                              SubComponentRecovery::getComponentsStorageName( eComponentType ) <<
+                              "', but required per map file!" );
                     continue;
                 }