basic/source/classes/propacc.cxx | 3 +-- basic/source/comp/dim.cxx | 1 - basic/source/comp/io.cxx | 10 +++------- 3 files changed, 4 insertions(+), 10 deletions(-)
New commits: commit ebba94a9572b4154a4106380d949be3d83a68fa5 Author: Takeshi Abe <t...@fixedpoint.jp> Date: Mon Feb 13 23:39:50 2012 +0900 Replaced String by rtl::OUString diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index 80b0c72..ce9c027 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -29,7 +29,6 @@ #include "propacc.hxx" -#include <tools/errcode.hxx> #include <svl/svarray.hxx> #include <basic/sbstar.hxx> #include <sbunoobj.hxx> @@ -316,7 +315,7 @@ void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWr } // Get class names of struct - String aServiceName( RTL_CONSTASCII_USTRINGPARAM("stardiv.uno.beans.PropertySet") ); + ::rtl::OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM("stardiv.uno.beans.PropertySet") ); Reference< XInterface > xInterface = (OWeakObject*) new SbPropertyValues(); diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx index 4571f9c..5263d42 100644 --- a/basic/source/comp/dim.cxx +++ b/basic/source/comp/dim.cxx @@ -86,7 +86,6 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, sal_Bool bAsNewAlreadyParsed ) if( !bAsNewAlreadyParsed ) Next(); rDef.SetDefinedAs(); - String aType; SbiToken eTok = Next(); if( !bAsNewAlreadyParsed && eTok == NEW ) { diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx index 038f200..df02a4e 100644 --- a/basic/source/comp/io.cxx +++ b/basic/source/comp/io.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ - - -#include <tools/stream.hxx> #include "sbcomp.hxx" #include "iosys.hxx" @@ -127,7 +124,7 @@ void SbiParser::Line() aGen.Statement(); KeywordSymbolInfo aInfo; - aInfo.m_aKeywordSymbol = String( RTL_CONSTASCII_USTRINGPARAM( "line" ) ); + aInfo.m_aKeywordSymbol = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "line" ) ); aInfo.m_eSbxDataType = GetType(); aInfo.m_eTok = SYMBOL; @@ -258,8 +255,7 @@ void SbiParser::Open() if( Peek() == SYMBOL ) { Next(); - String aLen( aSym ); - if( aLen.EqualsIgnoreCaseAscii( "LEN" ) ) + if( aSym.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("LEN")) ) { TestToken( EQ ); pLen = new SbiExpression( this ); @@ -289,7 +285,7 @@ void SbiParser::Name() aGen.Statement(); KeywordSymbolInfo aInfo; - aInfo.m_aKeywordSymbol = String( RTL_CONSTASCII_USTRINGPARAM( "name" ) ); + aInfo.m_aKeywordSymbol = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "name" ) ); aInfo.m_eSbxDataType = GetType(); aInfo.m_eTok = SYMBOL; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits