[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - Makefile.fetch sw/source

[Andras Timar (via logerrit)]

 Makefile.fetch                 |    2 +-
 sw/source/ui/misc/glossary.cxx |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4a88b778714759f43cafc12d878a42d70ed3ade2
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Feb 22 15:35:44 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Jul 9 09:58:51 2019 +0200

    cURL: follow redirects
    
    Change-Id: I58d25348f4b43145a19ca0edbc5cde2e9a57f468
    Reviewed-on: https://gerrit.libreoffice.org/68213
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/75239
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/Makefile.fetch b/Makefile.fetch
index 12fb6abd9638..5cede33b7de8 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -16,7 +16,7 @@ endef
 
 else
 define fetch_Download__wget_command
-&& echo fetching $2 && bash -c '$(CURL) -O $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]'
+&& echo fetching $2 && bash -c '$(CURL) -L -O $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]'
 endef
 
 endif
commit d5fd631813ccf405dba79fd9b2d5499a79b59b94
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Apr 4 23:04:44 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Jul 9 09:58:40 2019 +0200

    respect read-only config item: AutoFunction/Text/ShowToolTip
    
    Change-Id: Ib808e35d3cc3c2895993193ac6ed05d556c1857d
    Reviewed-on: https://gerrit.libreoffice.org/70278
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/75238
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 32cb5103562a..89c38d7e67bd 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -71,6 +71,8 @@
 #include <strings.hrc>
 #include <iodetect.hxx>
 
+#include <officecfg/Office/Writer.hxx>
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
@@ -762,6 +764,7 @@ void SwGlossaryDlg::Init()
     m_pNetRelCB->Check( rCfg.IsSaveRelNet() );
     m_pNetRelCB->SetClickHdl(LINK(this, SwGlossaryDlg, CheckBoxHdl));
     m_pInsertTipCB->Check( rCfg.IsAutoTextTip() );
+    m_pInsertTipCB->Enable(!officecfg::Office::Writer::AutoFunction::Text::ShowToolTip::isReadOnly());
     m_pInsertTipCB->SetClickHdl(LINK(this, SwGlossaryDlg, CheckBoxHdl));
 }