diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-08-24 22:22:45 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-08-24 22:23:19 +0400 |
| commit | 4d688beb2b2183ced387270e051dc25ee340fb4b (patch) | |
| tree | 9c32e2bb1bcfcaf0c1d1cae6b90d9bdd5f9d80b1 /sd/source/ui/func/fucopy.cxx | |
| parent | 72a3be3dd0983769f4d17f237844efd7536da7e1 (diff) | |
String->OUString
Change-Id: I43ab520187375d75009da43a2f75a541021fdbfb
Diffstat (limited to 'sd/source/ui/func/fucopy.cxx')
| -rw-r--r-- | sd/source/ui/func/fucopy.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index ff433b7be9c0..88616c4e00f0 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -65,9 +65,8 @@ void FuCopy::DoExecute( SfxRequest& rReq ) if( mpView->AreObjectsMarked() ) { // Undo - String aString( mpView->GetDescriptionOfMarkedObjects() ); - aString.Append( sal_Unicode(' ') ); - aString.Append( SD_RESSTR( STR_UNDO_COPYOBJECTS ) ); + OUString aString( mpView->GetDescriptionOfMarkedObjects() ); + aString += " " + SD_RESSTR( STR_UNDO_COPYOBJECTS ); mpView->BegUndo( aString ); const SfxItemSet* pArgs = rReq.GetArgs(); @@ -173,9 +172,8 @@ void FuCopy::DoExecute( SfxRequest& rReq ) if( nNumber > 1 ) { - String aStr( SdResId( STR_OBJECTS ) ); - aStr.Append( sal_Unicode(' ') ); - aStr.Append( SD_RESSTR( STR_UNDO_COPYOBJECTS ) ); + OUString aStr( SD_RESSTR( STR_OBJECTS ) ); + aStr += " " + SD_RESSTR( STR_UNDO_COPYOBJECTS ); pProgress = new SfxProgress( mpDocSh, aStr, nNumber ); mpDocSh->SetWaitCursor( sal_True ); @@ -212,7 +210,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) { SfxItemSet aNewSet( mpViewShell->GetPool(), XATTR_FILLSTYLE, XATTR_FILLCOLOR, 0L ); aNewSet.Put( XFillStyleItem( XFILL_SOLID ) ); - aNewSet.Put( XFillColorItem( String(), aStartColor ) ); + aNewSet.Put( XFillColorItem( OUString(), aStartColor ) ); mpView->SetAttributes( aNewSet ); } @@ -274,7 +272,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) Color aNewColor( nRed, nGreen, nBlue ); SfxItemSet aNewSet( mpViewShell->GetPool(), XATTR_FILLSTYLE, XATTR_FILLCOLOR, 0L ); aNewSet.Put( XFillStyleItem( XFILL_SOLID ) ); - aNewSet.Put( XFillColorItem( String(), aNewColor ) ); + aNewSet.Put( XFillColorItem( OUString(), aNewColor ) ); mpView->SetAttributes( aNewSet ); } } |