diff options
| author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-05-30 22:22:11 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-31 07:25:26 +0000 |
| commit | 5b26722ace02f71c79573b3795b2bf7b9412090f (patch) | |
| tree | 94db6eb75e6a1da5d6e83cf77eba7d3fc5e7cc08 /sd/source/filter/xml | |
| parent | 287d483edb0359aa52238e75750f61a75f532436 (diff) | |
Remove RTL_CONSTASCII_(U)STRINGPARAM (sd)
Change-Id: I179208d5ffe94e95719c7c6d0ea4eb354141531a
Reviewed-on: https://gerrit.libreoffice.org/4107
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sd/source/filter/xml')
| -rw-r--r-- | sd/source/filter/xml/sdxmlwrp.cxx | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index cab013acb118..554fff5e4a63 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -268,8 +268,7 @@ sal_Int32 ReadThroughComponent( return ERRCODE_SFX_WRONGPASSWORD; #if OSL_DEBUG_LEVEL > 1 - 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()); @@ -304,8 +303,7 @@ sal_Int32 ReadThroughComponent( return ERRCODE_SFX_WRONGPASSWORD; #if OSL_DEBUG_LEVEL > 1 - 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()); @@ -315,8 +313,7 @@ sal_Int32 ReadThroughComponent( catch (const packages::zip::ZipIOException& r) { #if OSL_DEBUG_LEVEL > 1 - 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()); @@ -328,8 +325,7 @@ sal_Int32 ReadThroughComponent( catch (const io::IOException& r) { #if OSL_DEBUG_LEVEL > 1 - 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()); @@ -341,8 +337,7 @@ sal_Int32 ReadThroughComponent( catch (const uno::Exception& r) { #if OSL_DEBUG_LEVEL > 1 - 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()); @@ -810,8 +805,8 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) { const String& rTypeName = pFilter->GetRealTypeName(); - if( (rTypeName.CompareToAscii( RTL_CONSTASCII_STRINGPARAM("impress_StarImpress" ) ) == 0) || - (rTypeName.CompareToAscii( RTL_CONSTASCII_STRINGPARAM("draw_StarDraw" ) ) == 0) ) + if( (rTypeName.CompareToAscii( "impress_StarImpress" ) == 0) || + (rTypeName.CompareToAscii( "draw_StarDraw" ) == 0) ) { bTransform = true; } @@ -1071,8 +1066,7 @@ sal_Bool SdXMLFilter::Export() catch (const uno::Exception &e) { #if OSL_DEBUG_LEVEL > 1 - OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( - "uno Exception caught while exporting:\n")); + OStringBuffer aError("uno Exception caught while exporting:\n"); aError.append(OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); |