From fe17eb9448f6da0e8fab6aca02f49c7cf597e2b0 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 15 Dec 2014 10:15:16 +0100
Subject: scripting: Use appropriate OUString functions on string constants

Change-Id: I8ee8eb92ac95937893c894e67882e9df2c16a67d
---
 scripting/source/dlgprov/dlgevtatt.cxx             | 2 +-
 scripting/source/protocolhandler/scripthandler.cxx | 4 ++--
 scripting/source/provider/URIHelper.cxx            | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'scripting/source')

diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index 30ac109cf683..62f880393d85 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -527,7 +527,7 @@ namespace dlgprov
         OUString sScriptURL;
         OUString sScriptCode( aScriptEvent.ScriptCode );
 
-        if ( aScriptEvent.ScriptType.equalsAscii( "StarBasic" ) )
+        if ( aScriptEvent.ScriptType == "StarBasic" )
         {
             // StarBasic script: convert ScriptCode to scriptURL
             sal_Int32 nIndex = sScriptCode.indexOf( ':' );
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index e959d3fe6ef6..4f0dc5ec3fb6 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -203,8 +203,8 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
                    // Sometimes we get a propertyval with name = "Referer"
                    // this is not an argument to be passed to script, so
                    // ignore.
-                   if ( !lArgs[ index ].Name.equalsAscii("Referer")  ||
-                        lArgs[ index ].Name.isEmpty() )
+                   if ( lArgs[ index ].Name != "Referer" ||
+                        lArgs[ index ].Name.isEmpty() ) //TODO:???
                    {
                        inArgs.realloc( ++argCount );
                        inArgs[ argCount - 1 ] = lArgs[ index ].Value;
diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx
index 8c67606e9914..574b52cfc970 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
@@ -113,24 +113,24 @@ ScriptingFrameworkURIHelper::initBaseURI()
     OUString uri, test;
     bool bAppendScriptsPart = false;
 
-    if ( m_sLocation.equalsAscii(USER))
+    if ( m_sLocation == USER )
     {
         test = USER;
         uri = USER_URI;
         bAppendScriptsPart = true;
     }
-    else if ( m_sLocation.equalsAscii(USER_UNO_PACKAGES))
+    else if ( m_sLocation == USER_UNO_PACKAGES )
     {
         test = "uno_packages";
         uri = OUString( USER_URI ) + USER_UNO_PACKAGES_DIR;
     }
-    else if (m_sLocation.equalsAscii(SHARE))
+    else if (m_sLocation == SHARE)
     {
         test = SHARE;
         uri = SHARE_URI;
         bAppendScriptsPart = true;
     }
-    else if (m_sLocation.equalsAscii(SHARE_UNO_PACKAGES))
+    else if (m_sLocation == SHARE_UNO_PACKAGES)
     {
         test = "uno_packages";
         uri = SHARE_UNO_PACKAGES_URI;
-- 
cgit