vcl/source/outdev/text.cxx | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 57da9541f43a01500e1da919498d32a8e974c800
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Nov 10 16:06:10 2015 +0100
Revert "vcl: Assert that a non-negative nXPos is always found"
This reverts commit e3bd0951e6b8e8889aabc8640c5641ab32300517,
the newly added assert fires during JunitTest_forms_unoapi_2.
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index c37951e..9a745be 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1124,7 +1124,6 @@ bool OutputDevice::GetCaretPositions( const OUString&
rStr, long* pCaretXArray,
for( i = 0; i < 2 * nLen; ++i )
if( pCaretXArray[ i ] >= 0 )
break;
- assert(i < 2 * nLen); // otherwise i may go beyond the end of pCaretXArray
long nXPos = pCaretXArray[ i ];
for( i = 0; i < 2 * nLen; ++i )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
