summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorChr. Rossmanith <ChrRossmanith@gmx.de>2013-04-01 21:08:13 +0200
committerChr. Rossmanith <ChrRossmanith@gmx.de>2013-04-01 22:12:22 +0200
commit563a9b7ab3cc1ed0166d1bfe0568124a2fd9b80e (patch)
tree20f52c72ac7eb7a3dfac07a1e0297b17db60b58e /svl
parent6591068f2a73252f4e3c9abf9b153a5b4f59410b (diff)
Remove RTL_CONSTASCII_USTRINGPARAM in smoketest/sot/svl/toolkit/vbahelper
Change-Id: I0816631a1d0c68dcef9c640c91d00ac9942ded28
Diffstat (limited to 'svl')
-rw-r--r--svl/qa/unit/test_URIHelper.cxx24
-rw-r--r--svl/source/items/style.cxx2
-rw-r--r--svl/source/misc/urihelper.cxx2
-rw-r--r--svl/source/numbers/zforlist.cxx24
4 files changed, 26 insertions, 26 deletions
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx
index 9fd68aa2c06c..90ca5fa71044 100644
--- a/svl/qa/unit/test_URIHelper.cxx
+++ b/svl/qa/unit/test_URIHelper.cxx
@@ -124,7 +124,7 @@ Content::Content(
{
assert(m_identifier.is());
rtl::OUString uri(m_identifier->getContentIdentifier());
- if (!uri.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(m_prefix))
+ if (!uri.matchIgnoreAsciiCase(m_prefix)
|| uri.indexOf('#', RTL_CONSTASCII_LENGTH(m_prefix)) != -1)
{
throw css::ucb::IllegalIdentifierException();
@@ -269,9 +269,9 @@ void Test::testNormalizedMakeRelative() {
rtl::OStringBuffer buf;
buf.append('<');
buf.append(tests[i].base);
- buf.append(RTL_CONSTASCII_STRINGPARAM(">, <"));
+ buf.append(">, <");
buf.append(tests[i].absolute);
- buf.append(RTL_CONSTASCII_STRINGPARAM(">: "));
+ buf.append(">: ");
if (ref.is()) {
buf.append('<');
buf.append(
@@ -279,11 +279,11 @@ void Test::testNormalizedMakeRelative() {
ref->getUriReference(), RTL_TEXTENCODING_UTF8));
buf.append('>');
} else {
- buf.append(RTL_CONSTASCII_STRINGPARAM("none"));
+ buf.append("none");
}
- buf.append(RTL_CONSTASCII_STRINGPARAM(" instead of "));
+ buf.append(" instead of ");
if (tests[i].relative == 0) {
- buf.append(RTL_CONSTASCII_STRINGPARAM("none"));
+ buf.append("none");
} else {
buf.append('<');
buf.append(tests[i].relative);
@@ -401,18 +401,18 @@ void Test::testFindFirstURLInText() {
rtl::OStringBuffer buf;
buf.append('"');
buf.append(tests[i].input);
- buf.append(RTL_CONSTASCII_STRINGPARAM("\" -> "));
+ buf.append("\" -> ");
buf.append(tests[i].result == 0 ? "none" : tests[i].result);
- buf.append(RTL_CONSTASCII_STRINGPARAM(" ("));
+ buf.append(" (");
buf.append(static_cast< sal_Int32 >(tests[i].begin));
- buf.append(RTL_CONSTASCII_STRINGPARAM(", "));
+ buf.append(", ");
buf.append(static_cast< sal_Int32 >(tests[i].end));
buf.append(')');
- buf.append(RTL_CONSTASCII_STRINGPARAM(" != "));
+ buf.append(" != ");
buf.append(rtl::OUStringToOString(result, RTL_TEXTENCODING_UTF8));
- buf.append(RTL_CONSTASCII_STRINGPARAM(" ("));
+ buf.append(" (");
buf.append(static_cast< sal_Int32 >(begin));
- buf.append(RTL_CONSTASCII_STRINGPARAM(", "));
+ buf.append(", ");
buf.append(static_cast< sal_Int32 >(end));
buf.append(')');
msg = buf.makeStringAndClear();
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 8de150890d2f..3e0651257511 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -341,7 +341,7 @@ XubString SfxStyleSheetBase::GetDescription( SfxMapUnit eMetric )
eMetric, aItemPresentation, &aIntlWrapper ) )
{
if ( aDesc.Len() && !aItemPresentation.isEmpty() )
- aDesc.AppendAscii(RTL_CONSTASCII_STRINGPARAM(" + "));
+ aDesc.AppendAscii(" + ");
if ( !aItemPresentation.isEmpty() )
aDesc += aItemPresentation;
}
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 2e7e2bd5b19b..6642cd148443 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -211,7 +211,7 @@ OUString normalize(
OUStringBuffer head(ref->getScheme());
head.append(static_cast< sal_Unicode >(':'));
if (ref->hasAuthority()) {
- head.appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
+ head.append("//");
head.append(ref->getAuthority());
}
for (sal_Int32 i = count - 1; i > 0; --i) {
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index c5732931b6fe..7fa3241850bb 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -2102,7 +2102,7 @@ sal_Int32 SvNumberFormatter::ImpGetFormatCodeIndex(
rSeq[0].Code = OUStringBuffer().
append('0').
append(GetNumDecimalSep()).
- appendAscii(RTL_CONSTASCII_STRINGPARAM("############")).
+ append("############").
makeStringAndClear();
}
return 0;
@@ -2137,7 +2137,7 @@ sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault(
nLong = nElem;
break;
default:
- aMsg.append(RTL_CONSTASCII_STRINGPARAM("unknown type"));
+ aMsg.append("unknown type");
}
if ( pFormatArr[nElem].Default )
{
@@ -2145,25 +2145,25 @@ sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault(
{
case i18n::KNumberFormatType::SHORT :
if ( nShortDef != -1 )
- aMsg.append(RTL_CONSTASCII_STRINGPARAM("dupe short type default"));
+ aMsg.append("dupe short type default");
nShortDef = nElem;
break;
case i18n::KNumberFormatType::MEDIUM :
if ( nMediumDef != -1 )
- aMsg.append(RTL_CONSTASCII_STRINGPARAM("dupe medium type default"));
+ aMsg.append("dupe medium type default");
nMediumDef = nElem;
break;
case i18n::KNumberFormatType::LONG :
if ( nLongDef != -1 )
- aMsg.append(RTL_CONSTASCII_STRINGPARAM("dupe long type default"));
+ aMsg.append("dupe long type default");
nLongDef = nElem;
break;
}
}
if (aMsg.getLength())
{
- aMsg.insert(0, RTL_CONSTASCII_STRINGPARAM("SvNumberFormatter::ImpAdjustFormatCodeDefault: "));
- aMsg.append(RTL_CONSTASCII_STRINGPARAM("\nXML locale data FormatElement formatindex: "));
+ aMsg.insert(0, "SvNumberFormatter::ImpAdjustFormatCodeDefault: ");
+ aMsg.append("\nXML locale data FormatElement formatindex: ");
aMsg.append(static_cast<sal_Int32>(pFormatArr[nElem].Index));
OUString aUMsg(OStringToOUString(aMsg.makeStringAndClear(),
RTL_TEXTENCODING_ASCII_US));
@@ -2171,15 +2171,15 @@ sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault(
}
}
if ( nShort != -1 && nShortDef == -1 )
- aMsg.append(RTL_CONSTASCII_STRINGPARAM("no short type default "));
+ aMsg.append("no short type default ");
if ( nMedium != -1 && nMediumDef == -1 )
- aMsg.append(RTL_CONSTASCII_STRINGPARAM("no medium type default "));
+ aMsg.append("no medium type default ");
if ( nLong != -1 && nLongDef == -1 )
- aMsg.append(RTL_CONSTASCII_STRINGPARAM("no long type default "));
+ aMsg.append("no long type default ");
if (aMsg.getLength())
{
- aMsg.insert(0, RTL_CONSTASCII_STRINGPARAM("SvNumberFormatter::ImpAdjustFormatCodeDefault: "));
- aMsg.append(RTL_CONSTASCII_STRINGPARAM("\nXML locale data FormatElement group of: "));
+ aMsg.insert(0, "SvNumberFormatter::ImpAdjustFormatCodeDefault: ");
+ aMsg.append("\nXML locale data FormatElement group of: ");
OUString aUMsg(OStringToOUString(aMsg.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US));
LocaleDataWrapper::outputCheckMessage(
xLocaleData->appendLocaleInfo(aUMsg + pFormatArr[0].NameID));