diff options
| author | Ádám Csaba Király <kiraly.adam.csaba@gmail.com> | 2013-03-01 19:08:22 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-03-04 18:20:24 +0000 |
| commit | 30e14d7d3a70f0b5f5a6163d122e501cc5edc334 (patch) | |
| tree | b75bb158f51ec3498acd097a5dd061f48e4f4e36 /avmedia | |
| parent | 11109e8ab8cfa49750d0a2adc3afe3a8a0fc0b48 (diff) | |
fdo#38838, change String to OUString
Change-Id: I373f5d2f453dff83141a4cdaeed94ce0268bf70c
Reviewed-on: https://gerrit.libreoffice.org/2497
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/framework/mediaplayer.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/framework/mediatoolbox.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index bff0a71a0a52..77570ea149bd 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 7524c24c653b..b0d859a4033b 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 ); |