Kaydet (Commit) 91bacda0 authored tarafından Noel Grandin's avatar Noel Grandin

fix windows build after my OUString change

std::max on windows doesn't like mixing int and sal_Int32

Change-Id: I0ad74f72d48a4bc7fea2d7d8a57e3d2f0b7d7bca
üst 7f537343
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment