[Libreoffice-commits] .: cui/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Nov 30 15:55:37 PST 2012


 cui/source/tabpages/numfmt.cxx  |    4 ++--
 cui/source/tabpages/page.cxx    |    2 +-
 cui/source/tabpages/tpcolor.cxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 399b92edc74cc06f800b17cd96059aa1f58e6501
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Dec 1 00:52:57 2012 +0100

    OUString::valueOf ambiguous overloads

diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 7bd349b..12c267b 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1036,8 +1036,8 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa
             aEdLeadZeroes   .Disable();
             aBtnNegRed      .Disable();
             aBtnThousand    .Disable();
-            aEdDecimals     .SetText( OUString::valueOf( 0 ) );
-            aEdLeadZeroes   .SetText( OUString::valueOf( 0 ) );
+            aEdDecimals     .SetText( OUString::valueOf( static_cast<sal_Int32>(0) ) );
+            aEdLeadZeroes   .SetText( OUString::valueOf( static_cast<sal_Int32>(0) ) );
             aBtnNegRed      .Check( sal_False );
             aBtnThousand    .Check( sal_False );
     }
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index b29d37b..50b6a57 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -944,7 +944,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl)
         {
             aName = aPaperBin;
             aName.Append( sal_Unicode(' ') );
-            aName.Append( OUString::valueOf( i+1 ) );
+            aName.Append( OUString::valueOf( static_cast<sal_Int32>(i+1) ) );
         }
         nEntryPos = aPaperTrayBox.InsertEntry( aName );
         aPaperTrayBox.SetEntryData( nEntryPos, (void*)(sal_uLong)i );
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 6893994..9f4f98d 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -1223,7 +1223,7 @@ sal_uInt16 SvxColorTabPage::PercentToColor_Impl( sal_uInt16 nPercent )
 void SvxColorTabPage::FillUserData()
 {
     // the color model is saved in the Ini-file
-    SetUserData( OUString::valueOf( eCM ) );
+    SetUserData( OUString::valueOf( static_cast<sal_Int32>(eCM) ) );
 }
 
 //------------------------------------------------------------------------


More information about the Libreoffice-commits mailing list