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

fix String->OUString conversion

Browse Source 
OUString::valueOf(sal_uInt16) means OUString::valueOf(sal_Unicode),
we want OUString::valueOf(sal_Int32)

regression from 2cb8883cfd

Change-Id: Ie1ea4de258b9f94f1c0cfec4335512e15be02e68
This commit is contained in:
Ivan Timofeev
2012-12-01 19:07:45 +04:00
parent 1611806226
commit 02a236be61
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cui/source/tabpages/numfmt.cxx
View File

@@ -1014,8 +1014,8 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa
aEdLeadZeroes.Enable(); aEdLeadZeroes.Enable();
aBtnNegRed.Enable(); aBtnNegRed.Enable();
aBtnThousand.Enable(); aBtnThousand.Enable();
aEdDecimals .SetText( OUString::valueOf( nDecimals ) ); aEdDecimals .SetText( OUString::valueOf( static_cast<sal_Int32>(nDecimals) ) );
aEdLeadZeroes.SetText( OUString::valueOf( nZeroes ) ); aEdLeadZeroes.SetText( OUString::valueOf( static_cast<sal_Int32>(nZeroes) ) );
aBtnNegRed .Check( bNegRed ); aBtnNegRed .Check( bNegRed );
aBtnThousand .Check( bThousand ); aBtnThousand .Check( bThousand );
break; break;

8
cui/source/tabpages/numpages.cxx
View File

@@ -1280,11 +1280,11 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
if(!aLevelLB.GetEntryCount()) if(!aLevelLB.GetEntryCount())
{ {
for(sal_uInt16 i = 1; i <= pSaveNum->GetLevelCount(); i++) for(sal_uInt16 i = 1; i <= pSaveNum->GetLevelCount(); i++)
aLevelLB.InsertEntry( OUString::valueOf(i)); aLevelLB.InsertEntry( OUString::valueOf(static_cast<sal_Int32>(i)));
if(pSaveNum->GetLevelCount() > 1) if(pSaveNum->GetLevelCount() > 1)
{ {
OUString sEntry( "1 - " ); OUString sEntry( "1 - " );
sEntry += OUString::valueOf( pSaveNum->GetLevelCount() ); sEntry += OUString::valueOf( static_cast<sal_Int32>(pSaveNum->GetLevelCount()) );
aLevelLB.InsertEntry(sEntry); aLevelLB.InsertEntry(sEntry);
aLevelLB.SelectEntry(sEntry); aLevelLB.SelectEntry(sEntry);
} }
@@ -3044,11 +3044,11 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet )
if(!aLevelLB.GetEntryCount()) if(!aLevelLB.GetEntryCount())
{ {
for(sal_uInt16 i = 1; i <= pSaveNum->GetLevelCount(); i++) for(sal_uInt16 i = 1; i <= pSaveNum->GetLevelCount(); i++)
aLevelLB.InsertEntry( OUString::valueOf(i) ); aLevelLB.InsertEntry( OUString::valueOf(static_cast<sal_Int32>(i)) );
if(pSaveNum->GetLevelCount() > 1) if(pSaveNum->GetLevelCount() > 1)
{ {
OUString sEntry( "1 - " ); OUString sEntry( "1 - " );
sEntry += OUString::valueOf( pSaveNum->GetLevelCount() ); sEntry += OUString::valueOf( static_cast<sal_Int32>(pSaveNum->GetLevelCount()) );
aLevelLB.InsertEntry(sEntry); aLevelLB.InsertEntry(sEntry);
aLevelLB.SelectEntry(sEntry); aLevelLB.SelectEntry(sEntry);
} }