mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert BASIC from String to OUString

Browse Source 
Change-Id: I4b046e4c460305acad29862341092af948639215
This commit is contained in:
Noel Grandin
2013-09-16 10:06:54 +02:00
parent e8ecf30ea6
commit 41dec09ed3
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
basic/source/basmgr/basmgr.cxx
View File

@@ -1315,7 +1315,7 @@ sal_Bool BasicManager::RemoveLib( sal_uInt16 nLib, sal_Bool bDelBasicFromStorage
if ( !pLibInfo || !nLib ) if ( !pLibInfo || !nLib )
{ {
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_REMOVELIB, String(), ERRCODE_BUTTON_OK ); StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_REMOVELIB, OUString(), ERRCODE_BUTTON_OK );
aErrors.push_back(BasicError(*pErrInf, BASERR_REASON_STDLIB, pLibInfo->GetLibName())); aErrors.push_back(BasicError(*pErrInf, BASERR_REASON_STDLIB, pLibInfo->GetLibName()));
return sal_False; return sal_False;
} }
@@ -1342,7 +1342,7 @@ sal_Bool BasicManager::RemoveLib( sal_uInt16 nLib, sal_Bool bDelBasicFromStorage
if ( !xBasicStorage.Is() || xBasicStorage->GetError() ) if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
{ {
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_REMOVELIB, String(), ERRCODE_BUTTON_OK ); StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_REMOVELIB, OUString(), ERRCODE_BUTTON_OK );
aErrors.push_back(BasicError(*pErrInf, BASERR_REASON_OPENLIBSTORAGE, pLibInfo->GetLibName())); aErrors.push_back(BasicError(*pErrInf, BASERR_REASON_OPENLIBSTORAGE, pLibInfo->GetLibName()));
} }
else if ( xBasicStorage->IsStream( pLibInfo->GetLibName() ) ) else if ( xBasicStorage->IsStream( pLibInfo->GetLibName() ) )

20
basic/source/runtime/inputbox.cxx
View File

