cui/source/options/optgdlg.cxx | 24 -------
cui/source/options/optgdlg.hxx | 5 -
cui/uiconfig/ui/optgeneralpage.ui | 72 -----------------------
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 5 -
desktop/source/deployment/gui/dp_gui_dialog2.hxx | 1
desktop/uiconfig/ui/extensionmanager.ui | 20 ------
6 files changed, 5 insertions(+), 122 deletions(-)
New commits:
commit 3b896a7f2bb84a0d87e28be97e2dc570fcb79427
Author: Thorsten Behrens <thorsten.behr...@cib.de>
AuthorDate: Tue Apr 21 17:19:29 2020 +0200
Commit: Balazs Varga <balazs.va...@collabora.com>
CommitDate: Wed Aug 27 16:30:55 2025 +0200
Remove collect usage info from GUI
Change-Id: I1a7420c557187097b424d298c020bcb837a8261c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156484
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175008
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
Tested-by: allotropia jenkins <jenk...@allotropia.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190019
Reviewed-by: Balazs Varga <balazs.va...@collabora.com>
Tested-by: Balazs Varga <balazs.va...@collabora.com>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 12e9bc8d0279..76ad56681199 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -177,11 +177,6 @@ OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage,
weld::DialogController* p
, m_xYearValueField(m_xBuilder->weld_spin_button(u"year"_ustr))
, m_xToYearFT(m_xBuilder->weld_label(u"toyear"_ustr))
, m_xYearFrameImg(m_xBuilder->weld_widget(u"lockyears"_ustr))
-#if HAVE_FEATURE_BREAKPAD
- , m_xPrivacyFrame(m_xBuilder->weld_widget("privacyframe"))
- , m_xCrashReport(m_xBuilder->weld_check_button("crashreport"))
- , m_xCrashReportImg(m_xBuilder->weld_widget("lockcrashreport"))
-#endif
#if defined(_WIN32)
, m_xQuickStarterFrame(m_xBuilder->weld_widget("quickstarter"))
, m_xQuickLaunchCB(m_xBuilder->weld_check_button("quicklaunch"))
@@ -192,10 +187,6 @@ OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage,
weld::DialogController* p
,
m_xPerformFileExtImg(m_xBuilder->weld_widget("lockcbPerformFileExtCheck"))
#endif
{
-#if HAVE_FEATURE_BREAKPAD
- m_xPrivacyFrame->show();
-#endif
-
#if defined(_WIN32)
// Store-packaged apps (located under the protected Program
Files\WindowsApps) can't use normal
// shell shortcuts to their exe. TODO: show a button to open "Startup
Apps" system applet?
@@ -286,14 +277,6 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
rSet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) );
}
-#if HAVE_FEATURE_BREAKPAD
- if (m_xCrashReport->get_state_changed_from_saved())
- {
-
officecfg::Office::Common::Misc::CrashReport::set(m_xCrashReport->get_active(),
batch);
- bModified = true;
- }
-#endif
-
#if defined(_WIN32)
if (m_xPerformFileExtCheck->get_state_changed_from_saved())
{
@@ -366,13 +349,6 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
else
m_xYearFrame->set_sensitive(false);
-#if HAVE_FEATURE_BREAKPAD
-
m_xCrashReport->set_active(officecfg::Office::Common::Misc::CrashReport::get()
&& CrashReporter::IsDumpEnable());
-
m_xCrashReport->set_sensitive(!officecfg::Office::Common::Misc::CrashReport::isReadOnly()
&& CrashReporter::IsDumpEnable());
-
m_xCrashReportImg->set_visible(officecfg::Office::Common::Misc::CrashReport::isReadOnly()
&& CrashReporter::IsDumpEnable());
- m_xCrashReport->save_state();
-#endif
-
#if defined(_WIN32)
if (const SfxBoolItem* pItem = rSet->GetItemIfSet( SID_ATTR_QUICKLAUNCHER,
false ))
{
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 572e273f4c83..362dcf2ef876 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -49,11 +49,6 @@ private:
std::unique_ptr<weld::SpinButton> m_xYearValueField;
std::unique_ptr<weld::Label> m_xToYearFT;
std::unique_ptr<weld::Widget> m_xYearFrameImg;
-#if HAVE_FEATURE_BREAKPAD
- std::unique_ptr<weld::Widget> m_xPrivacyFrame;
- std::unique_ptr<weld::CheckButton> m_xCrashReport;
- std::unique_ptr<weld::Widget> m_xCrashReportImg;
-#endif
#if defined(_WIN32)
std::unique_ptr<weld::Widget> m_xQuickStarterFrame;
std::unique_ptr<weld::CheckButton> m_xQuickLaunchCB;
diff --git a/cui/uiconfig/ui/optgeneralpage.ui
b/cui/uiconfig/ui/optgeneralpage.ui
index 1f04a0c05dc1..ea0d62856456 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -9,7 +9,7 @@
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
- <!-- n-columns=1 n-rows=8 -->
+ <!-- n-columns=1 n-rows=7 -->
<object class="GtkGrid" id="OptGeneralPage">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -344,72 +344,6 @@
<property name="top-attach">4</property>
</packing>
</child>
- <child>
- <object class="GtkFrame" id="privacyframe">
- <property name="can-focus">False</property>
- <property name="label-xalign">0</property>
- <property name="shadow-type">none</property>
- <child>
- <!-- n-columns=2 n-rows=2 -->
- <object class="GtkGrid" id="grid10">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="margin-start">12</property>
- <property name="margin-top">6</property>
- <property name="column-spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="crashreport">
- <property name="label" translatable="yes"
context="optgeneralpage|crashreport">Sen_d crash reports to The Document
Foundation</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="halign">start</property>
- <property name="use-underline">True</property>
- <property name="active">True</property>
- <property name="draw-indicator">True</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="lockcrashreport">
- <property name="can-focus">False</property>
- <property name="no-show-all">True</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <property name="icon-name">res/lock.png</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="optgeneralpage|label7">Help Improve %PRODUCTNAME</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">5</property>
- </packing>
- </child>
<child>
<object class="GtkFrame" id="quickstarter">
<property name="can-focus">False</property>
@@ -467,7 +401,7 @@
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">6</property>
+ <property name="top-attach">5</property>
</packing>
</child>
<child>
@@ -543,7 +477,7 @@
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">7</property>
+ <property name="top-attach">6</property>
</packing>
</child>
<child>
commit 69b89c68c60719033fe50d6c1ab884bc1f510c9d
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Thu Jan 20 17:01:20 2022 +0100
Commit: Balazs Varga <balazs.va...@collabora.com>
CommitDate: Wed Aug 27 16:30:40 2025 +0200
Remove external link from extension manager
Change-Id: Ib86020a764b61c4fd4d42d3d7ffb6dce2a84587d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128693
Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156518
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175007
Tested-by: allotropia jenkins <jenk...@allotropia.de>
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190018
Reviewed-by: Balazs Varga <balazs.va...@collabora.com>
Tested-by: Balazs Varga <balazs.va...@collabora.com>
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index cf53dddff48a..971362005864 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -432,7 +432,6 @@ ExtMgrDialog::ExtMgrDialog(weld::Window *pParent,
TheExtensionManager *pManager)
, m_xBundledCbx(m_xBuilder->weld_check_button(u"bundled"_ustr))
, m_xSharedCbx(m_xBuilder->weld_check_button(u"shared"_ustr))
, m_xUserCbx(m_xBuilder->weld_check_button(u"user"_ustr))
- , m_xGetExtensions(m_xBuilder->weld_link_button(u"getextensions"_ustr))
, m_xProgressText(m_xBuilder->weld_label(u"progressft"_ustr))
, m_xProgressBar(m_xBuilder->weld_progress_bar(u"progressbar"_ustr))
, m_xCancelBtn(m_xBuilder->weld_button(u"cancel"_ustr))
@@ -489,9 +488,9 @@ ExtMgrDialog::~ExtMgrDialog()
m_aIdle.Stop();
}
-void ExtMgrDialog::setGetExtensionsURL( const OUString &rURL )
+void ExtMgrDialog::setGetExtensionsURL( const OUString &/*rURL*/ )
{
- m_xGetExtensions->set_uri( rURL );
+
}
void ExtMgrDialog::addPackageToList( const uno::Reference<
deployment::XPackage > &xPackage,
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 291b5c80981e..441640d2ef5c 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -117,7 +117,6 @@ class ExtMgrDialog : public weld::GenericDialogController
std::unique_ptr<weld::CheckButton> m_xBundledCbx;
std::unique_ptr<weld::CheckButton> m_xSharedCbx;
std::unique_ptr<weld::CheckButton> m_xUserCbx;
- std::unique_ptr<weld::LinkButton> m_xGetExtensions;
std::unique_ptr<weld::Label> m_xProgressText;
std::unique_ptr<weld::ProgressBar> m_xProgressBar;
std::unique_ptr<weld::Button> m_xCancelBtn;
diff --git a/desktop/uiconfig/ui/extensionmanager.ui
b/desktop/uiconfig/ui/extensionmanager.ui
index 215536e179ab..4ee21b013ff5 100644
--- a/desktop/uiconfig/ui/extensionmanager.ui
+++ b/desktop/uiconfig/ui/extensionmanager.ui
@@ -354,26 +354,6 @@
<property name="top-attach">0</property>
</packing>
</child>
- <child>
- <object class="GtkLinkButton" id="getextensions">
- <property name="label" translatable="yes"
context="extensionmanager|getextensions">Get more extensions
online...</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>
- <child internal-child="accessible">
- <object class="AtkObject" id="getextensions-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="extensionmanager|extended_tip|getextensions">You
can find a collection of extensions on the Web.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- <property name="width">3</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
