diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-15 23:46:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-16 15:21:36 +0100 |
| commit | 2c676c03f3e09c12b8524f2a803374b9f68b2c83 (patch) | |
| tree | 0dfa4c691cdff2f7fbce4c50de5120430f876a61 /sfx2 | |
| parent | b046b108c3b50027846eed32f17b0d74cf9fa135 (diff) | |
String->rtl::OUString
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/docvor.cxx | 9 | ||||
| -rw-r--r-- | sfx2/source/doc/objmisc.cxx | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index e9ee57d4497b..6ab4cb41919e 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -1766,14 +1766,13 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( sal_uInt16 nId, Menu* _pMenu ) { if(0 == pFocusBox->GetModel()->GetDepth(pEntry)) { - const String aNoName( SfxResId(STR_NONAME) ); + const rtl::OUString aNoName(ResId::toString(SfxResId(STR_NONAME))); SvLBoxEntry* pParent = pFocusBox->GetParent(pEntry); - String aName(aNoName); - sal_uInt16 n = 1; + rtl::OUString aName(aNoName); + sal_Int32 n = 1; while(!pFocusBox->IsUniqName_Impl(aName, pParent)) { - aName = aNoName; - aName += String::CreateFromInt32( n++ ); + aName = aNoName + rtl::OUString::valueOf(n++); } aMgr.InsertDir( pFocusBox, aName, (sal_uInt16)pFocusBox->GetModel()->GetRelPos(pEntry)+1); diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 8c64f35d28ca..b7c8c51eb360 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -869,10 +869,12 @@ String SfxObjectShell::GetTitle return X(pImp->aTitle); // must it be numbered? - String aNoName( SfxResId( STR_NONAME ) ); - if ( pImp->bIsNamedVisible ) + rtl::OUString aNoName(ResId::toString(SfxResId(STR_NONAME))); + if (pImp->bIsNamedVisible) + { // Append number - aNoName += String::CreateFromInt32( pImp->nVisualDocumentNumber ); + aNoName += rtl::OUString::valueOf(static_cast<sal_Int32>(pImp->nVisualDocumentNumber)); + } // Document called "noname" for the time being return X(aNoName); |