diff options
author | Noel Grandin <noel@peralex.com> | 2013-11-20 10:05:20 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-11-20 10:07:32 +0200 |
commit | 1730df0127ff230cf6c89f4815f5b59c8603fa2b (patch) | |
tree | 4d5b32ea155c173fe3cfd905bb148e0998286d9a /svtools | |
parent | 52bbd9cc00b5a1e15e4f96b5c5fa5e75855692c1 (diff) |
remove unnecessary RTL_CONSTASCII_STRINGPARAM in OString::append
Convert code like:
aOStringBuf.append( RTL_CONSTASCII_STRINGPARAM( " is missing )") );
to:
aOStringBuf.append( " is missing )" );
which compiles down to the same code.
Change-Id: I3d8ed0cbf96a881686524a167412d5f303c06b71
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/misc/imap2.cxx | 14 | ||||
-rw-r--r-- | svtools/source/misc/transfer.cxx | 4 | ||||
-rw-r--r-- | svtools/source/svhtml/htmlout.cxx | 24 |
3 files changed, 21 insertions, 21 deletions
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx index 747ef4c4cf52..3f72ec305d6e 100644 --- a/svtools/source/misc/imap2.cxx +++ b/svtools/source/misc/imap2.cxx @@ -47,7 +47,7 @@ void IMapObject::AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100) c rBuf.append(static_cast<sal_Int32>(aPixPt.X())); rBuf.append(','); rBuf.append(static_cast<sal_Int32>(aPixPt.Y())); - rBuf.append(RTL_CONSTASCII_STRINGPARAM(") ")); + rBuf.append(") "); } void IMapObject::AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) const @@ -73,7 +73,7 @@ void IMapObject::AppendNCSAURL(OStringBuffer& rBuf, const OUString& rBaseURL) co void IMapRectangleObject::WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const { - OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rectangle ")); + OStringBuffer aStrBuf("rectangle "); AppendCERNCoords(aStrBuf, aRect.TopLeft()); AppendCERNCoords(aStrBuf, aRect.BottomRight()); @@ -84,7 +84,7 @@ void IMapRectangleObject::WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) void IMapRectangleObject::WriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const { - OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rect ")); + OStringBuffer aStrBuf("rect "); AppendNCSAURL(aStrBuf, rBaseURL); AppendNCSACoords(aStrBuf, aRect.TopLeft()); @@ -95,7 +95,7 @@ void IMapRectangleObject::WriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) void IMapCircleObject::WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const { - OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle ")); + OStringBuffer aStrBuf("circle "); AppendCERNCoords(aStrBuf, aCenter); aStrBuf.append(nRadius); @@ -107,7 +107,7 @@ void IMapCircleObject::WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) co void IMapCircleObject::WriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const { - OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle ")); + OStringBuffer aStrBuf("circle "); AppendNCSAURL(aStrBuf, rBaseURL); AppendNCSACoords(aStrBuf, aCenter); @@ -118,7 +118,7 @@ void IMapCircleObject::WriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) co void IMapPolygonObject::WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const { - OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("polygon ")); + OStringBuffer aStrBuf("polygon "); const sal_uInt16 nCount = aPoly.GetSize(); for (sal_uInt16 i = 0; i < nCount; ++i) @@ -131,7 +131,7 @@ void IMapPolygonObject::WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const { - OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("poly ")); + OStringBuffer aStrBuf("poly "); const sal_uInt16 nCount = std::min( aPoly.GetSize(), (sal_uInt16) 100 ); AppendNCSAURL(aStrBuf, rBaseURL); diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index f90404df77c0..32430046f26e 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -933,8 +933,8 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, if( strchr( "\\/:*?\"<>|", aStr[nChar] ) ) aStr.remove(nChar--, 1); - aStr.insert(0, RTL_CONSTASCII_STRINGPARAM("Shortcut to ")); - aStr.append(RTL_CONSTASCII_STRINGPARAM(".URL")); + aStr.insert(0, "Shortcut to "); + aStr.append(".URL"); strcpy( rFDesc1.cFileName, aStr.getStr() ); maAny <<= aSeq; diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index 4ad0a8542711..913e4efa0655 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -613,10 +613,10 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, OStringBuffer sOut; sOut.append('<') - .append(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_map)) + .append(OOO_STRING_SVTOOLS_HTML_map) .append(' ') - .append(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_O_name)) - .append(RTL_CONSTASCII_STRINGPARAM("=\"")); + .append(OOO_STRING_SVTOOLS_HTML_O_name) + .append("=\""); rStream << sOut.makeStringAndClear().getStr(); Out_String( rStream, rOutName, eDestEnc, pNonConvertableChars ); rStream << "\">"; @@ -791,13 +791,13 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, // Script wird komplett nicht eingerueckt! OStringBuffer sOut; sOut.append('<') - .append(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_script)); + .append(OOO_STRING_SVTOOLS_HTML_script); if( !rLanguage.isEmpty() ) { sOut.append(' ') - .append(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_O_language)) - .append(RTL_CONSTASCII_STRINGPARAM("=\"")); + .append(OOO_STRING_SVTOOLS_HTML_O_language) + .append("=\""); rStrm << sOut.makeStringAndClear().getStr(); Out_String( rStrm, rLanguage, eDestEnc, pNonConvertableChars ); sOut.append('\"'); @@ -847,8 +847,8 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, { if( pSBLibrary ) { - sOut.append(RTL_CONSTASCII_STRINGPARAM("' ")) - .append(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_SB_library)) + sOut.append("' ") + .append(OOO_STRING_SVTOOLS_HTML_SB_library) .append(' ') .append(OUStringToOString(*pSBLibrary, eDestEnc)); rStrm << sOut.makeStringAndClear().getStr() << SAL_NEWLINE_STRING; @@ -856,8 +856,8 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, if( pSBModule ) { - sOut.append(RTL_CONSTASCII_STRINGPARAM("' ")) - .append(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_SB_module)) + sOut.append("' ") + .append(OOO_STRING_SVTOOLS_HTML_SB_module) .append(' ') .append(OUStringToOString(*pSBModule, eDestEnc)); rStrm << sOut.makeStringAndClear().getStr() << SAL_NEWLINE_STRING; @@ -939,14 +939,14 @@ OString HTMLOutFuncs::CreateTableDataOptionsValNum( OString sTmp(OUStringToOString(aValStr, eDestEnc)); aStrTD.append(' '). append(OOO_STRING_SVTOOLS_HTML_O_SDval). - append(RTL_CONSTASCII_STRINGPARAM("=\"")). + append("=\""). append(sTmp).append('\"'); } if ( bValue || nFormat ) { aStrTD.append(' '). append(OOO_STRING_SVTOOLS_HTML_O_SDnum). - append(RTL_CONSTASCII_STRINGPARAM("=\"")). + append("=\""). append(static_cast<sal_Int32>( Application::GetSettings().GetLanguageTag().getLanguageType())). append(';'); // Language fuer Format 0 |