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

[Caolán McNamara]

 setup_native/source/win32/customactions/sellang/sellang.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2116ca54115ddf9877b1cbd7f269a554a0760749
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 2 10:48:33 2015 +0000

    V804: Decreased performance
    
    Change-Id: Iee15e6f2a08447ccbb82b39146cd5ade68e82b1e
    Reviewed-on: https://gerrit.libreoffice.org/14711
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx
index e9b644a..9c6ab53 100644
--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -33,6 +33,7 @@
 
 #include <sal/macros.h>
 #include <systools/win32/uwinapi.h>
+#include <algorithm>
 
 #include "spellchecker_selection.hxx"
 
@@ -184,7 +185,7 @@ static BOOL
 present_in_ui_langs(const char *lang)
 {
     for (int i = 0; i < num_ui_langs; i++)
-        if (memcmp (ui_langs[i], lang, ( strlen(ui_langs[i]) >= strlen(lang) ) ? strlen(lang) : strlen(ui_langs[i]) ) == 0)
+        if (memcmp (ui_langs[i], lang, std::min(strlen(ui_langs[i]), strlen(lang))) == 0)
             return TRUE;
     return FALSE;
 }