diff options
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/ww8/sortedarray.hxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 5 | ||||
| -rw-r--r-- | sw/source/filter/xml/swxml.cxx | 36 |
3 files changed, 7 insertions, 36 deletions
diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx index 8038ad8a5344..7efec13aa9ff 100644 --- a/sw/source/filter/ww8/sortedarray.hxx +++ b/sw/source/filter/ww8/sortedarray.hxx @@ -95,7 +95,7 @@ namespace ww } if (bBroken) { - OSL_FAIL( OUStringToOString( sError, RTL_TEXTENCODING_ASCII_US ).getStr() ); + SAL_WARN( "sw", sError ); } #endif } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index a12f89e25dd9..9eb7f693b77e 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -3337,10 +3337,7 @@ void SwWW8ImplReader::simpleAddTextToParagraph(const OUString& rAddString) return; #if OSL_DEBUG_LEVEL > 1 - { - OString sText(OUStringToOString(rAddString, RTL_TEXTENCODING_UTF8)); - SAL_INFO("sw.ww8", "<addTextToParagraph>" << sText.getStr() << "</addTextToParagraph>"); - } + SAL_INFO("sw.ww8", "<addTextToParagraph>" << rAddString << "</addTextToParagraph>"); #endif const SwContentNode *pCntNd = m_pPaM->GetContentNode(); diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 8282b081c2e8..61bd0949f002 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -194,12 +194,7 @@ ErrCode ReadThroughComponent( if( bEncrypted ) return ERRCODE_SFX_WRONGPASSWORD; -#if OSL_DEBUG_LEVEL > 0 - OStringBuffer aError("SAX parse exception caught while importing:\n"); - aError.append(OUStringToOString(r.Message, - RTL_TEXTENCODING_ASCII_US)); - OSL_FAIL(aError.getStr()); -#endif + SAL_WARN( "sw", "SAX parse exception caught while importing: " << r.Message ); const OUString sErr( OUString::number( r.LineNumber ) + "," @@ -229,46 +224,25 @@ ErrCode ReadThroughComponent( if( bEncrypted ) return ERRCODE_SFX_WRONGPASSWORD; -#if OSL_DEBUG_LEVEL > 0 - OStringBuffer aError("SAX exception caught while importing:\n"); - aError.append(OUStringToOString(r.Message, - RTL_TEXTENCODING_ASCII_US)); - OSL_FAIL(aError.getStr()); -#endif - + SAL_WARN( "sw", "SAX exception caught while importing: " << r.Message); return ERR_SWG_READ_ERROR; } catch(const packages::zip::ZipIOException& r) { (void)r; -#if OSL_DEBUG_LEVEL > 0 - OStringBuffer aError("Zip exception caught while importing:\n"); - aError.append(OUStringToOString(r.Message, - RTL_TEXTENCODING_ASCII_US)); - OSL_FAIL(aError.getStr()); -#endif + SAL_WARN( "sw", "Zip exception caught while importing: " << r.Message); return ERRCODE_IO_BROKENPACKAGE; } catch(const io::IOException& r) { (void)r; -#if OSL_DEBUG_LEVEL > 0 - OStringBuffer aError("IO exception caught while importing:\n"); - aError.append(OUStringToOString(r.Message, - RTL_TEXTENCODING_ASCII_US)); - OSL_FAIL(aError.getStr()); -#endif + SAL_WARN( "sw", "IO exception caught while importing: " << r.Message); return ERR_SWG_READ_ERROR; } catch(const uno::Exception& r) { (void)r; -#if OSL_DEBUG_LEVEL > 0 - OStringBuffer aError("uno exception caught while importing:\n"); - aError.append(OUStringToOString(r.Message, - RTL_TEXTENCODING_ASCII_US)); - OSL_FAIL(aError.getStr()); -#endif + SAL_WARN( "sw", "uno exception caught while importing: " << r.Message ); return ERR_SWG_READ_ERROR; } |