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

tdf#88502 Firefox Theme URL in custom theme search

Browse Source 
Removed "suggested" from categories label. Fixed
URL checking.

Change-Id: Ifbea40cf724c91f6af72c485d9ae7eb599afff65
Reviewed-on: https://gerrit.libreoffice.org/24716
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
This commit is contained in:
Susobhan Ghosh
2016-05-07 19:08:15 +05:30
committed by Adolfo Jayme Barrientos
parent d7859f40b0
commit 3f22f287b4
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cui/source/options/personalization.cxx
View File

@@ -154,8 +154,11 @@ IMPL_LINK_TYPED( SelectPersonaDialog, SearchPersonas, Button*, pButton, void )
// 15 results so that invalid and duplicate search results whose names can't be retreived can be skipped // 15 results so that invalid and duplicate search results whose names can't be retreived can be skipped
OUString rSearchURL = "https://services.addons.allizom.org/en-US/firefox/api/1.5/search/" + searchTerm + "/9/15"; OUString rSearchURL = "https://services.addons.allizom.org/en-US/firefox/api/1.5/search/" + searchTerm + "/9/15";
if ( searchTerm.startsWith( "https://addons.mozilla.org/en-US/firefox/addon" ) ) if ( searchTerm.startsWith( "https://addons.mozilla.org/" ) )
{
searchTerm = "https://addons.mozilla.org/en-US/" + searchTerm.copy( searchTerm.indexOf( "firefox" ) );
m_rSearchThread = new SearchAndParseThread( this, searchTerm, true ); m_rSearchThread = new SearchAndParseThread( this, searchTerm, true );
}
else else
m_rSearchThread = new SearchAndParseThread( this, rSearchURL, false ); m_rSearchThread = new SearchAndParseThread( this, rSearchURL, false );

2
cui/uiconfig/ui/select_persona_dialog.ui
View File

@@ -225,7 +225,7 @@
<object class="GtkLabel" id="label6"> <object class="GtkLabel" id="label6">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Suggested Categories</property> <property name="label" translatable="yes">Categories</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>