[Libreoffice-commits] core.git: editeng/source

[Julien Nabet]

 editeng/source/accessibility/AccessibleEditableTextPara.cxx |    2 -
 editeng/source/editeng/textconv.cxx                         |   16 ++----------
 2 files changed, 4 insertions(+), 14 deletions(-)

New commits:
commit 1570957ff9269a13eb8e8f28d1bddf1939a21a5f
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Jan 17 14:20:23 2016 +0100

    cppcheck: fix 2 variableScope reports in editeng
    
    Change-Id: Ic87c5b1d8f96b7f25ce323a49455d1ac16d1bf86
    Reviewed-on: https://gerrit.libreoffice.org/21533
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 9781f93..7af42df 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -1711,9 +1711,9 @@ namespace accessibility
                 }
             }
         }
-        bool bExtend = false;
         if( nFoundFieldIndex >= 0 )
         {
+            bool bExtend = false;
             if( Segment.SegmentEnd < reeEnd )
             {
                 Segment.SegmentEnd  = reeEnd;
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index 7807714..6cb62f5 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -120,22 +120,12 @@ void TextConvWrapper::FindConvText_impl()
 {
     // modified version of SvxSpellWrapper::FindSpellError
 
-    bool bFound = false;
-
     m_pWin->EnterWait();
-    bool bConvert = true;
 
-    while ( bConvert )
+    while ( true )
     {
-        bFound = ConvContinue_impl();
-        if (bFound)
-        {
-            bConvert = false;
-        }
-        else
-        {
-            bConvert = ConvNext_impl();
-        }
+        if (ConvContinue_impl() || !ConvNext_impl())
+            break;
     }
     m_pWin->LeaveWait();
 }