[Libreoffice-commits] core.git: avmedia/source basctl/source

[Ádám Csaba Király]

 avmedia/source/framework/mediaplayer.cxx  |    2 +-
 avmedia/source/framework/mediatoolbox.cxx |    2 +-
 basctl/source/basicide/basicbox.cxx       |   20 ++++++++++----------
 basctl/source/basicide/basicbox.hxx       |    8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 30e14d7d3a70f0b5f5a6163d122e501cc5edc334
Author: Ádám Csaba Király <kiraly.adam.csaba at gmail.com>
Date:   Fri Mar 1 19:08:22 2013 +0100

    fdo#38838, change String to OUString
    
    Change-Id: I373f5d2f453dff83141a4cdaeed94ce0268bf70c
    Reviewed-on: https://gerrit.libreoffice.org/2497
    Reviewed-by: Andras Timar <atimar at suse.com>
    Tested-by: Andras Timar <atimar at suse.com>

diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index bff0a71..77570ea 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -67,7 +67,7 @@ MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, Window
 
     SetPosSizePixel( Point( 0, 0 ), aSize );
     SetMinOutputSizePixel( aSize );
-    SetText( String( AVMEDIA_RESID( AVMEDIA_STR_MEDIAPLAYER ) ) );
+    SetText( OUString( AVMEDIA_RESID( AVMEDIA_STR_MEDIAPLAYER ) ) );
     implInit();
     mpMediaWindow->show();
 }
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index 7524c24..b0d859a 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -111,7 +111,7 @@ void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eSta
     if( eState == SFX_ITEM_DISABLED )
     {
         pCtrl->Enable( false, false );
-        pCtrl->SetText( String() );
+        pCtrl->SetText( OUString() );
 
         const MediaItem aEmptyMediaItem( 0, AVMEDIA_SETMASK_ALL );
         pCtrl->setState( aEmptyMediaItem );
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 0d869ab..375b6ac 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -175,8 +175,8 @@ void LibBox::Update( const SfxStringItem* pItem )
     if ( pItem )
     {
         aCurText = pItem->GetValue();
-        if ( aCurText.Len() == 0 )
-            aCurText = String( IDEResId( RID_STR_ALL ) );
+        if ( aCurText.isEmpty() )
+            aCurText = OUString( IDEResId( RID_STR_ALL ) );
     }
 
     if ( GetSelectEntry() != aCurText )
@@ -209,8 +209,8 @@ void LibBox::FillBox()
     ClearBox();
 
     // create list box entries
-    sal_uInt16 nPos = InsertEntry( String( IDEResId( RID_STR_ALL ) ), LISTBOX_APPEND );
-    SetEntryData( nPos, new LibEntry( ScriptDocument::getApplicationScriptDocument(), LIBRARY_LOCATION_UNKNOWN, String() ) );
+    sal_uInt16 nPos = InsertEntry( OUString( IDEResId( RID_STR_ALL ) ), LISTBOX_APPEND );
+    SetEntryData( nPos, new LibEntry( ScriptDocument::getApplicationScriptDocument(), LIBRARY_LOCATION_UNKNOWN, OUString() ) );
     InsertEntries( ScriptDocument::getApplicationScriptDocument(), LIBRARY_LOCATION_USER );
     InsertEntries( ScriptDocument::getApplicationScriptDocument(), LIBRARY_LOCATION_SHARE );
 
@@ -243,11 +243,11 @@ void LibBox::InsertEntries( const ScriptDocument& rDocument, LibraryLocation eLo
 
     for ( sal_Int32 i = 0 ; i < nLibCount ; ++i )
     {
-        String aLibName = pLibNames[ i ];
+        OUString aLibName = pLibNames[ i ];
         if ( eLocation == rDocument.getLibraryLocation( aLibName ) )
         {
-            String aName( rDocument.getTitle( eLocation ) );
-            String aEntryText( CreateMgrAndLibStr( aName, aLibName ) );
+            OUString aName( rDocument.getTitle( eLocation ) );
+            OUString aEntryText( CreateMgrAndLibStr( aName, aLibName ) );
             sal_uInt16 nPos = InsertEntry( aEntryText, LISTBOX_APPEND );
             SetEntryData( nPos, new LibEntry( rDocument, eLocation, aLibName ) );
         }
@@ -317,7 +317,7 @@ void LibBox::NotifyIDE()
     {
         ScriptDocument aDocument( pEntry->GetDocument() );
         SfxUsrAnyItem aDocumentItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, uno::makeAny( aDocument.getDocumentOrNull() ) );
-        String aLibName = pEntry->GetLibName();
+        OUString aLibName = pEntry->GetLibName();
         SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
         if (SfxDispatcher* pDispatcher = GetDispatcher())
             pDispatcher->Execute(
@@ -417,10 +417,10 @@ void LanguageBox::FillBox()
             bool bIsDefault = localesAreEqual( aDefaultLocale, pLocale[i] );
             bool bIsCurrent = localesAreEqual( aCurrentLocale, pLocale[i] );
             LanguageType eLangType = LanguageTag( pLocale[i] ).getLanguageType();
-            String sLanguage = aLangTable.GetString( eLangType );
+            OUString sLanguage = aLangTable.GetString( eLangType );
             if ( bIsDefault )
             {
-                sLanguage += ' ';
+                sLanguage += " ";
                 sLanguage += m_sDefaultLanguageStr;
             }
             sal_uInt16 nPos = InsertEntry( sLanguage );
diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx
index a19ec43..54f476d 100644
--- a/basctl/source/basicide/basicbox.hxx
+++ b/basctl/source/basicide/basicbox.hxx
@@ -76,7 +76,7 @@ private:
 class LibBox : public DocListenerBox
 {
 private:
-    String          aCurText;
+    OUString        aCurText;
     bool            bIgnoreSelect;
     bool            bFillBox;
     com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
@@ -118,9 +118,9 @@ public:
 class LanguageBox : public DocListenerBox
 {
 private:
-    String          m_sNotLocalizedStr;
-    String          m_sDefaultLanguageStr;
-    String          m_sCurrentText;
+    OUString        m_sNotLocalizedStr;
+    OUString        m_sDefaultLanguageStr;
+    OUString        m_sCurrentText;
 
     bool            m_bIgnoreSelect;