[Libreoffice-commits] core.git: 2 commits - sdext/source sw/source

[Caolán McNamara]

 sdext/source/presenter/PresenterHelpView.cxx |    4 ++--
 sw/source/core/tox/txmsrt.cxx                |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e5ab3685550cf35c3eb9cb47530044f2d86433d5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 6 09:19:18 2014 +0100

    Related: coverity#704049 Unchecked return value
    
    surely this should be IsLess not IsEqual, i.e.
    see
     commit 86a3fe47a66950e26d23d7d7f2680fa7d4fb0839
     Date:   Sat Oct 4 21:36:27 2014 -0500
     coverity#704049 Unchecked return value
    and
     commit 3edb1dcdc82304c418fc32212bb0bdf2c92e414e
     Date:   Wed Jun 26 08:32:38 2002 +0000
     #99877# Phonetic sorting for Asian languages
    
    Change-Id: I6c78e388e986577c34b37643a877ab7f5c17b173

diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index ee76ab1..d67d2ef 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -246,7 +246,7 @@ bool SwTOXSortTabBase::operator<( const SwTOXSortTabBase& rCmp )
                         // else -> compare AlternativeText
                         if( ( pEnd && pEndCmp ) || ( !pEnd && !pEndCmp ) )
                         {
-                            return pTOXIntl->IsEqual( GetTxt(), GetLocale(),
+                            return pTOXIntl->IsLess( GetTxt(), GetLocale(),
                                                       rCmp.GetTxt(), rCmp.GetLocale() );
                         }
                         if( pEnd && !pEndCmp )
commit 58ff30d1a1b9404255bb0dbca5ed52e8355292a4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 6 09:14:21 2014 +0100

    convert to floating point before divide
    
    Change-Id: I0328ca6594b3809210ea124dcb744bad3b5eb92e

diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index c7a429c..7152b9a 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -291,8 +291,8 @@ void PresenterHelpView::Paint (const awt::Rectangle& rUpdateBox)
     PresenterCanvasHelper::SetDeviceColor(aRenderState, mpFont->mnColor);
 
     mxCanvas->drawLine(
-            geometry::RealPoint2D((double)(aWindowBox.Width/2), gnVerticalBorder),
-            geometry::RealPoint2D((double)(aWindowBox.Width/2), mnSeparatorY - gnVerticalBorder),
+            geometry::RealPoint2D((aWindowBox.Width/2.0), gnVerticalBorder),
+            geometry::RealPoint2D((aWindowBox.Width/2.0), mnSeparatorY - gnVerticalBorder),
         aViewState,
         aRenderState);