[Libreoffice-commits] core.git: editeng/source

[Noel Grandin]

 editeng/source/uno/unoedprx.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 91bacda04a4d90bad346110339542527384c9888
Author: Noel Grandin <n...@peralex.com>
Date:   Wed Sep 11 10:24:01 2013 +0200

    fix windows build after my OUString change
    
    std::max on windows doesn't like mixing int and sal_Int32
    
    Change-Id: I0ad74f72d48a4bc7fea2d7d8a57e3d2f0b7d7bca

diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index c8c5398..735ca94 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -215,7 +215,7 @@ void SvxAccessibleTextIndex::SetEEIndex( sal_uInt16 
nEEIndex, const SvxTextForwa
         }
 
         // #106010#
-        mnIndex += ::std::max(aFieldInfo.aCurrentText.getLength()-1, 0);
+        mnIndex += ::std::max(aFieldInfo.aCurrentText.getLength()-1, 
(sal_Int32)0);
     }
 }
 
@@ -269,13 +269,13 @@ void SvxAccessibleTextIndex::SetIndex( sal_Int32 nIndex, 
const SvxTextForwarder&
             break;
 
         // #106010#
-        mnEEIndex -= ::std::max(aFieldInfo.aCurrentText.getLength()-1, 0);
+        mnEEIndex -= ::std::max(aFieldInfo.aCurrentText.getLength()-1, 
(sal_Int32)0);
 
         // we're within a field
         if( aFieldInfo.aPosition.nIndex >= mnEEIndex )
         {
             AreInField();
-            SetFieldOffset( ::std::max(aFieldInfo.aCurrentText.getLength()-1, 
0) - (aFieldInfo.aPosition.nIndex - mnEEIndex),
+            SetFieldOffset( ::std::max(aFieldInfo.aCurrentText.getLength()-1, 
(sal_Int32)0) - (aFieldInfo.aPosition.nIndex - mnEEIndex),
                             aFieldInfo.aCurrentText.getLength() );
             mnEEIndex = aFieldInfo.aPosition.nIndex ;
             break;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits