[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - svx/source svx/uiconfig

[Andras Timar (via logerrit)]

 svx/source/dialog/crashreportdlg.cxx |    3 +--
 svx/source/dialog/crashreportdlg.hxx |    2 +-
 svx/uiconfig/ui/crashreportdlg.ui    |    7 ++-----
 3 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 6d166595c370fb221a286d1ee98ebc3081127cf5
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri May 5 16:20:35 2017 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Sep 17 12:53:39 2019 +0200

    don't show inaccessible crashreport links
    
    (cherry picked from commit 0d045c85fb8dbdb7fa2e116ef9983e0a60bd2b99)
    
    Change-Id: I3c4ed28cb1a02049fb009f576943f80b8ba8e627
    Reviewed-on: https://gerrit.libreoffice.org/78403
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx
index 21581b0a865c..248aab0f2e59 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -30,7 +30,7 @@ CrashReportDialog::CrashReportDialog(vcl::Window* pParent):
     get(mpBtnCancel, "btn_cancel");
     get(mpBtnClose, "btn_close");
     get(mpEditPreUpload, "ed_pre");
-    get(mpEditPostUpload, "ed_post");
+    get(mpEditPostUpload, "ft_post");
     get(mpBugReportMailto, "bugreport_mailto");
     get(mpCBSafeMode, "check_safemode");
 
@@ -39,7 +39,6 @@ CrashReportDialog::CrashReportDialog(vcl::Window* pParent):
     mpBtnSend->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
     mpBtnCancel->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
     mpBtnClose->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
-    mpEditPostUpload->SetReadOnly();
 }
 
 CrashReportDialog::~CrashReportDialog()
diff --git a/svx/source/dialog/crashreportdlg.hxx b/svx/source/dialog/crashreportdlg.hxx
index a564670bad55..69474a870fb5 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -35,7 +35,7 @@ private:
     VclPtr<Button> mpBtnCancel;
     VclPtr<Button> mpBtnClose;
     VclPtr<FixedText> mpEditPreUpload;
-    VclPtr<VclMultiLineEdit> mpEditPostUpload;
+    VclPtr<FixedText> mpEditPostUpload;
     VclPtr<FixedHyperlink> mpBugReportMailto;
     VclPtr<CheckBox> mpCBSafeMode;
 
diff --git a/svx/uiconfig/ui/crashreportdlg.ui b/svx/uiconfig/ui/crashreportdlg.ui
index 2651979a0c62..eabfbbf9df5b 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -81,15 +81,12 @@ You can help us to fix this issue by sending an anonymous crash report to the %P
           </packing>
         </child>
         <child>
-          <object class="GtkTextView" id="ed_post">
+          <object class="GtkLabel" id="ft_post">
             <property name="can_focus">False</property>
             <property name="valign">center</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes" context="crashreportdlg|ed_post">The crash report was successfully uploaded.
-You can soon find the report at:
-http://crashreport.collaboraoffice.com/stats/crash_details/%CRASHID</property>
+            <property name="label" translatable="yes" context="crashreportdlg|ed_post">The crash report was successfully uploaded.</property>
             <property name="wrap">True</property>
-            <property name="selectable">True</property>
           </object>
           <packing>
             <property name="expand">False</property>