diff options
| -rw-r--r-- | extensions/source/update/check/download.cxx | 8 | ||||
| -rw-r--r-- | idlc/source/astexpression.cxx | 24 | ||||
| -rw-r--r-- | l10ntools/source/xmlparse.cxx | 2 | ||||
| -rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/printer/printerinfomanager.cxx | 2 | ||||
| -rw-r--r-- | xmlscript/test/imexp.cxx | 2 |
6 files changed, 20 insertions, 20 deletions
diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx index 4b4afea5523d..fea4649d64ce 100644 --- a/extensions/source/update/check/download.cxx +++ b/extensions/source/update/check/download.cxx @@ -306,9 +306,9 @@ bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal curl_easy_getinfo( pCURL, CURLINFO_RESPONSE_CODE, &nError ); if ( 403 == nError ) - aMessage += OString( " 403: Access denied!" ); + aMessage += " 403: Access denied!"; else if ( 404 == nError ) - aMessage += OString( " 404: File not found!" ); + aMessage += " 404: File not found!"; else if ( 416 == nError ) { // we got this error probably, because we already downloaded the file @@ -317,9 +317,9 @@ bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal } else { - aMessage += OString( ":error code = " ); + aMessage += ":error code = "; aMessage += OString::number( nError ); - aMessage += OString( " !" ); + aMessage += " !"; } } if ( !ret ) diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx index f0c12f4a1369..5d5e6133d96c 100644 --- a/idlc/source/astexpression.cxx +++ b/idlc/source/astexpression.cxx @@ -1044,10 +1044,10 @@ OString AstExpression::toString() switch (m_combOperator) { case ExprComb::UPlus: - exprStr += OString("+"); + exprStr += "+"; break; case ExprComb::UMinus: - exprStr += OString("-"); + exprStr += "-"; break; default: break; @@ -1057,34 +1057,34 @@ OString AstExpression::toString() switch (m_combOperator) { case ExprComb::Add: - exprStr += OString(" + "); + exprStr += " + "; break; case ExprComb::Minus: - exprStr += OString(" - "); + exprStr += " - "; break; case ExprComb::Mul: - exprStr += OString(" * "); + exprStr += " * "; break; case ExprComb::Div: - exprStr += OString(" / "); + exprStr += " / "; break; case ExprComb::Mod: - exprStr += OString(" % "); + exprStr += " % "; break; case ExprComb::Or: - exprStr += OString(" | "); + exprStr += " | "; break; case ExprComb::Xor: - exprStr += OString(" ^ "); + exprStr += " ^ "; break; case ExprComb::And: - exprStr += OString(" & "); + exprStr += " & "; break; case ExprComb::Left: - exprStr += OString(" << "); + exprStr += " << "; break; case ExprComb::Right: - exprStr += OString(" >> "); + exprStr += " >> "; break; default: break; diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx index 5b0fcb88ff48..e2761ace545a 100644 --- a/l10ntools/source/xmlparse.cxx +++ b/l10ntools/source/xmlparse.cxx @@ -933,7 +933,7 @@ XMLFile *SimpleXMLParser::Execute( const OString &rFileName, XMLFile* pXMLFileIn if ( !pXMLFile->GetName().isEmpty()) m_aErrorInformation.m_sMessage += pXMLFile->GetName(); else - m_aErrorInformation.m_sMessage += OString( "XML-File ("); + m_aErrorInformation.m_sMessage += "XML-File ("; m_aErrorInformation.m_sMessage += OString::number(sal::static_int_cast< sal_Int64 >(m_aErrorInformation.m_nLine)) + "," + diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index b3edf385561f..6b9613c6c652 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -4938,7 +4938,7 @@ namespace osl_Directory #if !defined(_WIN32) && !defined(ANDROID) && !defined(AIX) // FIXME would be nice to create unique dir even on Windows - tmp_x += OString("XXXXXX"); + tmp_x += "XXXXXX"; char *out = mkdtemp(const_cast<char*>(tmp_x.getStr())); CPPUNIT_ASSERT_MESSAGE diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 62e797dc2a5b..601b7334c717 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -840,7 +840,7 @@ FILE* PrinterInfoManager::startSpool( const OUString& rPrintername, bool bQuickC const OUString& rCommand = (bQuickCommand && !rPrinterInfo.m_aQuickCommand.isEmpty() ) ? rPrinterInfo.m_aQuickCommand : rPrinterInfo.m_aCommand; OString aShellCommand = OUStringToOString (rCommand, RTL_TEXTENCODING_ISO_8859_1); - aShellCommand += OString( " 2>/dev/null" ); + aShellCommand += " 2>/dev/null"; return popen (aShellCommand.getStr(), "w"); } diff --git a/xmlscript/test/imexp.cxx b/xmlscript/test/imexp.cxx index 6965d4126a51..2c8521015255 100644 --- a/xmlscript/test/imexp.cxx +++ b/xmlscript/test/imexp.cxx @@ -190,7 +190,7 @@ void MyApp::Main() uno::Exception exc; if (rExc.WrappedException >>= exc) { - aStr += OString( " >>> " ); + aStr += " >>> "; aStr += OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ); } OSL_FAIL( aStr.getStr() ); |