[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/tabpages/numfmt.cxx   |    4 ++--
 cui/source/tabpages/numpages.cxx |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 02a236be613b5b5fae1412bb01e28c0ba1d6b725
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Sat Dec 1 19:07:45 2012 +0400

    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

diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 12c267b..fd4cd15 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 05efd95..e1f3f82 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);
         }