From 27239ad23006b1fd1ddb21467f4c1fd637b560d5 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Tue, 6 Nov 2012 23:34:23 -0600
Subject: basic: String -> OUString

Change-Id: I42479b4bade5111e38d69f04c889c166f340d5ba
---
 basctl/source/basicide/baside2b.cxx | 12 ++++++++----
 basctl/source/basicide/basidesh.cxx |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'basctl')

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;
                 }
-- 
cgit