diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-06 23:34:23 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-07 02:14:53 -0600 |
| commit | 27239ad23006b1fd1ddb21467f4c1fd637b560d5 (patch) | |
| tree | 605b30a50f25ef7e8f0d6511d6df24790ece90b9 /basctl | |
| parent | f510217832a6edaf6a44169cabdf739985d00125 (diff) | |
basic: String -> OUString
Change-Id: I42479b4bade5111e38d69f04c889c166f340d5ba
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/baside2b.cxx | 12 | ||||
| -rw-r--r-- | basctl/source/basicide/basidesh.cxx | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index a56956500fa3..1ef15c52e05d 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -358,7 +358,7 @@ void EditorWindow::RequestHelp( const HelpEvent& rHEvt ) if ( !aHelpText.Len() ) // name is not copied with the passed parameters aHelpText = aWord; aHelpText += '='; - aHelpText += pVar->GetString(); + aHelpText += pVar->GetOUString(); } } if ( aHelpText.Len() ) @@ -1567,7 +1567,7 @@ void StackWindow::UpdateCalls() { SbxVariable* pVar = pParams->Get( nParam ); DBG_ASSERT( pVar, "Parameter?!" ); - if ( pVar->GetName().Len() ) + if ( !pVar->GetName().isEmpty() ) { aEntry += pVar->GetName(); } @@ -1586,7 +1586,9 @@ void StackWindow::UpdateCalls() aEntry += OUString( "..." ); } else if( eType != SbxOBJECT ) - aEntry += pVar->GetString(); + { + aEntry += pVar->GetOUString(); + } if ( nParam < ( pParams->Count() - 1 ) ) { aEntry += OUString( ", " ); @@ -2181,8 +2183,10 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped ) bool bString = ((sal_uInt8)eType == (sal_uInt8)SbxSTRING); OUString aStrStr( "\"" ); if( bString ) + { aWatchStr += aStrStr; - aWatchStr += pVar->GetString(); + } + aWatchStr += pVar->GetOUString(); if( bString ) { aWatchStr += aStrStr; diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 58d71de8b30b..ed86cca52bce 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -831,7 +831,7 @@ void Shell::RemoveWindow( BaseWindow* pWindow_, bool bDestroy, bool bAllowChange if ( pWindow_->GetDocument().isInVBAMode() ) { SbModule* pMod = StarBASIC::GetActiveModule(); - if ( !pMod || ( pMod && ( !pMod->GetName().Equals(pWindow_->GetName()) ) ) ) + if ( !pMod || ( pMod && ( !pMod->GetName().equals(pWindow_->GetName()) ) ) ) { bStop = false; } |