[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - cui/inc cui/source

[Muhammet Kara (via logerrit)]

 cui/inc/strings.hrc                    |    1 +
 cui/source/options/personalization.cxx |   10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 872e2463da2c3f0f50536fbf68a594631e9a7740
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Sat Feb 16 20:35:28 2019 +0300
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Wed Apr 24 14:33:44 2019 +0200

    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 at collabora.com>
    Tested-by: Jenkins
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
    (cherry picked from commit 0d28abe085293604eb3127626da9c5a520b25c21)
    Reviewed-on: https://gerrit.libreoffice.org/71106
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index c9da7de87511..78b3c012be5d 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -372,6 +372,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 625362004fe6..a6c247049e9e 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -417,10 +417,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)
     {