From 73342dbb82ba074d01962359dac50fb2aa36cbeb Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 21 Nov 2013 15:52:45 +0200 Subject: remove unnecessary RTL_CONSTASCII_STRINGPARAM A final pass through the code, converting code to use the new OUString and OString methods that can detect string literals. Change-Id: Ifa6382335e5650a1c67e52006b26354e0692c710 --- scripting/source/basprov/basprov.cxx | 2 +- scripting/source/protocolhandler/scripthandler.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'scripting') diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 89d7df8a1e3e..5622ba566f5b 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -151,7 +151,7 @@ namespace basprov else if ( aScheme.equalsIgnoreAsciiCase("vnd.sun.star.pkg") ) { OUString aAuthority = xUriRef->getAuthority(); - if ( aAuthority.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "vnd.sun.star.expand:" ) ) ) + if ( aAuthority.matchIgnoreAsciiCase( "vnd.sun.star.expand:" ) ) { OUString aDecodedURL( aAuthority.copy( sizeof ( "vnd.sun.star.expand:" ) - 1 ) ); aDecodedURL = ::rtl::Uri::decode( aDecodedURL, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index a613d9787f7d..1f86d7b1a270 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -145,7 +145,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( { try { - bool bIsDocumentScript = ( aURL.Complete.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "document" ) ) !=-1 ); + bool bIsDocumentScript = ( aURL.Complete.indexOf( "document" ) !=-1 ); // TODO: isn't this somewhat strange? This should be a test for a location=document parameter, shouldn't it? if ( bIsDocumentScript ) -- cgit