basctl/uiconfig/basicide/menubar/menubar.xml | 3
bin/upload_symbols.py | 2
chart2/uiconfig/menubar/menubar.xml | 3
configure.ac | 2
dbaccess/uiconfig/dbapp/menubar/menubar.xml | 3
dbaccess/uiconfig/dbquery/menubar/menubar.xml | 3
dbaccess/uiconfig/dbrelation/menubar/menubar.xml | 3
dbaccess/uiconfig/dbtable/menubar/menubar.xml | 3
dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 3
desktop/source/app/crashreport.cxx | 4
extensions/source/macosx/spotlight/mdimporter/Info.plist | 4
extensions/uiconfig/sbibliography/menubar/menubar.xml | 3
framework/uiconfig/startmodule/menubar/menubar.xml | 3
instsetoo_native/CustomTarget_install.mk | 6 -
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2
postprocess/CustomTarget_signing.mk | 2
postprocess/signing/signing.pl | 2
reportdesign/uiconfig/dbreport/menubar/menubar.xml | 3
sc/uiconfig/scalc/menubar/menubar.xml | 3
scp2/source/ooo/scpaction_ooo.scp | 18 ----
scp2/source/python/module_python_librelogo.scp | 2
sd/uiconfig/sdraw/menubar/menubar.xml | 3
sd/uiconfig/simpress/menubar/menubar.xml | 3
sfx2/source/appl/appserv.cxx | 6 -
sfx2/source/view/viewfrm.cxx | 58 -------------
solenv/bin/modules/installer/epmfile.pm | 2
solenv/bin/modules/installer/windows/admin.pm | 3
solenv/bin/modules/installer/windows/msp.pm | 4
starmath/uiconfig/smath/menubar/menubar.xml | 3
svx/source/dialog/crashreportdlg.cxx | 14 +--
svx/source/dialog/crashreportdlg.hxx | 4
svx/uiconfig/ui/crashreportdlg.ui | 33 ++-----
sw/uiconfig/sglobal/menubar/menubar.xml | 3
sw/uiconfig/sweb/menubar/menubar.xml | 3
sw/uiconfig/swform/menubar/menubar.xml | 3
sw/uiconfig/swreport/menubar/menubar.xml | 3
sw/uiconfig/swriter/menubar/menubar.xml | 3
sw/uiconfig/swxform/menubar/menubar.xml | 3
writerperfect/qa/unit/EPUBExportTest.cxx | 3
39 files changed, 48 insertions(+), 183 deletions(-)
New commits:
commit 14bbc66cbb5ac0165a63888800d7ac01179a9fad
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu May 14 10:19:21 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 18:25:53 2022 +0100
CppunitTest_writerperfect_epubexport: don't try to load flagged abw format
master opens this as-is, this branch would first show you a dialog, we
cancel that in headless mode, and then loading fails, but that's not an
interesting failure.
Change-Id: I6ff83e320738fb33ee88d10f9b2cfabff91de8ed
diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx
b/writerperfect/qa/unit/EPUBExportTest.cxx
index c1769607605a..b8827b47c2c5 100644
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -874,9 +874,12 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testSimpleRuby)
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testAbi11105)
{
+// Disable the test on this branch, .abw is flagged as EXOTIC, so loading
would fail.
+#if 0
// This crashed because the paragraph style "P5" which had a
master-page-name
// appeared in a table cell messed up page spans.
createDoc(u"abi11105.abw", {});
+#endif
}
}
commit c0e537948c240d697c7dc0836a02c98f79e8240d
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Sep 22 18:35:02 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 18:24:09 2022 +0100
[cp] switch to Collabora's help instance
Change-Id: I70df6d7b7601f47b923c922c97436b0a826fc32e
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index a556d6af7f4d..a753798b3369 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3752,7 +3752,7 @@
<desc>Specifies the root URL to the Office help pages. Blank disables
Help buttons on dialogs in LibreOffice Online.</desc>
</info>
- <value>https://help.libreoffice.org/help.html?</value>
+ <value>https://help.collaboraoffice.com/help.html?</value>
</prop>
<group oor:name="StartCenter">
<info>
commit 27ecb78c8d30b7281b069578f4d6ce53e6702ed8
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Thu Feb 11 08:27:23 2021 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 18:23:49 2022 +0100
[cp] try to use a different timestamp service
Change-Id: I0fdbe2871d74836d530a69532bf22c17f642c922
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index adef0bfe3b24..53c79e102bde 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -132,7 +132,7 @@ endif # LIBO_TEST_INSTALL
touch $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
-TIMESTAMPURL ?= "http://timestamp.globalsign.com/scripts/timestamp.dll";
+TIMESTAMPURL ?= "http://timestamp.digicert.com/";
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_signing.done:
\
$(if $(filter HELP,$(BUILD_TYPE)),$(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signing.done)
\
$(if $(filter ODK,$(BUILD_TYPE)),$(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.done) \
diff --git a/postprocess/CustomTarget_signing.mk
b/postprocess/CustomTarget_signing.mk
index 6fdd4950f4cb..85f3c0c60611 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -15,7 +15,7 @@ $(eval $(call
gb_CustomTarget_register_targets,postprocess/signing,\
))
# PFXFILE and PFXPASSWORD should be set in environment
-TIMESTAMPURL ?= "http://timestamp.globalsign.com/scripts/timestamp.dll";
+TIMESTAMPURL ?= "http://timestamp.digicert.com/";
$(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \
$(SRCDIR)/postprocess/signing/signing.pl \
diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index b42e5bb17e89..a443984a2a7b 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -242,7 +242,7 @@ sub usage #09.07.2007 08:39
print "\t -e filename\t\t\tFile which contains a list of files which don't
have to be signed.\n";
print "\t -f pfx_filename\t\t\"Personal Information Exchange\" file.\n";
print "\t -p password\t\t\tPassword for \"Personal Information Exchange\"
file.\n";
- print "\t -t timestamp\t\t\tTimestamp URL e.g.
\"http://timestamp.verisign.com/scripts/timstamp.dll\"\n";;
+ print "\t -t timestamp\t\t\tTimestamp URL e.g.
\"http://timestamp.digicert.com/\"\n";;
print "\t -l log_filename\t\tFile for logging.\n";
print "\t -v\t\t\t\tVerbose.\n";
} ##usage
diff --git a/solenv/bin/modules/installer/windows/msp.pm
b/solenv/bin/modules/installer/windows/msp.pm
index 1e76947df7b0..069b5dfeb0f6 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -1194,7 +1194,7 @@ sub create_msp_patch
my $systemcall = "signtool.exe sign ";
if ( defined($ENV{'PFXFILE'}) ) { $systemcall .= "-f $ENV{'PFXFILE'}
"; }
if ( defined($ENV{'PFXPASSWORD'}) ) { $systemcall .= "-p
$ENV{'PFXPASSWORD'} "; }
- if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= "-t
$ENV{'TIMESTAMPURL'} "; } else { $systemcall .= "-t
http://timestamp.globalsign.com/scripts/timestamp.dll "; }
+ if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= "-t
$ENV{'TIMESTAMPURL'} "; } else { $systemcall .= "-t
http://timestamp.digicert.com/ "; }
$systemcall .= "-d \"" . $allvariables->{'PRODUCTNAME'} . " " .
$allvariables->{'PRODUCTVERSION'} . " Patch " .
$allvariables->{'WINDOWSPATCHLEVEL'} . "\" ";
$systemcall .= $localmspfilename;
installer::logger::print_message( "... code signing and timestamping
with signtool.exe ...\n" );
commit 3e67455f666b272c5c9465d815e9b78c853c55d4
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Fri May 5 16:20:35 2017 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 18:17:28 2022 +0100
[cp] 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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94479
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/svx/source/dialog/crashreportdlg.cxx
b/svx/source/dialog/crashreportdlg.cxx
index 4e087aeae2d5..8492ca3eccf3 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -25,16 +25,17 @@ CrashReportDialog::CrashReportDialog(weld::Window* pParent)
, mxBtnCancel(m_xBuilder->weld_button("btn_cancel"))
, mxBtnClose(m_xBuilder->weld_button("btn_close"))
, mxEditPreUpload(m_xBuilder->weld_label("ed_pre"))
- , mxEditPostUpload(m_xBuilder->weld_text_view("ed_post"))
+ , mxEditPostUpload(m_xBuilder->weld_label("ft_post"))
, mxBugReportMailto(m_xBuilder->weld_link_button("bugreport_mailto"))
, mxCBSafeMode(m_xBuilder->weld_check_button("check_safemode"))
, mxPrivacyPolicyButton(m_xBuilder->weld_link_button("btnPrivacyPolicy"))
{
- maSuccessMsg = mxEditPostUpload->get_text();
+ maSuccessMsg = mxEditPostUpload->get_label();
auto nWidth = mxEditPreUpload->get_preferred_size().Width();
nWidth = std::max(nWidth, mxCBSafeMode->get_size_request().Width());
mxEditPreUpload->set_size_request(nWidth, -1);
+ mxEditPostUpload->set_size_request(nWidth, -1);
mxCBSafeMode->set_size_request(nWidth, -1);
mxBtnSend->connect_clicked(LINK(this, CrashReportDialog, BtnHdl));
@@ -78,11 +79,11 @@ IMPL_LINK(CrashReportDialog, BtnHdl, weld::Button&, rBtn,
void)
= maSuccessMsg.replaceAll("%CRASHID",
aCrashID.replaceAll("Crash-ID=", ""));
// vclbuilder seems to replace _ with ~ even in text
- mxEditPostUpload->set_text(aProcessedMessage.replaceAll("~", "_"));
+ mxEditPostUpload->set_label(aProcessedMessage.replaceAll("~",
"_"));
}
else
{
- mxEditPostUpload->set_text(aCrashID);
+ mxEditPostUpload->set_label(aCrashID);
}
mxBtnClose->show();
diff --git a/svx/source/dialog/crashreportdlg.hxx
b/svx/source/dialog/crashreportdlg.hxx
index f4b644b0ba66..10bd77ef89c6 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -24,7 +24,7 @@ private:
std::unique_ptr<weld::Button> mxBtnCancel;
std::unique_ptr<weld::Button> mxBtnClose;
std::unique_ptr<weld::Label> mxEditPreUpload;
- std::unique_ptr<weld::TextView> mxEditPostUpload;
+ std::unique_ptr<weld::Label> mxEditPostUpload;
std::unique_ptr<weld::LinkButton> mxBugReportMailto;
std::unique_ptr<weld::CheckButton> mxCBSafeMode;
std::unique_ptr<weld::LinkButton> mxPrivacyPolicyButton;
diff --git a/svx/uiconfig/ui/crashreportdlg.ui
b/svx/uiconfig/ui/crashreportdlg.ui
index 5d3b4e64a4db..56cbfe1c0b4f 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -3,9 +3,7 @@
<interface domain="svx">
<requires lib="gtk+" version="3.20"/>
<object class="GtkTextBuffer" id="textbuffer1">
- <property name="text" translatable="yes"
context="crashreportdlg|ed_post">The crash report was successfully uploaded.
-You can soon find the report at:
-https://crashreport.collaboraoffice.com/stats/crash_details/%CRASHID</property>
+ <property name="text" translatable="yes"
context="crashreportdlg|ed_post">The crash report was successfully
uploaded.</property>
</object>
<object class="GtkDialog" id="CrashReportDialog">
<property name="can_focus">False</property>
@@ -90,14 +88,11 @@ 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="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
<property name="buffer">textbuffer1</property>
- <property name="accepts_tab">False</property>
+ <property name="wrap">True</property>
</object>
<packing>
<property name="expand">False</property>
commit c21386a02d17079faaa0a47dc25826d567238b17
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Apr 12 17:06:37 2017 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 18:17:19 2022 +0100
[cp] Collabora Crashreport Dialog
(cherry picked from commit c51dc04cc3cd48e7d5ab51a1f88e36bda8707c73)
fix previous commit
(cherry picked from commit 4553bc1bfa72dce55566971e27b94f3a5bfcdc79)
Reviewed-on: https://gerrit.libreoffice.org/78402
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
204f83aede085bbe4f5bd6937238b2117e51c86a
Change-Id: Id44e446684993984cf5778c82eb0a990bdd2f465
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94478
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/svx/source/dialog/crashreportdlg.cxx
b/svx/source/dialog/crashreportdlg.cxx
index 33c879866cfd..4e087aeae2d5 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -26,7 +26,7 @@ CrashReportDialog::CrashReportDialog(weld::Window* pParent)
, mxBtnClose(m_xBuilder->weld_button("btn_close"))
, mxEditPreUpload(m_xBuilder->weld_label("ed_pre"))
, mxEditPostUpload(m_xBuilder->weld_text_view("ed_post"))
- , mxFtBugReport(m_xBuilder->weld_text_view("ed_bugreport"))
+ , mxBugReportMailto(m_xBuilder->weld_link_button("bugreport_mailto"))
, mxCBSafeMode(m_xBuilder->weld_check_button("check_safemode"))
, mxPrivacyPolicyButton(m_xBuilder->weld_link_button("btnPrivacyPolicy"))
{
@@ -86,7 +86,8 @@ IMPL_LINK(CrashReportDialog, BtnHdl, weld::Button&, rBtn,
void)
}
mxBtnClose->show();
- mxFtBugReport->show();
+
mxBugReportMailto->set_uri(mxBugReportMailto->get_uri().replaceAll("%CRASHID",
aCrashID.replaceAll("Crash-ID=","")));
+ mxBugReportMailto->show();
mxEditPostUpload->show();
mxBtnSend->set_sensitive(false);
mxBtnCancel->set_sensitive(false);
diff --git a/svx/source/dialog/crashreportdlg.hxx
b/svx/source/dialog/crashreportdlg.hxx
index 868f86c58e68..f4b644b0ba66 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -25,7 +25,7 @@ private:
std::unique_ptr<weld::Button> mxBtnClose;
std::unique_ptr<weld::Label> mxEditPreUpload;
std::unique_ptr<weld::TextView> mxEditPostUpload;
- std::unique_ptr<weld::TextView> mxFtBugReport;
+ std::unique_ptr<weld::LinkButton> mxBugReportMailto;
std::unique_ptr<weld::CheckButton> mxCBSafeMode;
std::unique_ptr<weld::LinkButton> mxPrivacyPolicyButton;
diff --git a/svx/uiconfig/ui/crashreportdlg.ui
b/svx/uiconfig/ui/crashreportdlg.ui
index dc7989f86847..5d3b4e64a4db 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -6,11 +6,6 @@
<property name="text" translatable="yes"
context="crashreportdlg|ed_post">The crash report was successfully uploaded.
You can soon find the report at:
https://crashreport.collaboraoffice.com/stats/crash_details/%CRASHID</property>
- </object>
- <object class="GtkTextBuffer" id="textbuffer2">
- <property name="text" translatable="yes"
context="crashreportdlg|ed_bugreport">Please check the report and if no bug
report is connected to the crash report yet, open a new bug report at
bugs.documentfoundation.org.
-Add detailed instructions on how to reproduce the crash and the shown crash ID
into the crash report field.
-Thank you for your help in improving %PRODUCTNAME.</property>
</object>
<object class="GtkDialog" id="CrashReportDialog">
<property name="can_focus">False</property>
@@ -111,13 +106,16 @@ 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_bugreport">
- <property name="can_focus">False</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="buffer">textbuffer2</property>
- <property name="accepts_tab">False</property>
+ <object class="GtkLinkButton" id="bugreport_mailto">
+ <property name="label" translatable="yes"
context="crashreportdlg|ed_post"> Click here to send an email to
supp...@collaboraoffice.com.
+In the message body please add detailed instructions on how to reproduce the
crash.
+Thank you for your help in improving %PRODUCTNAME.</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ <property
name="uri">mailto:supp...@collaboraoffice.com?subject=Crash report:
%CRASHID</property>
</object>
<packing>
<property name="expand">False</property>
commit a5172923c7ce7afdcda791eb91d30155005a7d8d
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Mar 29 16:55:17 2017 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 18:17:09 2022 +0100
[cp] enable crashreport on Windows
(cherry picked from commit ce263269dff121af85634ada7870f33632e02bdd)
Change-Id: I55df3da63919f76afcd4905b1898287e26c8c4f1
Reviewed-on: https://gerrit.libreoffice.org/78401
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94477
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/bin/upload_symbols.py b/bin/upload_symbols.py
index 277508da712e..23dcd3f47452 100755
--- a/bin/upload_symbols.py
+++ b/bin/upload_symbols.py
@@ -19,7 +19,7 @@ def main():
print("Usage: upload-symbols.py symbols.zip config.ini \"long
explanation\" [--system]")
sys.exit(1)
- base_url = "https://crashreport.libreoffice.org/";
+ base_url = "https://crashreport.collaboraoffice.com/";
upload_url = base_url + "upload/"
login_url = base_url + "accounts/login/"
diff --git a/desktop/source/app/crashreport.cxx
b/desktop/source/app/crashreport.cxx
index 7d70c9603d9a..fd0faf674e10 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -136,7 +136,7 @@ void CrashReporter::writeCommonInfo()
ucbhelper::InternetProxyDecider
proxy_decider(::comphelper::getProcessComponentContext());
static const OUStringLiteral protocol = u"https";
- static const OUStringLiteral url = u"crashreport.libreoffice.org";
+ static const OUStringLiteral url = u"crashreport.collaboraoffice.com";
const sal_Int32 port = 443;
const ucbhelper::InternetProxyServer proxy_server =
proxy_decider.getProxy(protocol, url, port);
@@ -147,7 +147,7 @@ void CrashReporter::writeCommonInfo()
maKeyValues.clear();
// limit the amount of code that needs to be executed before the crash
reporting
- addKeyValue("ProductName", "LibreOffice", AddItem);
+ addKeyValue("ProductName", "CollaboraOffice", AddItem);
addKeyValue("Version", LIBO_VERSION_DOTTED, AddItem);
addKeyValue("BuildID", utl::Bootstrap::getBuildIdData(""), AddItem);
addKeyValue("URL", protocol + "://" + url + "/submit/", AddItem);
diff --git a/svx/uiconfig/ui/crashreportdlg.ui
b/svx/uiconfig/ui/crashreportdlg.ui
index 3b661706ca31..dc7989f86847 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -5,7 +5,7 @@
<object class="GtkTextBuffer" id="textbuffer1">
<property name="text" translatable="yes"
context="crashreportdlg|ed_post">The crash report was successfully uploaded.
You can soon find the report at:
-https://crashreport.libreoffice.org/stats/crash_details/%CRASHID</property>
+https://crashreport.collaboraoffice.com/stats/crash_details/%CRASHID</property>
</object>
<object class="GtkTextBuffer" id="textbuffer2">
<property name="text" translatable="yes"
context="crashreportdlg|ed_bugreport">Please check the report and if no bug
report is connected to the crash report yet, open a new bug report at
bugs.documentfoundation.org.
commit fe146b6f795facc402e76df46f375149805bfcc1
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sat Jul 13 08:02:27 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 18:15:39 2022 +0100
[cp] use packagerevision for rpm, too
Change-Id: I8e1431e8db870c2782f22f8450b97cef180f1e33
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index e0d985be52be..fc8374aa8c21 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -313,7 +313,7 @@ sub create_epm_header
push(@epmheader, $line);
$line = "%release" . " " . $installer::globals::packagerevision . "\n";
- if ( $installer::globals::isrpmbuild ) { $line = "%release" . " " .
$installer::globals::buildid . "\n"; }
+ #if ( $installer::globals::isrpmbuild ) { $line = "%release" . " " .
$installer::globals::buildid . "\n"; }
push(@epmheader, $line);
# Description, Copyright and Vendor are multilingual and are defined in
commit 67642123db75d9ff08159ed8b0a381b39dfa2fb4
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Jul 14 20:28:13 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 17:57:15 2022 +0100
[cp] remove donate and community involvement infobars
Change-Id: I37c9c76eb88dea4effa786b62755ea8738efc3e0
Reviewed-on: https://gerrit.libreoffice.org/75600
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index b4924dc4474c..3b76f643f77a 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1418,64 +1418,6 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/,
const SfxHint& rHint )
GetDispatcher()->ExecuteList(SID_TIPOFTHEDAY,
SfxCallMode::SLOT, {}, { &aDocFrame });
}
- // inform about the community involvement
- const auto t0 =
std::chrono::system_clock::now().time_since_epoch();
- const sal_Int64 nLastGetInvolvedShown =
officecfg::Setup::Product::LastTimeGetInvolvedShown::get();
- const sal_Int64 nNow =
std::chrono::duration_cast<std::chrono::seconds>(t0).count();
- const sal_Int64 nPeriodSec(60 * 60 * 24 * 180); // 180 days in
seconds
- bool bUpdateLastTimeGetInvolvedShown = false;
-
- if (nLastGetInvolvedShown == 0)
- bUpdateLastTimeGetInvolvedShown = true;
- else if (nPeriodSec < nNow && nLastGetInvolvedShown < (nNow +
nPeriodSec/2) - nPeriodSec) // 90d alternating with donation
- {
- bUpdateLastTimeGetInvolvedShown = true;
-
- VclPtr<SfxInfoBarWindow> pInfoBar =
AppendInfoBar("getinvolved", "", SfxResId(STR_GET_INVOLVED_TEXT),
InfobarType::INFO);
-
- if (pInfoBar)
- {
- weld::Button& rGetInvolvedButton =
pInfoBar->addButton();
-
rGetInvolvedButton.set_label(SfxResId(STR_GET_INVOLVED_BUTTON));
- rGetInvolvedButton.connect_clicked(LINK(this,
SfxViewFrame, GetInvolvedHandler));
- }
- }
-
- if (bUpdateLastTimeGetInvolvedShown
- &&
!officecfg::Setup::Product::LastTimeGetInvolvedShown::isReadOnly())
- {
- std::shared_ptr<comphelper::ConfigurationChanges>
batch(comphelper::ConfigurationChanges::create());
-
officecfg::Setup::Product::LastTimeGetInvolvedShown::set(nNow, batch);
- batch->commit();
- }
-
- // inform about donations
- const sal_Int64 nLastDonateShown =
officecfg::Setup::Product::LastTimeDonateShown::get();
- bool bUpdateLastTimeDonateShown = false;
-
- if (nLastDonateShown == 0)
- bUpdateLastTimeDonateShown = true;
- else if (nPeriodSec < nNow && nLastDonateShown < nNow -
nPeriodSec) // 90d alternating with getinvolved
- {
- bUpdateLastTimeDonateShown = true;
-
- VclPtr<SfxInfoBarWindow> pInfoBar =
AppendInfoBar("donate", "", SfxResId(STR_DONATE_TEXT), InfobarType::INFO);
- if (pInfoBar)
- {
- weld::Button& rDonateButton = pInfoBar->addButton();
- rDonateButton.set_label(SfxResId(STR_DONATE_BUTTON));
- rDonateButton.connect_clicked(LINK(this, SfxViewFrame,
DonationHandler));
- }
- }
-
- if (bUpdateLastTimeDonateShown
- &&
!officecfg::Setup::Product::LastTimeDonateShown::isReadOnly())
- {
- std::shared_ptr<comphelper::ConfigurationChanges>
batch(comphelper::ConfigurationChanges::create());
- officecfg::Setup::Product::LastTimeDonateShown::set(nNow,
batch);
- batch->commit();
- }
-
// read-only infobar if necessary
const SfxViewShell *pVSh;
const SfxShell *pFSh;
commit 7828575b04754c54f039c8f997933d2472da1d3f
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue Apr 17 13:28:26 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 17:55:27 2022 +0100
[cp] Remove Help - Donate to LibreOffice menu item
... and remove Help - Get Involved menu item, too
Change-Id: I7a701173f596306ee628ae4a12ad81d2d756caca
diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml
b/basctl/uiconfig/basicide/menubar/menubar.xml
index ac59065c9daf..68f7cbab6742 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -166,9 +166,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/chart2/uiconfig/menubar/menubar.xml
b/chart2/uiconfig/menubar/menubar.xml
index 354ebbc1903a..dca2eaff7efe 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -167,9 +167,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml
b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
index 7038a63608a7..34d8b8f5dc0e 100644
--- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
@@ -154,9 +154,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml
b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
index 8227446b4b89..e896abfa00da 100644
--- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
@@ -109,9 +109,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
index 6e3df781eca9..fbeda4a1e9c2 100644
--- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
@@ -93,9 +93,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml
b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
index bbd4a7428f74..4ef7c80a26a2 100644
--- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
@@ -93,9 +93,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
index bbf379953e85..c858d89878e4 100644
--- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
@@ -118,9 +118,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/extensions/uiconfig/sbibliography/menubar/menubar.xml
b/extensions/uiconfig/sbibliography/menubar/menubar.xml
index 3604c1b760a1..65f55fff0012 100644
--- a/extensions/uiconfig/sbibliography/menubar/menubar.xml
+++ b/extensions/uiconfig/sbibliography/menubar/menubar.xml
@@ -67,9 +67,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml
b/framework/uiconfig/startmodule/menubar/menubar.xml
index 96ac15d10f81..ed9c298b7413 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -67,9 +67,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml
b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
index 2ca14f363a5d..1c126e0cfdd2 100644
--- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml
+++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
@@ -284,9 +284,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml
b/sc/uiconfig/scalc/menubar/menubar.xml
index eeb746de8432..bc1774817070 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -773,9 +773,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml
b/sd/uiconfig/sdraw/menubar/menubar.xml
index fd327d6bc91b..7c8969967b0f 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -650,9 +650,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml
b/sd/uiconfig/simpress/menubar/menubar.xml
index fc64d6050e6e..e0f328065ac8 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -681,9 +681,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/starmath/uiconfig/smath/menubar/menubar.xml
b/starmath/uiconfig/smath/menubar/menubar.xml
index 04ca77df844b..f1dbdf8745a9 100644
--- a/starmath/uiconfig/smath/menubar/menubar.xml
+++ b/starmath/uiconfig/smath/menubar/menubar.xml
@@ -160,9 +160,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml
b/sw/uiconfig/sglobal/menubar/menubar.xml
index b8dafe715afe..f4ee1b00f9f4 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -794,9 +794,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml
b/sw/uiconfig/sweb/menubar/menubar.xml
index b8d6bc1b711a..c12f092d1529 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -660,9 +660,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml
b/sw/uiconfig/swform/menubar/menubar.xml
index 652ea24bfbb4..0969d09e6ef6 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -741,9 +741,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml
b/sw/uiconfig/swreport/menubar/menubar.xml
index c2562ee5d521..c2ec64887c94 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -699,9 +699,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml
b/sw/uiconfig/swriter/menubar/menubar.xml
index e27ca8aa3cad..8c751acf9fdb 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -815,9 +815,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml
b/sw/uiconfig/swxform/menubar/menubar.xml
index e70d8b7e60de..39a7462e4f39 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -788,9 +788,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuitem menu:id=".uno:Donation"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
commit d66b2d68f0e2ac33b04023247698bc93b7454b6a
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue Apr 17 14:06:38 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 17:54:24 2022 +0100
[cp] Send feedback to he...@collaboraoffice.com
Change-Id: Ic734235426001e4aa7119476c1e6884b7c39776d
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index ccb93bfc4c6b..d78975afc650 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -500,10 +500,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
case SID_SEND_FEEDBACK:
{
OUString module = SfxHelp::GetCurrentModuleIdentifier();
- OUString
sURL(officecfg::Office::Common::Menus::SendFeedbackURL::get() +
//officecfg/registry/data/org/openoffice/Office/Common.xcu =>
https://hub.libreoffice.org/send-feedback/
- "?LOversion=" +
utl::ConfigManager::getAboutBoxProductVersion() +
- "&LOlocale=" + utl::ConfigManager::getUILocale() +
- "&LOmodule=" + module.subView(module.lastIndexOf('.') + 1 ) );
+ OUString
sURL("mailto:he...@collaboraoffice.com?Subject=Version:%20"; +
utl::ConfigManager::getAboutBoxProductVersion() +
+ ",%20Locale:%20" + utl::ConfigManager::getUILocale() +
",%20Module:%20" + module.subView(module.lastIndexOf('.') + 1 ) );
sfx2::openUriExternally(sURL, false, rReq.GetFrameWeld());
break;
}
commit b1164dfa3ea8a0827f74dca6589aac7a18943c4b
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Thu Jul 5 23:27:53 2018 -0700
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 17:52:07 2022 +0100
[cp] Take MsiMsp.Exe from Windows SDK 7.1A
Change-Id: I68914ca86fa9cabaac3ce28d9aa870a522cdb2da
Reviewed-on: https://gerrit.libreoffice.org/78988
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/solenv/bin/modules/installer/windows/msp.pm
b/solenv/bin/modules/installer/windows/msp.pm
index 1bbeea8d20cb..1e76947df7b0 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -198,7 +198,7 @@ sub execute_msimsp
{
my ($fullpcpfilename, $mspfilename, $localmspdir) = @_;
- my $msimsp = "msimsp.exe"; # Has to be in the path
+ my $msimsp = "/cygdrive/c/PROGRA~2/MICROS~1/Windows/v7.1A/Bin/MsiMsp.Exe";
# FIXME Higher versions of Windows SDK do not have mspatchc.dll :(
my $infoline = "";
my $systemcall = "";
my $returnvalue = "";
commit 3af41404233abe945e640fd2f5da25c2fa82522d
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Jun 3 12:34:00 2018 -0700
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 17:52:02 2022 +0100
[cp] MSP: add System64 folder path
Change-Id: I5dba3dfb3a68d33608f2c2a7db026063063982ec
diff --git a/solenv/bin/modules/installer/windows/admin.pm
b/solenv/bin/modules/installer/windows/admin.pm
index 54396ac27835..f822afe7eaec 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -289,6 +289,7 @@ sub create_directory_structure
}
# FIXME why is this hack needed? ERROR: Did not find full directory path
for dir: "ystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"
$fullpathhash{"SystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"}
= $targetdir . $installer::globals::separator . "System";
+
$fullpathhash{"System64Folder_amd64_VC.AF4EABEE_4589_3789_BA0A_C83A71662E1D"} =
$targetdir . $installer::globals::separator . "System64";
return \%fullpathhash;
}
commit 4618e4bd41604a97d6581bd55d73f7083eb0851d
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Sep 6 01:31:01 2015 -0700
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 17:51:57 2022 +0100
[cp] hack to fix an MSP creation error
(cherry picked from commit ded9e51fda12d01e381a5353e6ee412ec89548ff)
(cherry picked from commit 07d93f57b99c077d6b3062ddafea56e021122111)
Change-Id: Ifa833d3adfce5dcc247a8c6e2f972c0638e5c05c
diff --git a/solenv/bin/modules/installer/windows/admin.pm
b/solenv/bin/modules/installer/windows/admin.pm
index 27e4ba7c3232..54396ac27835 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -287,6 +287,8 @@ sub create_directory_structure
{
if ( ! exists($fullpathhash{$dir}) ) { $fullpathhash{$dir} =
$targetdir; }
}
+ # FIXME why is this hack needed? ERROR: Did not find full directory path
for dir: "ystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"
+ $fullpathhash{"SystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"}
= $targetdir . $installer::globals::separator . "System";
return \%fullpathhash;
}
commit 357f8ad4f4401902ec3b08a8982d56f476a5f9bb
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Thu Mar 9 12:28:39 2017 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 17:51:38 2022 +0100
[cp] don't allow space in INSTALLDIRNAME
(cherry picked from commit 2fc7778ba2ce545ecb6bd2e60a09eeb8fdb44b49)
Change-Id: I4c20ab9051b49149d4cd52339a61c98f5f62226b
diff --git a/configure.ac b/configure.ac
index 47dfd552daab..ee8a65315d71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14095,7 +14095,7 @@ else
fi
AC_SUBST(WITH_COMPAT_OOWRAPPERS)
-INSTALLDIRNAME=`echo AC_PACKAGE_NAME | $AWK '{print tolower($0)}'`
+INSTALLDIRNAME=`echo AC_PACKAGE_NAME | $AWK '{gsub(" ", "", $0);print
tolower($0)}'`
AC_MSG_CHECKING([for install dirname])
if test -n "$with_install_dirname" -a "$with_install_dirname" != "no" -a
"$with_install_dirname" != "yes"; then
INSTALLDIRNAME="$with_install_dirname"
commit bdf4ac21a18acc4a48dd31d6a16395504cfe6975
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Mar 2 11:09:50 2016 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 17:51:30 2022 +0100
[cp] don't package 'install' script because it's not for end users
(cherry picked from commit 74d90488662c55fd5f31b203e02b228137b42076)
(cherry picked from commit ccf572e5e4a0a2fe1c3f5b9a166e2d5e4277c83a)
Change-Id: I64ea8d8722c9da252c6142a862e9363759d38ba3
diff --git a/scp2/source/ooo/scpaction_ooo.scp
b/scp2/source/ooo/scpaction_ooo.scp
index 718539796bd2..e09d72848dad 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -36,14 +36,6 @@ ScpAction scp_Copy_Readme_Txt
End
#endif
-#if !defined(WNT) && !defined(MACOSX) && defined(WITH_RPM)
-ScpAction scp_Copy_Install
- Copy = "scripts/install";
- Name = "install";
- UnixRights = 755;
-End
-#endif
-
#ifdef MACOSX
ScpAction scp_Copy_Dmg_Background_Image
Copy = "osxdndinstall.png";
commit 5feb1b00f667c24b1959c1ac0488bc994291e047
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sat Oct 31 23:34:21 2015 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 17:51:24 2022 +0100
[cp] macOS: remove LibreOffice readme+license from Collabora Office DMG
(cherry picked from commit 08f328e20e85d41793413df6ed653d033b499517)
(cherry picked from commit 8988a747cb8937da96f4f2b5164b393fb988f6f5)
Change-Id: Ie62c6a98563261e3601be70ff5eff6603b625445
diff --git a/scp2/source/ooo/scpaction_ooo.scp
b/scp2/source/ooo/scpaction_ooo.scp
index 415963480734..718539796bd2 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -18,15 +18,7 @@
#include "macros.inc"
-#ifdef MACOSX
-ScpAction scp_Copy_Thirdpartylicense_Readme_Html
- Copy = "license.html";
- Name= "license.html";
- Subdir = "LICENSEs";
-End
-#endif
-
-#ifndef WNT
+#if !defined(WNT) && !defined(MACOSX)
ScpAction scp_Copy_Readme_Txt
#ifdef UNX
README_ALL_LANG(Copy, README);
commit 0a1f08f1ffaa6f3b9adf28a0ded8dac74f446abe
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon May 14 16:02:08 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 17:51:19 2022 +0100
[cp] MSI: do not install LibreLogo by default
Change-Id: Ibde24b2045497aca4ea37845fc42c327d22d3d42
diff --git a/scp2/source/python/module_python_librelogo.scp
b/scp2/source/python/module_python_librelogo.scp
index 1102b8750252..6f0dbc89d1df 100644
--- a/scp2/source/python/module_python_librelogo.scp
+++ b/scp2/source/python/module_python_librelogo.scp
@@ -19,7 +19,7 @@ Module gid_Module_Optional_Pyuno_LibreLogo
Sortkey = "810";
Files = (auto_python_librelogo_ALL,
gid_File_Share_Registry_LibreLogo_Xcd);
- Default = YES;
+ Default = NO;
Styles = ( );
End
#endif
commit 854a1eae063ccce79e46f36e44348fcc269493f7
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Jun 21 14:41:22 2015 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 17:51:10 2022 +0100
[cp] ERROR ITMS-90511: CFBundleIdentifier Collision
(cherry picked from commit 5c70145805eb3bc4968f1aed8695fdc4468705ab)
(cherry picked from commit 345e3c7843e1cae01080548568fb6eaa6930a2b9)
Change-Id: I4413853a2e8c23af770323a1e7b21cedb637cfb1
diff --git a/extensions/source/macosx/spotlight/mdimporter/Info.plist
b/extensions/source/macosx/spotlight/mdimporter/Info.plist
index 5a60493cb455..ab007aff37c0 100644
--- a/extensions/source/macosx/spotlight/mdimporter/Info.plist
+++ b/extensions/source/macosx/spotlight/mdimporter/Info.plist
@@ -59,7 +59,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
- <string>org.libreoffice.mdimporter</string>
+ <string>com.collaboraoffice.mdimporter</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleVersion</key>
@@ -82,6 +82,6 @@
</dict>
<key>CFPlugInUnloadFunction</key>
<string></string>
-
+
</dict>
</plist>
commit 68ee9bfb62e03dcaeacb796c1f69e349360115af
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue Jun 3 11:29:52 2014 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 13 17:51:01 2022 +0100
[cp] Multilingual Mac OS X DMG for Collabora
(cherry picked from commit 561581cd39022e82a0bc961be7c2406dfb1b94f3)
(cherry picked from commit 32e13ccac64777722a96df47aca868e263db94cd)
(cherry picked from commit 229a7cdac952bbea8263bb24b93a2456fc1a1b51)
Change-Id: Icfa638141e99af3ba313cf235228fbab8b3594d2
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index 1259fc19df6c..adef0bfe3b24 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -116,7 +116,7 @@ ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk
endif
else # LIBO_TEST_INSTALL
- $(call instsetoo_native_install_command,openoffice,$(if $(filter
WNT,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT))
+ $(call instsetoo_native_install_command,openoffice,$(if $(filter WNT
MACOSX,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT))
ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,$(PKGFORMAT))
endif
@@ -124,7 +124,7 @@ ifeq (HELP,$(filter HELP,$(BUILD_TYPE))$(filter
MACOSX,$(OS)))
$(foreach lang,$(gb_HELP_LANGS),\
$(call
instsetoo_native_install_command,ooohelppack,$(lang),,-helppack,$(PKGFORMAT)))
endif
-ifneq (WNT,$(OS))
+ifeq (,$(filter WNT MACOSX,$(OS)))
$(foreach lang,$(instsetoo_native_WITH_LANG),\
$(call
instsetoo_native_install_command,ooolangpack,$(lang),,-languagepack,$(PKGFORMAT)))
endif
