diff options
| author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-04-01 21:08:13 +0200 |
|---|---|---|
| committer | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-04-01 22:12:22 +0200 |
| commit | 563a9b7ab3cc1ed0166d1bfe0568124a2fd9b80e (patch) | |
| tree | 20f52c72ac7eb7a3dfac07a1e0297b17db60b58e /svl/qa/unit | |
| parent | 6591068f2a73252f4e3c9abf9b153a5b4f59410b (diff) | |
Remove RTL_CONSTASCII_USTRINGPARAM in smoketest/sot/svl/toolkit/vbahelper
Change-Id: I0816631a1d0c68dcef9c640c91d00ac9942ded28
Diffstat (limited to 'svl/qa/unit')
| -rw-r--r-- | svl/qa/unit/test_URIHelper.cxx | 24 |
1 files changed, 12 insertions, 12 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(); |