summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammet Kara <muhammet.kara@collabora.com>2019-02-16 20:35:28 +0300
committerMuhammet Kara <muhammet.kara@collabora.com>2019-04-23 09:08:04 +0200
commit0d28abe085293604eb3127626da9c5a520b25c21 (patch)
tree91d54acf193683b19f5f3abda746218763528c98
parentb34786d2774b261be48de92f65a5d0aa3c32b289 (diff)
tdf#123228: Disable Firefox theme search
We can't use the MOZ API anymore. Let's disable it instead of showing a broken search window. Then we can spend some time on moving on instead of answering the -This is not working!- bug reports. Change-Id: Ice10bde804d1d9a7a13cd4781813fc794b1b0967 Reviewed-on: https://gerrit.libreoffice.org/67917 Tested-by: Muhammet Kara <muhammet.kara@collabora.com> Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
-rw-r--r--cui/inc/strings.hrc1
-rw-r--r--cui/source/options/personalization.cxx10
2 files changed, 8 insertions, 3 deletions
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 6627ad93bc44..7c32af629907 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -368,6 +368,7 @@
#define RID_SVXSTR_NORESULTS NC_("RID_SVXSTR_NORESULTS", "No results found.")
#define RID_SVXSTR_APPLYPERSONA NC_("RID_SVXSTR_APPLYPERSONA", "Applying Theme...")
#define RID_SVXSTR_INVALIDPERSONAURL NC_("RID_SVXSTR_INVALIDPERSONAURL", "Please enter a valid theme address or a search term.")
+#define RID_SVXSTR_MOZAPIUNREACHABLE NC_("RID_SVXSTR_MOZAPIUNREACHABLE", "The Mozilla Themes API is currently unavailable.")
#define RID_SVXSTR_TABLE_PRESET_NONE NC_("RID_SVXSTR_TABLE_PRESET_NONE", "Set No Borders")
#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Set Outer Border Only")
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 7ba962d11eea..b1f9d3f38e4e 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -399,10 +399,14 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( vcl::Window *pParent, cons
get( m_pAppliedThemeLabel, "applied_theme_link" );
get( m_pOwnPersona, "own_persona" );
- m_pOwnPersona->SetClickHdl( LINK( this, SvxPersonalizationTabPage, ForceSelect ) );
-
get( m_pSelectPersona, "select_persona" );
- m_pSelectPersona->SetClickHdl( LINK( this, SvxPersonalizationTabPage, SelectPersona ) );
+
+ // Mozilla API and the Mozilla personas are no longer useful for us
+ // We will probably remove this altogether before 6.3
+ m_pSelectPersona->Disable();
+ m_pOwnPersona->Disable();
+ m_pSelectPersona->SetQuickHelpText( CuiResId( RID_SVXSTR_MOZAPIUNREACHABLE ) );
+ m_pOwnPersona->SetQuickHelpText( CuiResId( RID_SVXSTR_MOZAPIUNREACHABLE ) );
for (sal_uInt32 i = 0; i < MAX_DEFAULT_PERSONAS; ++i)
{