readlicense_oo/license/EULA_en-US.rtf | 2 -
sfx2/source/appl/appserv.cxx | 9 --------
sfx2/uiconfig/ui/licensedialog.ui | 35 ----------------------------------
3 files changed, 1 insertion(+), 45 deletions(-)
New commits:
commit 83610203c199e96c3b2938f7dd7f5d3f1abfe4bc
Author: Balazs Varga <balazs.va...@collabora.com>
AuthorDate: Tue Aug 26 23:38:56 2025 +0200
Commit: Balazs Varga <balazs.va...@collabora.com>
CommitDate: Wed Aug 27 16:33:18 2025 +0200
Revert "[cp] add EULA button to Help - License Information... dialog"
This reverts commit 4f43434114fecb5d07369eb1dba9b62a6927884d.
Change-Id: I2164b5f1b9a345b940968d243243d3bd5dc8e004
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190179
Tested-by: Balazs Varga <balazs.va...@collabora.com>
Reviewed-by: Balazs Varga <balazs.va...@collabora.com>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index a0478c2f3955..4e5559da6149 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -301,27 +301,18 @@ namespace
{
private:
std::unique_ptr<weld::Button> m_xBtnLicense;
- std::unique_ptr<weld::Button> m_xBtnEula;
- DECL_LINK(EulaHdl, weld::Button&, void);
DECL_LINK(LicenseHdl, weld::Button&, void);
public:
LicenseDialog(weld::Window* pParent)
: GenericDialogController(pParent,
u"sfx/ui/licensedialog.ui"_ustr, u"LicenseDialog"_ustr)
, m_xBtnLicense(m_xBuilder->weld_button("license"))
- , m_xBtnEula(m_xBuilder->weld_button("eula"))
{
m_xBtnLicense->connect_clicked( LINK(this, LicenseDialog,
LicenseHdl) );
- m_xBtnEula->connect_clicked( LINK(this, LicenseDialog, EulaHdl) );
}
};
- IMPL_LINK_NOARG(LicenseDialog, EulaHdl, weld::Button&, void)
- {
- response(RET_OK);
- showDocument("EULA.odt");
- }
IMPL_LINK_NOARG(LicenseDialog, LicenseHdl, weld::Button&, void)
{
diff --git a/sfx2/uiconfig/ui/licensedialog.ui
b/sfx2/uiconfig/ui/licensedialog.ui
index cdb4163921fc..43368a341270 100644
--- a/sfx2/uiconfig/ui/licensedialog.ui
+++ b/sfx2/uiconfig/ui/licensedialog.ui
@@ -36,23 +36,6 @@
<property name="secondary">True</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="eula">
- <property name="label" translatable="yes"
context="licensedialog|eula">_EULA</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="can-default">True</property>
- <property name="has-default">True</property>
- <property name="receives-default">True</property>
- <property name="use-underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- <property name="secondary">True</property>
- </packing>
- </child>
<child>
<object class="GtkButton" id="close">
<property name="label" translatable="yes"
context="stock">_Close</property>
@@ -78,24 +61,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="licensedialog|label2">%PRODUCTNAME binary package is made available
subject to the terms of the End User License and Subscription Agreement; choose
EULA to see exact details in English.</property>
- <property name="use-underline">True</property>
- <property name="wrap">True</property>
- <property name="mnemonic-widget">eula</property>
- <property name="max-width-chars">80</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
<object class="GtkLabel" id="label">
<property name="visible">True</property>
commit 9c0b48f87020913fcf4abfac6257d2ad40bd0c7d
Author: Balazs Varga <balazs.va...@collabora.com>
AuthorDate: Mon Aug 25 15:04:01 2025 +0200
Commit: Balazs Varga <balazs.va...@collabora.com>
CommitDate: Wed Aug 27 16:33:04 2025 +0200
Revert "[cp] email address in EULA"
This reverts commit 3cf1ca9cdb310bf0417bb4b91f2a55d3beee46af.
Change-Id: I87a1faea525f09fc1400fffd15f27e2f046a9d9b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190178
Tested-by: Balazs Varga <balazs.va...@collabora.com>
Reviewed-by: Balazs Varga <balazs.va...@collabora.com>
diff --git a/readlicense_oo/license/EULA_en-US.rtf
b/readlicense_oo/license/EULA_en-US.rtf
index ebdfa60c3bf7..b5f8e682645b 100644
--- a/readlicense_oo/license/EULA_en-US.rtf
+++ b/readlicense_oo/license/EULA_en-US.rtf
@@ -101,5 +101,5 @@ MAINTENANCE SERVICES. 0 s24\par
\pard\qc s16 Collabora Productivity Ltd. The Platinum Building, St John quote
s Innovation Park, Cambridge, CB4 0DS, United Kingdom\par
Registered in England and Wales with company number 08644931\par
-Telephone +44 (0)1223 362967 he...@collaboraoffice.com {{ ield{\*
ldinst{HYPERLINK http://CollaboraOffice.com }}{
ldrslt{http://CollaboraOffice.com\ul0+Telephone +44 (0)1223 362967
libreoff...@collabora.com {{ ield{\* ldinst{HYPERLINK
http://CollaboraOffice.com }}{ ldrslt{http://CollaboraOffice.com\ul0 }
