diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-12-01 19:07:45 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-12-01 19:16:07 +0400 |
| commit | 02a236be613b5b5fae1412bb01e28c0ba1d6b725 (patch) | |
| tree | 562456abc3ad7536a02bb5d0d16877c07fe759dd /cui | |
| parent | 1611806226329e5532e6393d0ac2275d7e99eb61 (diff) | |
fix String->OUString conversion
OUString::valueOf(sal_uInt16) means OUString::valueOf(sal_Unicode),
we want OUString::valueOf(sal_Int32)
regression from 2cb8883cfd1c6ffe293497f064f90f76d12eff32
Change-Id: Ie1ea4de258b9f94f1c0cfec4335512e15be02e68
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/numfmt.cxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/numpages.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 12c267b028a9..fd4cd155f612 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1014,8 +1014,8 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa aEdLeadZeroes.Enable(); aBtnNegRed.Enable(); aBtnThousand.Enable(); - aEdDecimals .SetText( OUString::valueOf( nDecimals ) ); - aEdLeadZeroes.SetText( OUString::valueOf( nZeroes ) ); + aEdDecimals .SetText( OUString::valueOf( static_cast<sal_Int32>(nDecimals) ) ); + aEdLeadZeroes.SetText( OUString::valueOf( static_cast<sal_Int32>(nZeroes) ) ); aBtnNegRed .Check( bNegRed ); aBtnThousand .Check( bThousand ); break; diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 05efd9579abd..e1f3f8235b41 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1280,11 +1280,11 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) if(!aLevelLB.GetEntryCount()) { 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) { OUString sEntry( "1 - " ); - sEntry += OUString::valueOf( pSaveNum->GetLevelCount() ); + sEntry += OUString::valueOf( static_cast<sal_Int32>(pSaveNum->GetLevelCount()) ); aLevelLB.InsertEntry(sEntry); aLevelLB.SelectEntry(sEntry); } @@ -3044,11 +3044,11 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet ) if(!aLevelLB.GetEntryCount()) { 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) { OUString sEntry( "1 - " ); - sEntry += OUString::valueOf( pSaveNum->GetLevelCount() ); + sEntry += OUString::valueOf( static_cast<sal_Int32>(pSaveNum->GetLevelCount()) ); aLevelLB.InsertEntry(sEntry); aLevelLB.SelectEntry(sEntry); } |