dev/null |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt | 8
instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt | 8
instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt | 8
readlicense_oo/Package_files.mk | 4
readlicense_oo/docs/readme.xrm | 2
readlicense_oo/license/EULA_en-US.rtf | 105
----------
scp2/source/ooo/folderitem_ooo.ulf | 2
solenv/bin/modules/installer/environment.pm | 2
solenv/bin/modules/installer/windows/idtglobal.pm | 2
10 files changed, 16 insertions(+), 125 deletions(-)
New commits:
commit ddbf5bde486b4c53f256f2ad1847b89c22fc1d5d
Author: Balazs Varga <balazs.va...@collabora.com>
AuthorDate: Tue Aug 26 22:50:05 2025 +0200
Commit: Balazs Varga <balazs.va...@collabora.com>
CommitDate: Wed Aug 27 16:34:04 2025 +0200
Replace URLs and tooltips texts
Change-Id: I5ae923bdd8f3780ab8fe9b7ca38ca6aa8ada6d4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190275
Tested-by: Balazs Varga <balazs.va...@collabora.com>
Reviewed-by: Balazs Varga <balazs.va...@collabora.com>
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index c051543688fd..023cf89ded7d 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -7,10 +7,10 @@ AgreeToLicense No
ApplicationUsers AllUsers
ALLUSERS 1
ARPCOMMENTS ARPCOMMENTSTEMPLATE
-ARPCONTACT Collabora Productivity Ltd.
-ARPHELPLINK https://CollaboraOffice.com
-ARPURLINFOABOUT https://CollaboraOffice.com
-ARPURLUPDATEINFO https://CollaboraOffice.com
+ARPCONTACT CIB software GmbH
+ARPHELPLINK https://www.cib.de/en/office/
+ARPURLINFOABOUT https://www.cib.de/en/office/
+ARPURLUPDATEINFO https://www.cib.de/en/office/
DefaultUIFont DialogDefault
DialogCaption Windows Installer
DiskPrompt [1]
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 52865213befb..52ba9b10d74d 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -7,10 +7,10 @@ AgreeToLicense No
ApplicationUsers AllUsers
ALLUSERS 1
ARPCOMMENTS ARPCOMMENTSTEMPLATE
-ARPCONTACT Collabora Productivity Ltd.
-ARPHELPLINK https://CollaboraOffice.com
-ARPURLINFOABOUT https://CollaboraOffice.com
-ARPURLUPDATEINFO https://CollaboraOffice.com
+ARPCONTACT CIB software GmbH
+ARPHELPLINK https://www.cib.de/en/office/
+ARPURLINFOABOUT https://www.cib.de/en/office/
+ARPURLUPDATEINFO https://www.cib.de/en/office/
DefaultUIFont DialogDefault
DialogCaption Windows Installer
DiskPrompt [1]
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
index 9883f9bdf146..143426128a0a 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
@@ -6,10 +6,10 @@ _IsSetupTypeMin Typical
AgreeToLicense No
ApplicationUsers AllUsers
ARPCOMMENTS ARPCOMMENTSTEMPLATE
-ARPCONTACT Collabora Productivity Ltd.
-ARPHELPLINK https://CollaboraOffice.com
-ARPURLINFOABOUT https://CollaboraOffice.com
-ARPURLUPDATEINFO https://CollaboraOffice.com
+ARPCONTACT CIB software GmbH
+ARPHELPLINK https://www.cib.de/en/office/
+ARPURLINFOABOUT https://www.cib.de/en/office/
+ARPURLUPDATEINFO https://www.cib.de/en/office/
ARPNOREPAIR 1
ARPNOMODIFY 1
DefaultUIFont Tahoma8
diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index ac069b01bbc9..1fd657a8e252 100644
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -17,7 +17,7 @@
<body>
<div id="Intro">
<h1 id="Welcome" xml:lang="en-US">${PRODUCTNAME}
${PRODUCTVERSION} ReadMe</h1>
- <p id="CollaboraOffice" xml:lang="en-US">For more
information please visit ${PRODUCTNAME} home page at <a
href="https://collaboraoffice.com";>https://CollaboraOffice.com/</a>.</p>
+ <p id="CIB Office" xml:lang="en-US">For more
information please visit ${PRODUCTNAME} home page at <a
href="https://www.cib.de/en/office/";>https://www.cib.de/en/office/</a>.</p>
</div>
</body>
</html>
diff --git a/scp2/source/ooo/folderitem_ooo.ulf
b/scp2/source/ooo/folderitem_ooo.ulf
index 763ee06e20e9..7a058055027f 100644
--- a/scp2/source/ooo/folderitem_ooo.ulf
+++ b/scp2/source/ooo/folderitem_ooo.ulf
@@ -26,4 +26,4 @@ en-US = "Open Document"
en-US = "%PRODUCTNAME (Safe Mode)"
[STR_FI_TOOLTIP_COFFICE]
-en-US = "Collabora Office, the office productivity suite based on LibreOffice
Technology, provided by Collabora Productivity. See https://collaboraoffice.com";
+en-US = "CIB Office, the office productivity suite provided by CIB software
GmbH."
commit 0c16cec80268c14b3e71dde0105bfa8a219e6ba6
Author: Balazs Varga <balazs.va...@collabora.com>
AuthorDate: Mon Aug 25 15:19:29 2025 +0200
Commit: Balazs Varga <balazs.va...@collabora.com>
CommitDate: Wed Aug 27 16:33:51 2025 +0200
Revert "[cp] Collabora Office EULA"
This reverts commit 71a1957715d0f0fd3673b4ad92369d4c71de5ce2.
Change-Id: I5577922433d688337f15600c13bb36054b80be9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190180
Tested-by: Balazs Varga <balazs.va...@collabora.com>
Reviewed-by: Balazs Varga <balazs.va...@collabora.com>
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index 95614109e3d1..101d3878de3f 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -11,13 +11,9 @@ $(eval $(call
gb_Package_Package,readlicense_oo_files,$(SRCDIR)/readlicense_oo/l
ifneq ($(OS),MACOSX)
$(eval $(call gb_Package_add_file,readlicense_oo_files,NOTICE,NOTICE))
-$(eval $(call gb_Package_add_file,readlicense_oo_files,EULA.odt,EULA.odt))
-$(eval $(call
gb_Package_add_file,readlicense_oo_files,EULA_en-US.rtf,EULA_en-US.rtf))
$(eval $(call
gb_Package_add_file,readlicense_oo_files,CREDITS.fodt,CREDITS.fodt))
else
$(eval $(call
gb_Package_add_file,readlicense_oo_files,Resources/NOTICE,NOTICE))
-$(eval $(call
gb_Package_add_file,readlicense_oo_files,Resources/EULA.odt,EULA.odt))
-$(eval $(call
gb_Package_add_file,readlicense_oo_files,Resources/EULA_en-US.rtf,EULA_en-US.rtf))
$(eval $(call
gb_Package_add_file,readlicense_oo_files,Resources/CREDITS.fodt,CREDITS.fodt))
endif
diff --git a/readlicense_oo/license/EULA.odt b/readlicense_oo/license/EULA.odt
deleted file mode 100644
index e5c937f15401..000000000000
Binary files a/readlicense_oo/license/EULA.odt and /dev/null differ
diff --git a/readlicense_oo/license/EULA_en-US.rtf
b/readlicense_oo/license/EULA_en-US.rtf
deleted file mode 100644
index b5f8e682645b..000000000000
--- a/readlicense_oo/license/EULA_en-US.rtf
+++ /dev/null
@@ -1,105 +0,0 @@
-{ tf1nsinsicpg1252\deff0
ouicompat{ onttbl{ 0 swiss charset0 ArialMT;}{ 1 swiss charset0 Helvetica;}}
-{-{\*\generator Riched20 10.0.18362} iewkind4\uc1
-\pard\qj 0 s28\lang14 End User License and Subscription Agreement0 s24\par
- s28 Collabora Office (\ldblquote Software dblquote )0 s24\par
- s20\par
-\par
-An individual acting on their own behalf or on behalf of any corporate entity
which employs them or which they represent (\ldblquote an Organisation dblquote
) represents that he or she has the authority to enter into this agreement on
behalf of that Organisation. In this Licence Agreement, \ldblquote You dblquote
includes both the reader and any Organisation.0 s24\par
- s20\par
-PLEASE READ THIS AGREEMENT CAREFULLY. BY PURCHASING, INSTALLING AND/OR USING
THE COLLABORA OFFICE SOFTWARE (INCLUDING ITS COMPONENTS), YOU AGREE TO THE
TERMS OF THIS LICENCE AND SUBSCRIPTION AGREEMENT AND ACKNOWLEDGE THAT YOU HAVE
READ AND UNDERSTAND THIS AGREEMENT. s24\par
- s20\par
-IF YOU DO NOT AGREE WITH THESE TERMS PLEASE DO NOT DOWNLOAD, INSTALL OR USE
THE SOFTWARE OR SUBSCRIPTION SERVICES. s24\par
- s20\par
- PARTIES.0 This software licence and subscription agreement (\ldblquote
Agreement dblquote ) is a legally binding agreement between You and Collabora
Productivity Limited, incorporated and registered in England and Wales with
company number 08644931 whose registered office is at The Platinum Building, St
John quote s Innovation Park, Cambridge, CB4 0DS, United Kingdom (\ldblquote
Collabora dblquote ) and where applicable references to Collabora shall also
refer to its authorised resellers and third party distributors from time to
time. s24\par
- s20\par
- SOFTWARE0 . The Software and each of its components are owned by Collabora
or other licensors and are protected as copyrighted works of authorship, and
are also protected under applicable database and other applicable laws. To the
extent that they are not accompanied by a separate Collabora software licence
agreement, any modification, update or upgrade to the Software that You may
download or receive, whether as Subscription Services detailed below or
otherwise, is included as Software and governed by the \ldblquote Licenses
dblquote heading below and generally by this Agreement. s24\par
- s20\par
- LICENCES.0 Provided that You have subscribed to the Subscription Services
as detailed below and Your compliance with the other terms and conditions of
this Agreement, Collabora grants to You a perpetual, non-transferable,
worldwide licence (\ldblquote Licence dblquote ) to reproduce and use copies of
the Software within Your Organization. The Software is licensed (not sold) to
You. Accordingly no title to or ownership of the Software is transferred to
You. You should also be aware that in addition to this grant of Licence, many
of the individual components of the Software are subject to open source
licences, as detailed further below under \ldblquote Open Source Licences and
Limitations dblquote . s24\par
- s20\par
- SUBSCRIPTION SERVICES. 0 The Licence to reproduce and use a copy of the
Software is granted subject to the initial purchase by You of Software
maintenance and/or support services entitlements (\ldblquote Subscription
Services Entitlements dblquote ) equivalent in number to the total number of
units of the Software that you intend to deploy, install or use in Your
Organization. s24\par
- s20 The Subscription Services Entitlements entitle You during the
subscription period to make use of the following services (\ldblquote
Subscription Services dblquote ): s24\par
- s20 a) in the case of maintenance services, to any security fixes and
Software updates which may be issued by Collabora, including existing fixes
from the support services set out at (b), on the terms set out in this
Agreement and from time to time at {{ ield{\* ldinst{HYPERLINK
http://www.CollaboraOffice.com/ }}{ ldrslt{http://www.CollaboraOffice.com/\ul0-
s20 b) in the case of support services, to fee based technical support on the
terms set out in this Agreement, or any separate agreement, and from time to
time at {{ ield{\* ldinst{HYPERLINK http://www.CollaboraOffice.com/ }}{
ldrslt{http://www.CollaboraOffice.com/\ul0- s20 All Subscription Services will
be supplied in a professional manner in accordance with generally accepted
industry standards. s24\par
- s20 Unless the Subscription Services and Subscription Services Entitlements
are set out in a separate contract with Collabora, they are offered to You
subject to the terms set out in this Agreement. s24\par
- s20\par
-IF THE SUBSCRIPTION SERVICES ENTITLEMENTS PERIOD EXPIRES AND IS NOT RENEWED
WITHIN 30 DAYS, ACCESS TO SUBSCRIPTION SERVICES IS TERMINATED. IF WITHIN THE
SUBSCRIPTION SERVICES ENTITLEMENT PERIOD YOU WISH TO INCREASE THE NUMBER OF
COPIES OF THE SOFTWARE YOUR ORGANISATION IS USING, YOU MUST PURCHASE ADDITIONAL
UNITS OF SUBSCRIPTION SERVICES ENTITLEMENTS EQUIVALENT TO THE NUMBER OF
ADDITIONAL SOFTWARE COPIES YOU WISH TO INSTALL. UPON RENEWAL OF YOUR
SUBSCRIPTION SERVICES ENTITLEMENTS, YOUR SUBMISSION OF A PURCHASE ORDER OR
PAYMENT OF FEES FOR SUBSCRIPTION SERVICES ENTITLEMENTS WILL BE DEEMED TO BE A
REPRESENTATION OF THE NUMBER OF COPIES OF THE SOFTWARE INSTALLED AT YOUR
ORGANISATION AT THAT TIME. COLLABORA RESERVES THE RIGHT AT ITS ENTIRE
DISCRETION TO CARRY OUT A LICENCE COMPLIANCE AUDIT AT ANY TIME. s24\par
-
-\pard\qj x5693 s20 ab s24\par
-
-\pard\qj s20 HOME USE.0 Collabora grants primary users of Subscription
Services Entitlements and their immediate family members a License to reproduce
and use copies of the Software for Home Use as detailed below unless otherwise
prohibited by any applicable laws, policies or regulations. Home Use is usage
outside the scope of normal business that occurs primarily inside the home.
s24\par
- s20\par
- LICENSE COMPLIANCE AUDIT0 . Collabora may, upon fifteen (15) days quote
advance notice and at its expense, conduct an annual audit if You are an
Organisation, during your normal business hours, of Your use of the Software to
verify compliance with this Agreement and in particular Your commitment under
the License herein to purchase an equivalent number units of Subscription
Services Entitlements. You agree to keep records sufficient to certify your
compliance with this Agreement. Upon Collabora quote s or its authorized
representative quote s reasonable written commitment(s) to safeguard your
confidential information, you shall fully cooperate with such audit and provide
any necessary assistance and access to records and computers. If an audit
reveals that you have or at any time had unlicensed installation, use of, or
access to the Software, You will promptly acquire sufficient Subscription
Services Entitlements to cover any shortage. If a shortage of 5% or more is
found, you m
ust reimburse Collabora for the costs incurred in the audit and acquire the
necessary additional Subscription Services Entitlements within 30 days. s24\par
- s20\par
-- s20\par
-OPEN SOURCE LICENCES/REQUIREMENTS.0 Many of the individual components
included in the Software are licensed primarily pursuant to Mozilla Public
License v2.0 open source licence, in addition to other open source licences
identified in the documentation or located in the source code or binary code
for the component. For these the source code form of the Software is made
available at all times under the terms of such licences. s24\par
- s20 Whilst this Agreement in no way limits Your rights under such licences,
nor is it intended to supersede or conflict with the licence terms or
obligations for use of any individual open source component, the Mozilla Public
License v2.0 has been utilised to license the majority of the components
comprising the Software because it allows the imposition (as is set out in its
paragraph 3.2(b)) of the conditions of this Agreement on the free distribution
of Software in its Executable Form. s24\par
- s20 For the avoidance of doubt, Collabora branding, theme data and Collabora
Marks are not made available under an Open Source license. s24\par
- s20\par
-MAINTENANCE SERVICES. 0 s24\par
- s20 1) By purchasing maintenance services You are entitled to install and use
all upgrades and updates made commercially available by Collabora during the
period covered by the maintenance services subscription, up to the number of
installations for which You have purchase maintenance services. s24\par
- s20\par
-2) Any \ldblquote update dblquote means a fix or compilation of fixes
released by Collabora to correct operational errors (a defect that prevents it
from operating substantially as intended, where such intent shall be deduced
based on a competent inspection of the source code and documentation) in the
Software. An \ldblquote upgrade dblquote means any new version of the Software
which bears the same product name, including version changes evidenced by a
number immediately after the name of the Software. s24\par
- s20\par
-3) If a question arises as to whether a release by Collabora is an upgrade or
an update or a new Software product, Collabora quote s opinion will prevail
provided that Collabora treats the product offering the same for its end users
generally. s24\par
- s20\par
-4) If Collabora commercially releases any upgrade or updates, it will make
such upgrades or updates available to You within a reasonable period of time
after they become commercially available, although Collabora cannot guarantee
any specific turnaround times and/or regular release intervals. s24\par
- s20\par
-5) At its sole discretion Collabora will determine whether to eliminate an
operational error by means of issuing an update. Collabora will inform you by
email (to the address given on registration of the maintenance services) as
soon as new updates are released at the Collabora website. s24\par
- s20\par
-6) Maintenance services do not include integration services, installation of
upgrades or updates, support services or any other benefits not expressly
described in this Agreement. s24\par
- s20\par
- SUPPORT SERVICES0 s24\par
- s20 By purchasing an entitlement to \lquote Level 3 quote technical support,
services will be provided on certain terms which include: s24\par
-
-\pard\sa120\sl276\slmult1 s20 - allocation of a severity level for each
support case and any variations on this; 1 s22\par
- 0 s20 - Collabora quote s work availability times, initial response time and
the communication frequency for each support case based on such allocated case
severity level; 1 s22\par
- 0 s20 - Your limit on the number of support cases that You can report for
each such allocated case severity level (although for the avoidance of doubt,
any unused limit cannot be refunded and expires at the end of the Subscription
Services Entitlement period unless otherwise agreed). 1 s22\par
- 0 s20 The specific terms are subject to change from time to time and
accordingly are set out at {{ ield{\* ldinst{HYPERLINK
http://www.CollaboraOffice.com/ }}{ ldrslt{http://www.CollaboraOffice.com/\ul0-
0 s20 Alternatively, Collabora also entitle You to purchase the support
services entitlement from a reseller or other intermediary rather than from
Collabora directly. If You have purchased the services entitlement from such a
party please check with them if any support service entitlement terms have been
separately negotiated between them and Collabora, as any such terms are deemed
to be incorporated into this Agreement and shall take precedence over any
conflicting terms set out at {{ ield{\* ldinst{HYPERLINK
http://www.CollaboraOffice.com/ }}{ ldrslt{http://www.CollaboraOffice.com/\ul0-
-\pard\qj 0 s20 LIMITATIONS AND EXCLUSIONS0 s24\par
- s20 1) Collabora offers no rights other than those expressly granted to You
in this Agreement. Except as agreed to under a separate written agreement with
Collabora or in the licence terms accompanying a particular component, to the
maximum extent permitted under applicable law (and not applicable to claims
relating to death or personal injury caused by negligence or fraudulent
misrepresentation) the Software is provided and licensed "as is" without any
warranties of any kind, express or implied, including any implied warranties of
quality, title, non-infringement, non-interruption or fitness for a particular
purpose. s24\par
- s20\par
-2) The Software is only compatible with certain computers and operating
systems. It is not warranted for non-compatible systems or for incorrect or
unauthorised use, being use which is not in accordance with the Documentation.
Please contact Collabora for information about compatibility or incorrect use.
s24\par
- s20\par
-3) The Software may include or be bundled with other software programmes or
services licensed or sold by an entity other than Collabora. Collabora does not
warrant non-Collabora products or services, which are provided on an "as is"
basis. Please see the third party entity regarding remedies. s24\par
- s20\par
-4) No right or licence, express or implied, is granted under this Agreement
with respect to any trademark, trade name or service mark (\ldblquote Mark
dblquote ) of Collabora. If You distribute any open source component of the
Software, You must remove all Marks except those used to identify Collabora
quote s ownership or licensing of the component. In addition you may not vary,
delete or obscure any notices of proprietary rights or any product
identification or restrictions on or in the Software. s24\par
- s20\par
-5) Neither Collabora nor any of its licensors, subsidiaries, contractors or
employees will in any case be liable for any incidental, consequential,
indirect or economic damages arising out of the use of or inability to use the
Software or Subscription Services, including without limitation loss of
profits, business or data, even if advised of the possibility of those damages.
In particular, as files may be altered or damaged in the course of Collabora
providing Subscription Services, You agree to take appropriate measures to
isolate and back up Your systems. s24\par
- s20\par
-6) Notwithstanding (5) above, in no event will Collabora's aggregate liability
for damages (whether in one instance or a series of instances) exceed 1.25
times the amount paid by You for the Subscription Services Entitlements out of
which such claim arose. s24\par
- s20\par
-7) Upon any default in Collabora quote s provision of Subscription Services,
Collabora's only obligation is to either correct the Subscription Services so
that they comply with this warranty or at its option refund the amount You paid
to Collabora for the portion of such Services that fail to comply with this
warranty and in such event You may elect to terminate this Agreement with
immediate effect. s24\par
- s20\par
-\par
- GENERAL TERMS0 s24\par
- s20 1) This Agreement may not be transferred or assigned without the prior
written approval of Collabora. s24\par
- s20\par
-2) This Agreement will terminate if You fail to comply with any term or
condition of this Agreement. s24\par
- s20\par
-3) Unless explicitly indicated otherwise, this Agreement sets forth the entire
understanding and agreement between You and Collabora and may be amended or
modified only by a written agreement agreed to by You and Collabora. No
licensor, distributor, or reseller is authorised to modify this Agreement
whether formally or informally. s24\par
- s20\par
-4) No waiver of any right under this Agreement will be effective unless in
writing. No waiver of any past or present right will be deemed to be a waiver
of any future right arising under this Agreement. s24\par
- s20\par
-5) If any provision in this Agreement is invalid or unenforceable, that
provision will be construed, limited, modified or, if necessary, severed, to
the extent necessary, to eliminate its invalidity or unenforceability, and the
other provisions of this Agreement will remain unaffected. s24\par
- s20\par
-6) Any products or technical information provided under this Agreement may be
subject to trade laws of various countries including U.S. export controls. Both
You and Collabora each agree to comply with all export control regulations and
to obtain any required licenses or classification to export, re-export or
import deliverables and Collabora assumes no responsibility for the Your
failure to comply with any such necessary export control laws, rules or
regulations. s24\par
- s20\par
-7) If You are an Organisation You agree that you will not use the Software in
breach of any relevant laws in the country in which you use the Software, and
you agree to implement internal safeguards to prevent any unauthorized copying,
distribution, installation, or use of, or access to, the Software. s24\par
- s20\par
-8) You may make a reasonable number of copies 0 of the Software over and
above the number of units of Software for which you have purchased Subscription
Services Entitlements, purely for backup, archival or other security purposes.
In so doing You will not be in breach of the terms of this Agreement. s24\par
- s20\par
-9) Without regard to conflict of laws rules and principles or the United
Nations Convention of Contracts for the International Sale of Goods, this
Agreement is governed by the laws of England, and any action relating to this
Agreement may only be brought before the courts of England. s24\par
- s20\par
-\par
-\i EULA 2020-04-07\i0 s24\par
-\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 libreoff...@collabora.com {{ ield{\*
ldinst{HYPERLINK http://CollaboraOffice.com }}{
ldrslt{http://CollaboraOffice.com\ul0-}
diff --git a/solenv/bin/modules/installer/environment.pm
b/solenv/bin/modules/installer/environment.pm
index c2add9cadb41..fb14f08f28d7 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -62,7 +62,7 @@ sub create_pathvariables
my $filelistpath = $environment->{'WORKDIR'};
$variables{'filelistpath'} = $filelistpath;
- my $licensepath = $environment->{'SRCDIR'} .
$installer::globals::separator . "readlicense_oo/license";
+ my $licensepath = $environment->{'WORKDIR'} .
$installer::globals::separator . "CustomTarget/readlicense_oo/license";
$variables{'licensepath'} = $licensepath;
my $packinfopath = $environment->{'SRCDIR'} .
$installer::globals::separator . "setup_native/source/packinfo";
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm
b/solenv/bin/modules/installer/windows/idtglobal.pm
index d2f75e081848..ba3af1ab48d7 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -816,7 +816,7 @@ sub get_rtflicensefilesource
{
my ($language, $includepatharrayref) = @_;
- my $licensefilename = "EULA_en-US.rtf";
+ my $licensefilename = "license_" . $language . ".rtf";
my $sourcefileref =
installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename,
$includepatharrayref, 1);
