Avoid assignment in complex if condition

Change-Id: Ibaff0eb54b67e946d07e5a626f5af04ac46132cc

Avoid assignment in complex if condition
Change-Id: Ibaff0eb54b67e946d07e5a626f5af04ac46132cc
54cbd46d · Matteo Casalin · 09baf615 · 54cbd46d
Kaydet (Commit) 54cbd46d authored Şub 15, 2014 tarafından Matteo Casalin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

wrong.cxx sw/source/core/text/wrong.cxx +5 -3

No files found.
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -99,9 +99,11 @@ void SwWrongList::ClearList()
 */
 bool SwWrongList::InWrongWord( sal_Int32 &rChk, sal_Int32 &rLn ) const
 {
-    MSHORT nPos = GetWrongPos( rChk );
+    const MSHORT nPos = GetWrongPos( rChk );
-    sal_Int32 nWrPos;
+    if ( nPos >= Count() )
-    if( nPos < Count() && ( nWrPos = Pos( nPos ) ) <= rChk )
+        return false;
+    const sal_Int32 nWrPos = Pos( nPos );
+    if ( nWrPos <= rChk )
    {
        rLn = Len( nPos );
        if( nWrPos + rLn <= rChk )