@@ -38,18 +38,18 @@ class SvRTLInputBox : public ModalDialog
void PositionDialog( long nXTwips, long nYTwips, const Size& rDlgSize ); void PositionDialog( long nXTwips, long nYTwips, const Size& rDlgSize );
void InitButtons( const Size& rDlgSize ); void InitButtons( const Size& rDlgSize );
void PositionEdit( const Size& rDlgSize ); void PositionEdit( const Size& rDlgSize );
void PositionPrompt( const String& rPrompt, const Size& rDlgSize ); void PositionPrompt( const OUString& rPrompt, const Size& rDlgSize );
DECL_LINK( OkHdl, Button * ); DECL_LINK( OkHdl, Button * );
DECL_LINK( CancelHdl, Button * ); DECL_LINK( CancelHdl, Button * );
public: public:
SvRTLInputBox( Window* pParent, const String& rPrompt, const String& rTitle, SvRTLInputBox( Window* pParent, const OUString& rPrompt, const OUString& rTitle,
const String& rDefault, long nXTwips = -1, long nYTwips = -1 ); const OUString& rDefault, long nXTwips = -1, long nYTwips = -1 );
OUString GetText() const { return aText; } OUString GetText() const { return aText; }
}; };
SvRTLInputBox::SvRTLInputBox( Window* pParent, const String& rPrompt, SvRTLInputBox::SvRTLInputBox( Window* pParent, const OUString& rPrompt,
const String& rTitle, const String& rDefault, const OUString& rTitle, const OUString& rDefault,
long nXTwips, long nYTwips ) : long nXTwips, long nYTwips ) :
ModalDialog( pParent,WB_3DLOOK | WB_MOVEABLE | WB_CLOSEABLE ), ModalDialog( pParent,WB_3DLOOK | WB_MOVEABLE | WB_CLOSEABLE ),
aEdit( this, WB_LEFT | WB_BORDER ), aEdit( this, WB_LEFT | WB_BORDER ),
@@ -103,9 +103,9 @@ void SvRTLInputBox::PositionEdit( const Size& rDlgSize )
} }
void SvRTLInputBox::PositionPrompt(const String& rPrompt,const Size& rDlgSize) void SvRTLInputBox::PositionPrompt(const OUString& rPrompt,const Size& rDlgSize)
{ {
if ( rPrompt.Len() == 0 ) if ( rPrompt.isEmpty() )
return; return;
OUString aText_(convertLineEnd(rPrompt, LINEEND_CR)); OUString aText_(convertLineEnd(rPrompt, LINEEND_CR));
aPromptText.SetPosPixel( LogicToPixel(Point(5,5))); aPromptText.SetPosPixel( LogicToPixel(Point(5,5)));
@@ -153,10 +153,10 @@ RTLFUNC(InputBox)
StarBASIC::Error( SbERR_BAD_ARGUMENT ); StarBASIC::Error( SbERR_BAD_ARGUMENT );
else else
{ {
String aTitle; OUString aTitle;
String aDefault; OUString aDefault;
sal_Int32 nX = -1, nY = -1; // center sal_Int32 nX = -1, nY = -1; // center
const String& rPrompt = rPar.Get(1)->GetOUString(); const OUString& rPrompt = rPar.Get(1)->GetOUString();
if ( nArgCount > 2 && !rPar.Get(2)->IsErr() ) if ( nArgCount > 2 && !rPar.Get(2)->IsErr() )
aTitle = rPar.Get(2)->GetOUString(); aTitle = rPar.Get(2)->GetOUString();
if ( nArgCount > 3 && !rPar.Get(3)->IsErr() ) if ( nArgCount > 3 && !rPar.Get(3)->IsErr() )

6
basic/source/runtime/methods.cxx
View File

@@ -3617,7 +3617,7 @@ RTLFUNC(Shell)
// #55735 if there are parameters, they have to be separated // #55735 if there are parameters, they have to be separated
// #72471 also separate the single parameters // #72471 also separate the single parameters
std::list<String> aTokenList; std::list<OUString> aTokenList;
OUString aToken; OUString aToken;
sal_Int32 i = 0; sal_Int32 i = 0;
sal_Unicode c; sal_Unicode c;
@@ -3699,7 +3699,7 @@ RTLFUNC(Shell)
} }
// #72471 work parameter(s) up // #72471 work parameter(s) up
std::list<String>::const_iterator iter = aTokenList.begin(); std::list<OUString>::const_iterator iter = aTokenList.begin();
const OUString& rStr = *iter; const OUString& rStr = *iter;
OUString aOUStrProg( rStr.getStr(), rStr.getLength() ); OUString aOUStrProg( rStr.getStr(), rStr.getLength() );
OUString aOUStrProgURL = getFullPath( aOUStrProg ); OUString aOUStrProgURL = getFullPath( aOUStrProg );
@@ -3824,7 +3824,7 @@ OUString getBasicTypeName( SbxDataType eType )
return OUString::createFromAscii(pTypeNames[nPos]); return OUString::createFromAscii(pTypeNames[nPos]);
} }
String getObjectTypeName( SbxVariable* pVar ) OUString getObjectTypeName( SbxVariable* pVar )
{ {
OUString sRet( "Object" ); OUString sRet( "Object" );
if ( pVar ) if ( pVar )

14
basic/source/sbx/sbxscan.cxx
View File

@@ -680,16 +680,16 @@ enum VbaFormatType
struct VbaFormatInfo struct VbaFormatInfo
{ {
VbaFormatType meType; VbaFormatType meType;
const char* mpVbaFormat; // Format string in vba OUString mpVbaFormat; // Format string in vba
NfIndexTableOffset meOffset; // SvNumberFormatter format index, if meType = VBA_FORMAT_TYPE_OFFSET NfIndexTableOffset meOffset; // SvNumberFormatter format index, if meType = VBA_FORMAT_TYPE_OFFSET
const char* mpOOoFormat; // if meType = VBA_FORMAT_TYPE_USERDEFINED const char* mpOOoFormat; // if meType = VBA_FORMAT_TYPE_USERDEFINED
}; };
#define VBA_FORMAT_OFFSET( pcUtf8, eOffset ) \ #define VBA_FORMAT_OFFSET( pcUtf8, eOffset ) \
{ VBA_FORMAT_TYPE_OFFSET, pcUtf8, eOffset, 0 } { VBA_FORMAT_TYPE_OFFSET, OUString(pcUtf8), eOffset, 0 }
#define VBA_FORMAT_USERDEFINED( pcUtf8, pcDefinedUtf8 ) \ #define VBA_FORMAT_USERDEFINED( pcUtf8, pcDefinedUtf8 ) \
{ VBA_FORMAT_TYPE_USERDEFINED, pcUtf8, NF_NUMBER_STANDARD, pcDefinedUtf8 } { VBA_FORMAT_TYPE_USERDEFINED, OUString(pcUtf8), NF_NUMBER_STANDARD, pcDefinedUtf8 }
static VbaFormatInfo pFormatInfoTable[] = static VbaFormatInfo pFormatInfoTable[] =
{ {
@@ -703,16 +703,16 @@ static VbaFormatInfo pFormatInfoTable[] =
VBA_FORMAT_OFFSET( "dddddd", NF_DATE_SYSTEM_LONG ), VBA_FORMAT_OFFSET( "dddddd", NF_DATE_SYSTEM_LONG ),
VBA_FORMAT_USERDEFINED( "ttttt", "H:MM:SS AM/PM" ), VBA_FORMAT_USERDEFINED( "ttttt", "H:MM:SS AM/PM" ),
VBA_FORMAT_OFFSET( "ww", NF_DATE_WW ), VBA_FORMAT_OFFSET( "ww", NF_DATE_WW ),
{ VBA_FORMAT_TYPE_NULL, 0, NF_INDEX_TABLE_ENTRIES, 0 } { VBA_FORMAT_TYPE_NULL, OUString(""), NF_INDEX_TABLE_ENTRIES, 0 }
}; };
VbaFormatInfo* getFormatInfo( const String& rFmt ) VbaFormatInfo* getFormatInfo( const OUString& rFmt )
{ {
VbaFormatInfo* pInfo = NULL; VbaFormatInfo* pInfo = NULL;
sal_Int16 i = 0; sal_Int16 i = 0;
while( (pInfo = pFormatInfoTable + i )->mpVbaFormat != NULL ) while( (pInfo = pFormatInfoTable + i )->meType != VBA_FORMAT_TYPE_NULL )
{ {
if( rFmt.EqualsIgnoreCaseAscii( pInfo->mpVbaFormat ) ) if( rFmt.equalsIgnoreAsciiCase( pInfo->mpVbaFormat ) )
break; break;
i++; i++;
} }

2
basic/source/uno/namecont.cxx
View File

@@ -1687,7 +1687,7 @@ bool SfxLibraryContainer::implLoadLibraryIndexFile( SfxLibrary* pLib,
if( bStorage ) if( bStorage )
{ {
aLibInfoPath = maInfoFileName; aLibInfoPath = maInfoFileName;
aLibInfoPath += String( "-lb.xml" ); aLibInfoPath += "-lb.xml";
try try
{ {