mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "WaE: logically last test always passes"

Browse Source 
This reverts commit 0b1f424833, which appears to
be a bogus fix (for a bogus warning?).  Also needs adaption a la
3c598c4064 "sal: work around spurious signed
overflow warnings."

Conflicts:

	sal/inc/rtl/ustring.hxx

Change-Id: I7e9d94fd93a37bb10604c1895ab619a8ac2c3f43
This commit is contained in:
Stephan Bergmann
2012-07-11 12:19:20 +02:00
parent f6413c384f
commit a23f7ddee2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sal/inc/rtl/ustring.hxx
View File

@@ -1314,7 +1314,9 @@ public:
*/ */
OUString copy( sal_Int32 beginIndex, sal_Int32 count ) const SAL_THROW(()) OUString copy( sal_Int32 beginIndex, sal_Int32 count ) const SAL_THROW(())
{ {
assert(beginIndex >= 0 && beginIndex <= getLength() && count >= 0); assert(beginIndex >= 0 && beginIndex <= getLength() && count >= 0
&& sal::static_int_cast< sal_uInt32 >(count) <=
sal::static_int_cast< sal_uInt32 >(getLength() - beginIndex));
if ( (beginIndex == 0) && (count == getLength()) ) if ( (beginIndex == 0) && (count == getLength()) )
return *this; return *this;
else else