From ff7ac85d4b657da2cd28b878325fd7c290b5c63b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 5 Aug 2013 16:24:20 +0200 Subject: convert vcl/strhelper.hxx from String to OUString Change-Id: I1d54431dbd8c562703879a81540f62b3513e9dc9 --- vcl/source/helper/strhelper.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'vcl/source/helper') diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx index 156aa00c35b9..41e82929d24a 100644 --- a/vcl/source/helper/strhelper.cxx +++ b/vcl/source/helper/strhelper.cxx @@ -111,15 +111,15 @@ inline void CopyUntil( sal_Unicode*& pTo, const sal_Unicode*& pFrom, sal_Unicode pFrom++; } -String GetCommandLineToken( int nToken, const String& rLine ) +OUString GetCommandLineToken( int nToken, const OUString& rLine ) { - int nLen = rLine.Len(); + sal_Int32 nLen = rLine.getLength(); if( ! nLen ) - return String(); + return OUString(); int nActualToken = 0; sal_Unicode* pBuffer = (sal_Unicode*)alloca( sizeof(sal_Unicode)*( nLen + 1 ) ); - const sal_Unicode* pRun = rLine.GetBuffer(); + const sal_Unicode* pRun = rLine.getStr(); sal_Unicode* pLeap = NULL; while( *pRun && nActualToken <= nToken ) @@ -261,14 +261,14 @@ int GetCommandLineTokenCount(const OUString& rLine) return nTokenCount; } -String WhitespaceToSpace( const String& rLine, bool bProtect ) +OUString WhitespaceToSpace( const OUString& rLine, bool bProtect ) { - int nLen = rLine.Len(); + sal_Int32 nLen = rLine.getLength(); if( ! nLen ) - return String(); + return OUString(); sal_Unicode *pBuffer = (sal_Unicode*)alloca( sizeof(sal_Unicode)*(nLen + 1) ); - const sal_Unicode *pRun = rLine.GetBuffer(); + const sal_Unicode *pRun = rLine.getStr(); sal_Unicode *pLeap = pBuffer; while( *pRun ) -- cgit v1.2.3