diff options
author | Noel Grandin <noel@peralex.com> | 2013-09-11 10:24:01 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-09-11 10:24:49 +0200 |
commit | 91bacda04a4d90bad346110339542527384c9888 (patch) | |
tree | d67089c27e673e92a16ead3264159a46c914be8b /editeng | |
parent | Put Mac OS X program -> MacOS symlink into instdir (diff) | |
download | core-91bacda04a4d90bad346110339542527384c9888.tar.gz core-91bacda04a4d90bad346110339542527384c9888.zip |
fix windows build after my OUString change
std::max on windows doesn't like mixing int and sal_Int32
Change-Id: I0ad74f72d48a4bc7fea2d7d8a57e3d2f0b7d7bca
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/uno/unoedprx.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index c8c5398b44ed..735ca946f704 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; |