diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-25 13:53:54 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-25 13:53:54 +0300 |
| commit | 5907bb462de34e9cc59c178350bf9153c42d038a (patch) | |
| tree | a68eeaec0a7cbc7884fda2f32ea74329f182a075 /dbaccess | |
| parent | 82798d640347753e5b6dca0e3221b6b1b8e44fee (diff) | |
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
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/recovery/dbdocrecovery.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index d5b605f3ff5e..45a09f76692c 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; } |