summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--smoketest/smoketest.cxx3
-rw-r--r--sot/source/base/formats.cxx2
-rw-r--r--sot/source/sdstor/ucbstorage.cxx2
-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
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx6
-rw-r--r--toolkit/source/awt/vclxwindows.cxx4
-rw-r--r--vbahelper/inc/vbahelper/vbahelperinterface.hxx2
10 files changed, 35 insertions, 36 deletions
diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx
index 8714c0ac68f3..7327f8997c0a 100644
--- a/smoketest/smoketest.cxx
+++ b/smoketest/smoketest.cxx
@@ -151,9 +151,8 @@ void Test::test() {
args[1].State = css::beans::PropertyState_DIRECT_VALUE;
css::util::URL url;
url.Complete = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"vnd.sun.star.script:Standard.Global.StartTestWithDefaultOptions?"
- "language=Basic&location=document"));
+ "language=Basic&location=document");
css::uno::Reference< css::frame::XDesktop2 > xDesktop = css::frame::Desktop::create(connection_.getComponentContext());
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 9c229efaa915..2f904526b0bf 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -1312,7 +1312,7 @@ static sal_Bool CheckTransferableContext_Impl( const Reference< XTransferable >*
if( pFDesc->cItems )
{
rtl::OString sDesc( pFDesc->fgd[ 0 ].cFileName );
- bRet = 4 < sDesc.getLength() && sDesc.copy(sDesc.getLength()-4).equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM(".URL"));
+ bRet = 4 < sDesc.getLength() && sDesc.copy(sDesc.getLength()-4).equalsIgnoreAsciiCase(".URL");
}
}
}
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index b03c9629036c..6771dcc45ee7 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -3166,7 +3166,7 @@ String UCBStorage::GetLinkedFile( SvStream &rStream )
if( nBytes == 0x04034b50 )
{
rtl::OString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStream);
- if (aTmp.matchL(RTL_CONSTASCII_STRINGPARAM("ContentURL=")))
+ if (aTmp.match("ContentURL="))
{
aString = rtl::OStringToOUString(aTmp.copy(11), RTL_TEXTENCODING_UTF8);
}
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));
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index ab08d923e8f3..9cb085378cdf 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -582,12 +582,12 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
Window* pNewWindow = NULL;
sal_uInt16 nType = ImplGetComponentType( aServiceName );
bool bFrameControl = false;
- if ( aServiceName == String( RTL_CONSTASCII_USTRINGPARAM("frame") ) )
+ if ( aServiceName == String( "frame" ) )
bFrameControl = true;
- if ( aServiceName == String( RTL_CONSTASCII_USTRINGPARAM("tabcontrolnotabs") ) )
+ if ( aServiceName == String( "tabcontrolnotabs" ) )
{
nWinBits |= WB_NOBORDER;
- nType = ImplGetComponentType( String( RTL_CONSTASCII_USTRINGPARAM("tabcontrol") ) );
+ nType = ImplGetComponentType( String( "tabcontrol" ) );
}
if ( !pParent )
{
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 0eb97e2e345c..bba1abeb06c5 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2677,7 +2677,7 @@ void SAL_CALL VCLXMultiPage::setTabProps( sal_Int32 ID, const uno::Sequence< bea
const rtl::OUString &name = Properties[i].Name;
const uno::Any &value = Properties[i].Value;
- if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title")))
+ if (name == "Title")
{
rtl::OUString title = value.get<rtl::OUString>();
pTabControl->SetPageText( sal::static_int_cast< sal_uInt16 >( ID ), title );
@@ -2695,7 +2695,7 @@ uno::Sequence< beans::NamedValue > SAL_CALL VCLXMultiPage::getTabProps( sal_Int3
#define ADD_PROP( seq, i, name, val ) { \
beans::NamedValue value; \
- value.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( name ) ); \
+ value.Name = rtl::OUString( name ); \
value.Value = uno::makeAny( val ); \
seq[i] = value; \
}
diff --git a/vbahelper/inc/vbahelper/vbahelperinterface.hxx b/vbahelper/inc/vbahelper/vbahelperinterface.hxx
index ee963db223b4..a37bb59dc129 100644
--- a/vbahelper/inc/vbahelper/vbahelperinterface.hxx
+++ b/vbahelper/inc/vbahelper/vbahelperinterface.hxx
@@ -138,7 +138,7 @@ public:
#define VBAHELPER_IMPL_GETSERVICEIMPLNAME( classname ) \
OUString classname::getServiceImplName() \
{ \
- return OUString( RTL_CONSTASCII_USTRINGPARAM( #classname ) ); \
+ return OUString( #classname ); \
}
// ----------------------------------------------------------------------------
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-24 10:03:48 +0000