diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-04-24 23:53:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-25 11:58:26 +0100 |
commit | fe502c893e9d26945b9bba3d921a88b16fa0ef8f (patch) | |
tree | 74b103ac83a572b83cc6f4949c360908b40fb285 /sd | |
parent | callcatcher: remove freshly unused code (diff) | |
download | core-fe502c893e9d26945b9bba3d921a88b16fa0ef8f.tar.gz core-fe502c893e9d26945b9bba3d921a88b16fa0ef8f.zip |
String::CreateFromInt32->rtl::OUString::valueOf
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/core/drawdoc4.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/dlg/animobjs.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unolayer.cxx | 6 |
6 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index b8489bc94d49..6fce9ca1a991 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -1137,7 +1137,7 @@ String SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const aPageNumValue += sal_Unicode(' '); break; default: - aPageNumValue += String::CreateFromInt32( (sal_Int32)nNum ); + aPageNumValue += rtl::OUString::valueOf(static_cast<sal_Int32>(nNum)); } return(aPageNumValue); diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 542411ee6c6d..1f8698e9b4c3 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -664,7 +664,7 @@ Window * lcl_GetTopmostParent( Window * pWindow ) void CustomAnimationCreateDialog::setPosition() { SvtViewOptions aDlgOpt( - E_TABDIALOG, String::CreateFromInt32( DLG_CUSTOMANIMATION_CREATE ) ); + E_TABDIALOG, rtl::OUString::valueOf(static_cast<sal_Int32>(DLG_CUSTOMANIMATION_CREATE))); if ( aDlgOpt.Exists() ) { SetWindowState( rtl::OUStringToOString(aDlgOpt.GetWindowState(), @@ -692,7 +692,7 @@ void CustomAnimationCreateDialog::storePosition() { // save settings (screen position and current page) SvtViewOptions aDlgOpt( - E_TABDIALOG, String::CreateFromInt32( DLG_CUSTOMANIMATION_CREATE ) ); + E_TABDIALOG, rtl::OUString::valueOf(static_cast<sal_Int32>(DLG_CUSTOMANIMATION_CREATE))); aDlgOpt.SetWindowState(OStringToOUString( GetWindowState(WINDOWSTATE_MASK_POS), RTL_TEXTENCODING_ASCII_US)); } diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index a8ad199cadf8..049fa9f4059f 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -574,9 +574,9 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window mpMetric->SetMax( 100 ); mpMenu = new PopupMenu(); - for( sal_uInt16 i = 25; i < 101; i += 25 ) + for( sal_Int32 i = 25; i < 101; i += 25 ) { - String aStr( String::CreateFromInt32( i ) ); + String aStr(rtl::OUString::valueOf(i)); aStr += sal_Unicode('%'); mpMenu->InsertItem( i, aStr ); } diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index f4dd34084948..be53af694ed5 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -611,7 +611,7 @@ void AnimationWindow::UpdateControl( sal_uLong nListPos, sal_Bool bDisableCtrls aCtlDisplay.Invalidate(); aCtlDisplay.Update(); - aFiCount.SetText( UniString::CreateFromInt32( aBmpExList.Count() ) ); + aFiCount.SetText(rtl::OUString::valueOf(static_cast<sal_Int32>(aBmpExList.Count()))); if( pBitmapEx && !bMovie ) { diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index 2cd8f70df508..5cb1536303dd 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -331,7 +331,7 @@ void PageObjectPainter::PaintPageNumber ( // Paint the page number. OSL_ASSERT(rpDescriptor->GetPage()!=NULL); const sal_Int32 nPageNumber ((rpDescriptor->GetPage()->GetPageNum() - 1) / 2 + 1); - const String sPageNumber (String::CreateFromInt32(nPageNumber)); + const rtl::OUString sPageNumber(rtl::OUString::valueOf(nPageNumber)); rDevice.SetFont(*mpPageNumberFont); rDevice.SetTextColor(aPageNumberColor); rDevice.DrawText(aBox, sPageNumber, TEXT_DRAW_RIGHT | TEXT_DRAW_VCENTER); diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 125e2f4e0130..240708894634 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -534,15 +534,15 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal { SdrLayerAdmin& rLayerAdmin = mpModel->mpDoc->GetLayerAdmin(); sal_uInt16 nLayerCnt = rLayerAdmin.GetLayerCount(); - sal_uInt16 nLayer = nLayerCnt - 2 + 1; + sal_Int32 nLayer = nLayerCnt - 2 + 1; String aLayerName; // Ueberpruefung auf schon vorhandene Namen while( aLayerName.Len()==0 || rLayerAdmin.GetLayer( aLayerName, sal_False) ) { aLayerName = String(SdResId(STR_LAYER)); - aLayerName += String::CreateFromInt32( (sal_Int32)nLayer ); - nLayer++; + aLayerName += rtl::OUString::valueOf(nLayer); + ++nLayer; } SdrLayerAdmin& rLA=mpModel->mpDoc->GetLayerAdmin(); |