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

[Julien Nabet]

 cui/source/options/personalization.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit a8a7b7114d96b2013b00e9bc0ced81aad5495457
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Sep 1 21:47:05 2016 +0200

    Revert "tdf#101629: fix https://addons.mozilla.org/ case"
    
    This reverts commit 454e1ebcfc589ce82c8c2d5585e22bea1ea5fc79.
    
    Change-Id: Id296e622dc8e14bd20549325d890196d8d36b1a5
    Reviewed-on: https://gerrit.libreoffice.org/28605
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 29a7ac4..4b2658f 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -160,11 +160,9 @@ IMPL_LINK_TYPED( SelectPersonaDialog, SearchPersonas, Button*, pButton, void )
     // 15 results so that invalid and duplicate search results whose names can't be retrieved can be skipped
     OUString rSearchURL = "https://services.addons.mozilla.org/en-US/firefox/api/1.5/search/" + searchTerm + "/9/15";
 
-    sal_Int32 nIndexOfFirefox = searchTerm.indexOf( "firefox" );
-
-    if ( searchTerm.startsWith( "https://addons.mozilla.org/" ) && nIndexOfFirefox != -1 )
+    if ( searchTerm.startsWith( "https://addons.mozilla.org/" ) )
     {
-        searchTerm = "https://addons.mozilla.org/en-US/" + searchTerm.copy( nIndexOfFirefox );
+        searchTerm = "https://addons.mozilla.org/en-US/" + searchTerm.copy( searchTerm.indexOf( "firefox" ) );
         m_pSearchThread = new SearchAndParseThread( this, searchTerm, true );
     }
     else