From 55cd108d48f1554d5acef02662d7e93b18b38e34 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 12 Dec 2014 12:24:15 +0100
Subject: testtools: Use appropriate OUString functions on string constants

Change-Id: I5cb34d95e2a59ff6a3f5189beb40b7dbf574dc29
---
 testtools/source/bridgetest/bridgetest.cxx            | 2 +-
 testtools/source/bridgetest/currentcontextchecker.cxx | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'testtools/source/bridgetest')

diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index 25f4aac65442..61ee77fbb0d6 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -1150,7 +1150,7 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs )
         Reference< XInterface > xOriginal;
         bool remote;
         sal_Int32 i;
-        if( rArgs.getLength() > 1 && rArgs[0].equalsAscii( "-u" ) )
+        if( rArgs.getLength() > 1 && rArgs[0] == "-u" )
         {
             remote = true;
             i = 2;
diff --git a/testtools/source/bridgetest/currentcontextchecker.cxx b/testtools/source/bridgetest/currentcontextchecker.cxx
index 7924f3fce691..adb0fb3a5967 100644
--- a/testtools/source/bridgetest/currentcontextchecker.cxx
+++ b/testtools/source/bridgetest/currentcontextchecker.cxx
@@ -63,9 +63,7 @@ CurrentContext::~CurrentContext() {}
 css::uno::Any CurrentContext::getValueByName(OUString const & Name)
     throw (css::uno::RuntimeException, std::exception)
 {
-    return Name == KEY
-        ? css::uno::makeAny(OUString::createFromAscii(VALUE))
-        : css::uno::Any();
+    return Name == KEY ? css::uno::makeAny(OUString(VALUE)) : css::uno::Any();
 }
 
 }
@@ -100,8 +98,7 @@ bool testtools::bridgetest::CurrentContextChecker::performCheck(
         if (!context.is()) {
             return false;
         }
-        css::uno::Any a(
-            context->getValueByName(OUString::createFromAscii(KEY)));
+        css::uno::Any a(context->getValueByName(KEY));
         if (a.getValueType() != ::cppu::UnoType< OUString >::get()) {
             return false;
         }
-- 
cgit