cui/source/dialogs/about.cxx | 16 ----------
cui/source/inc/about.hxx | 3 -
cui/uiconfig/ui/aboutdialog.ui | 58 -------------------------------------
desktop/source/app/crashreport.cxx | 5 ++-
4 files changed, 4 insertions(+), 78 deletions(-)
New commits:
commit f5dd679695c2fc57614632b21c99b5696f60d43a
Author: Balazs Varga <balazs.varga.ext...@allotropia.de>
AuthorDate: Mon Sep 4 14:31:50 2023 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Tue Sep 5 19:17:00 2023 +0200
Remove external links from about dialog
Party cherry-picked from: a922b8d9644d1aa07d40a50025931c7eda89ba7c
Change-Id: I37a655178c57b5c932cbe802b62427094155e495
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156516
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 279fe8eed03d..14765b7c1e91 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -51,9 +51,6 @@ using namespace ::com::sun::star::uno;
AboutDialog::AboutDialog(weld::Window *pParent)
: GenericDialogController(pParent, "cui/ui/aboutdialog.ui", "AboutDialog"),
- m_pCreditsButton(m_xBuilder->weld_link_button("btnCredits")),
- m_pWebsiteButton(m_xBuilder->weld_link_button("btnWebsite")),
- m_pReleaseNotesButton(m_xBuilder->weld_link_button("btnReleaseNotes")),
m_pCloseButton(m_xBuilder->weld_button("btnClose")),
m_pCopyButton(m_xBuilder->weld_button("btnCopyVersion")),
m_pBrandImage(m_xBuilder->weld_image("imBrand")),
@@ -116,19 +113,6 @@ AboutDialog::AboutDialog(weld::Window *pParent)
m_pVirDev.disposeAndClear();
}
- // Links
-
m_pCreditsButton->set_uri(officecfg::Office::Common::Menus::CreditsURL::get());
-
- OUString sURL(officecfg::Office::Common::Help::StartCenter::InfoURL::get());
- // localizeWebserviceURI(sURL);
- m_pWebsiteButton->set_uri(sURL);
-
- // See also SID_WHATSNEW in sfx2/source/appl/appserv.cxx
- sURL = officecfg::Office::Common::Menus::ReleaseNotesURL::get() +
- "?LOvers=" + utl::ConfigManager::getProductVersion() + "&LOlocale=" +
- LanguageTag(utl::ConfigManager::getUILocale()).getBcp47();
- m_pReleaseNotesButton->set_uri(sURL);
-
// Handler
m_pCopyButton->connect_clicked(LINK(this, AboutDialog, HandleClick));
m_pCloseButton->grab_focus();
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 2cfc65a894f4..0d6614b4e3f6 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -23,9 +23,6 @@
class AboutDialog : public weld::GenericDialogController
{
private:
- std::unique_ptr<weld::LinkButton> m_pCreditsButton;
- std::unique_ptr<weld::LinkButton> m_pWebsiteButton;
- std::unique_ptr<weld::LinkButton> m_pReleaseNotesButton;
std::unique_ptr<weld::Button> m_pCloseButton;
std::unique_ptr<weld::Button> m_pCopyButton;
diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index 80e97505582c..4ffbf140b356 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -340,64 +340,6 @@
<property name="top-attach">3</property>
</packing>
</child>
- <child>
- <object class="GtkBox">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLinkButton" id="btnCredits">
- <property name="label" translatable="yes"
context="aboutdialog|credits">Credits</property>
- <property name="name">lbCredit</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
- <property name="relief">none</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLinkButton" id="btnWebsite">
- <property name="label" translatable="yes"
context="aboutdialog|website">Website</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
- <property name="relief">none</property>
- <property name="xalign">0</property>
- <property
name="uri">https://www.libreoffice.org/</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLinkButton" id="btnReleaseNotes">
- <property name="label" translatable="yes"
context="aboutdialog|releasenotes">Release Notes</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
- <property name="relief">none</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">4</property>
- </packing>
- </child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
commit 2ca55e3f71c322330ea76fc6763e1cd8fd60b4dc
Author: Thorsten Behrens <thorsten.behr...@cib.de>
AuthorDate: Wed Apr 22 01:10:13 2020 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Tue Sep 5 19:16:47 2023 +0200
Get local, no-upload crash dumps working again
With this, CrashDumpEnable=true and CrashDumpUrl missing will
create local dmp files, but never upload/present GUI for it.
Change-Id: I0bae48a0accace01dc8507cccb2a7b02a4de61a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156491
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/desktop/source/app/crashreport.cxx
b/desktop/source/app/crashreport.cxx
index 8ff4e50bbf8a..472576126b23 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -143,7 +143,10 @@ void CrashReporter::writeCommonInfo()
rtl::Bootstrap::get("CrashDumpUrl", url);
if (url.isEmpty())
{
- // no url in config, bail out
+ // no url in config, bail out, but still set proper crash
+ // directory for local dump generation (incase CrashDumpEnable
+ // is on
+ updateMinidumpLocation();
mbInit = false;
return;
}
