[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sal/rtl sc/source

[Markus Mohrhard]

 sal/rtl/source/math.cxx             |    4 +++-
 sc/source/ui/namedlg/namedefdlg.cxx |    1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit ce28801fa07065928a9fa704c126b296962b1357
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Dec 14 00:41:42 2011 +0000

    ManageNames: info text should be centered in the text field

diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx
index f57bd82..9f87047 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -96,6 +96,7 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParen
     maEdName.SetModifyHdl( LINK( this, ScNameDefDlg, NameModifyHdl ));
     maEdRange.SetGetFocusHdl( LINK( this, ScNameDefDlg, AssignGetFocusHdl ) );
 
+    maFtInfo.SetStyle(WB_VCENTER);
     maFtInfo.SetText(maStrInfoDefault);
 
     maBtnAdd.Disable(); // empty name is invalid
commit 661fce80de9203a63ee4018bbaadb91ab9c97f52
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Dec 12 23:09:42 2011 +0000

    fix crash for std::numeric_limits<int>::min() in our math lib impl

diff --git a/sal/rtl/source/math.cxx b/sal/rtl/source/math.cxx
index 947f733..67b3a51 100644
--- a/sal/rtl/source/math.cxx
+++ b/sal/rtl/source/math.cxx
@@ -59,7 +59,9 @@ static double getN10Exp( int nExp )
 {
     if ( nExp < 0 )
     {
-        if ( -nExp <= n10Count )
+        // && -nExp > 0 necessary for std::numeric_limits<int>::min()
+        // because -nExp = nExp
+        if ( -nExp <= n10Count && -nExp > 0 )
             return n10s[1][-nExp-1];
         else
             return pow( 10.0, static_cast<double>( nExp ) );