From 5819bec966782b844eb2953f6636a84a01212234 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sun, 17 Jun 2012 12:17:35 +0100
Subject: ditch last (?) String::String(const sal_Unicode*)

Change-Id: I47ce16581a9923729a7e5e1e5cedaf91e4b215ac
---
 vcl/source/app/i18nhelp.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'vcl/source/app/i18nhelp.cxx')

diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index ea4eb34e8213..7e43afa2f87b 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.cxx
@@ -118,7 +118,7 @@ String vcl::I18nHelper::filterFormattingChars( const String& rStr )
     return aBuf.makeStringAndClear();
 }
 
-sal_Int32 vcl::I18nHelper::CompareString( const String& rStr1, const String& rStr2 ) const
+sal_Int32 vcl::I18nHelper::CompareString( const rtl::OUString& rStr1, const rtl::OUString& rStr2 ) const
 {
     ::osl::Guard< ::osl::Mutex > aGuard( ((vcl::I18nHelper*)this)->maMutex );
 
@@ -137,7 +137,7 @@ sal_Int32 vcl::I18nHelper::CompareString( const String& rStr1, const String& rSt
     return ImplGetTransliterationWrapper().compareString( aStr1, aStr2 );
 }
 
-sal_Bool vcl::I18nHelper::MatchString( const String& rStr1, const String& rStr2 ) const
+sal_Bool vcl::I18nHelper::MatchString( const rtl::OUString& rStr1, const rtl::OUString& rStr2 ) const
 {
     ::osl::Guard< ::osl::Mutex > aGuard( ((vcl::I18nHelper*)this)->maMutex );
 
@@ -164,7 +164,7 @@ sal_Bool vcl::I18nHelper::MatchMnemonic( const String& rString, sal_Unicode cMne
     if ( n != STRING_NOTFOUND )
     {
         String aMatchStr( rString, n+1, STRING_LEN );   // not only one char, because of transliteration...
-        bEqual = MatchString( cMnemonicChar, aMatchStr );
+        bEqual = MatchString( rtl::OUString(cMnemonicChar), aMatchStr );
     }
     return bEqual;
 }
-- 
cgit