mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

String->rtl::OUString

Browse Source
This commit is contained in:
Caolán McNamara
2012-04-15 23:46:14 +01:00
parent b046b108c3
commit 2c676c03f3
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sfx2/source/doc/docvor.cxx
View File

@@ -1766,14 +1766,13 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( sal_uInt16 nId, Menu* _pMenu )
{ {
if(0 == pFocusBox->GetModel()->GetDepth(pEntry)) 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); SvLBoxEntry* pParent = pFocusBox->GetParent(pEntry);
String aName(aNoName); rtl::OUString aName(aNoName);
sal_uInt16 n = 1; sal_Int32 n = 1;
while(!pFocusBox->IsUniqName_Impl(aName, pParent)) while(!pFocusBox->IsUniqName_Impl(aName, pParent))
{ {
aName = aNoName; aName = aNoName + rtl::OUString::valueOf(n++);
aName += String::CreateFromInt32( n++ );
} }
aMgr.InsertDir( pFocusBox, aName, aMgr.InsertDir( pFocusBox, aName,
(sal_uInt16)pFocusBox->GetModel()->GetRelPos(pEntry)+1); (sal_uInt16)pFocusBox->GetModel()->GetRelPos(pEntry)+1);

8
sfx2/source/doc/objmisc.cxx
View File

@@ -869,10 +869,12 @@ String SfxObjectShell::GetTitle
return X(pImp->aTitle); return X(pImp->aTitle);
// must it be numbered? // must it be numbered?
String aNoName( SfxResId( STR_NONAME ) ); rtl::OUString aNoName(ResId::toString(SfxResId(STR_NONAME)));
if ( pImp->bIsNamedVisible ) if (pImp->bIsNamedVisible)
{
// Append number // Append number
aNoName += String::CreateFromInt32( pImp->nVisualDocumentNumber ); aNoName += rtl::OUString::valueOf(static_cast<sal_Int32>(pImp->nVisualDocumentNumber));
}
// Document called "noname" for the time being // Document called "noname" for the time being
return X(aNoName); return X(aNoName);