summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-11-20 11:45:23 +0200
committerNoel Grandin <noel@peralex.com>2013-11-20 13:56:07 +0200
commitd894fee80e40519cb579987b95cb3d19345dfa71 (patch)
treef0b91e37171f4123d3528b681613c99f34509d2e /sw
parent5112f6a6c6e4cd76045f31e269a679b50dc83fb2 (diff)
remove RTL_CONSTASCII_STRINGPARAM in OStringBuffer constructor
Convert code like: OStringBuffer aKeyName(RTL_CONSTASCII_STRINGPARAM("NDX")); to: OStringBuffer aKeyName("NDX"); which compiles down to the same code Change-Id: If9c96a290bc18cc8285fb733f27be58c6958b63c
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/html/htmltabw.cxx4
-rw-r--r--sw/source/filter/xml/swxml.cxx15
2 files changed, 7 insertions, 12 deletions
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 9a464ae41c83..43e8672586dc 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -734,7 +734,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
if( pCaption && !pCaption->isEmpty() )
{
rWrt.OutNewLine(); // <CAPTION> in neue Zeile
- OStringBuffer sOutStr(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_caption));
+ OStringBuffer sOutStr(OOO_STRING_SVTOOLS_HTML_caption);
sOutStr.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append("=\"")
.append(bTopCaption ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom)
.append("\"");
@@ -1101,7 +1101,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_center, sal_True );
else
{
- OStringBuffer sOut(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_division));
+ OStringBuffer sOut(OOO_STRING_SVTOOLS_HTML_division);
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append("=\"")
.append(OOO_STRING_SVTOOLS_HTML_AL_right).append("\"");
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.getStr(),
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 3a11d2c7865d..d9dbc4261d10 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -188,8 +188,7 @@ sal_Int32 ReadThroughComponent(
return ERRCODE_SFX_WRONGPASSWORD;
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "SAX parse exception caught while importing:\n"));
+ OStringBuffer aError("SAX parse exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -224,8 +223,7 @@ sal_Int32 ReadThroughComponent(
return ERRCODE_SFX_WRONGPASSWORD;
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "SAX exception caught while importing:\n"));
+ OStringBuffer aError("SAX exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -237,8 +235,7 @@ sal_Int32 ReadThroughComponent(
{
(void)r;
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "Zip exception caught while importing:\n"));
+ OStringBuffer aError("Zip exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -249,8 +246,7 @@ sal_Int32 ReadThroughComponent(
{
(void)r;
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "IO exception caught while importing:\n"));
+ OStringBuffer aError("IO exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -261,8 +257,7 @@ sal_Int32 ReadThroughComponent(
{
(void)r;
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "uno exception caught while importing:\n"));
+ OStringBuffer aError("uno exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());