bin/upload_symbols.py | 2
desktop/source/app/crashreport.cxx | 4 -
distro-configs/CPWin32.conf | 2
distro-configs/CPWin64.conf | 2
extensions/source/macosx/spotlight/mdimporter/Info.plist | 4 -
include/connectivity/paramwrapper.hxx | 2
include/connectivity/sdbcx/VCollection.hxx | 2
include/ucbhelper/interactionrequest.hxx | 6 +-
include/vcl/IDialogRenderable.hxx | 2
include/vcl/metaact.hxx | 8 +--
instsetoo_native/CustomTarget_install.mk | 2
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2
postprocess/CustomTarget_signing.mk | 2
postprocess/signing/signing.pl | 2
scp2/source/ooo/scpaction_ooo.scp | 18 -------
scp2/source/python/module_python_librelogo.scp | 2
solenv/bin/modules/installer/windows/admin.pm | 3 +
svx/source/dialog/crashreportdlg.cxx | 14 +++--
svx/source/dialog/crashreportdlg.hxx | 4 -
svx/uiconfig/ui/crashreportdlg.ui | 33 +++++--------
20 files changed, 49 insertions(+), 67 deletions(-)
New commits:
commit 8b8701c4d449010d420617b6cf0263d21d28b9a0
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Sep 22 18:35:02 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 28 21:57:06 2023 +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 6998296ff4cc..92ab414486be 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3682,7 +3682,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 20c828cc613b8021df6fda160955f647de1e6e78
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Thu Feb 11 08:27:23 2021 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 28 21:56:11 2023 +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 29dcb4b0b1cd..0c33e32e43f7 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -129,7 +129,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 80a9c01866a3..13e6e940c385 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -243,7 +243,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
commit b143c95508be1b215756ce61796acf7fcd88577a
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Fri May 5 16:20:35 2017 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 28 21:55:34 2023 +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 eda5e0b379bb..4effe1dc636c 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -32,16 +32,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));
@@ -87,11 +88,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 a419fa106024..298d34cc8d87 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 a02f735ef2cc99d4c1be68118b70f645a013023a
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Apr 12 17:06:37 2017 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 28 21:55:21 2023 +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 d50f64131b11..eda5e0b379bb 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -33,7 +33,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"))
{
@@ -95,7 +95,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 f9d477f4d6f5..a419fa106024 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 2bb0bb7f2b7c42d636e708caa952b8908d7d8a15
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sat Jan 28 21:55:00 2023 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 28 21:55:00 2023 +0100
[cp] disable breakpad (crashreporting) on Windows temporarily
Change-Id: I38962c1d2304b5f722d5b9fa7259290925206f2b
diff --git a/distro-configs/CPWin32.conf b/distro-configs/CPWin32.conf
index d887146c01e0..1f8c4488426e 100644
--- a/distro-configs/CPWin32.conf
+++ b/distro-configs/CPWin32.conf
@@ -22,5 +22,5 @@
--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es
et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn
oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW
--enable-windows-build-signing
--enable-symbols
---enable-breakpad
+--disable-breakpad
--with-privacy-policy-url=https://www.collaboraoffice.com/privacy-policy/
diff --git a/distro-configs/CPWin64.conf b/distro-configs/CPWin64.conf
index b05265d8b408..e259c9348181 100644
--- a/distro-configs/CPWin64.conf
+++ b/distro-configs/CPWin64.conf
@@ -22,5 +22,5 @@
--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es
et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn
oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW
--enable-windows-build-signing
--enable-symbols
---enable-breakpad
+--disable-breakpad
--with-privacy-policy-url=https://www.collaboraoffice.com/privacy-policy/
commit a18c3a7802165cda4b390a30dcae67ca7de37e1c
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Mar 29 16:55:17 2017 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 28 21:51:42 2023 +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 fc6a2d8c1c95..e1e9da83068e 100755
--- a/bin/upload_symbols.py
+++ b/bin/upload_symbols.py
@@ -22,7 +22,7 @@ def main():
group.add_argument('--platform', choices=('Windows', 'Linux'))
args = parser.parse_args()
- 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 0458edf9793a..8c3502b95599 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 8eb6dab7b6e5881289d62bbf4388f97e5dc6ab7c
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Jun 3 12:34:00 2018 -0700
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 28 21:50:20 2023 +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 6ae8035ad33d..582fd78c6432 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -292,6 +292,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 3d99d11783455e9160728b03a93af5bc1b9dfb13
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Sep 6 01:31:01 2015 -0700
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 28 21:50:06 2023 +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 3bc2330d43bc..6ae8035ad33d 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -290,6 +290,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 f2d98f819b2f019cbad47ec2770ada47d11fd016
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Mar 2 11:09:50 2016 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 28 21:49:51 2023 +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 782bd6a4546a91775a6a1267b40fbcc57fd406c8
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sat Oct 31 23:34:21 2015 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 28 21:49:34 2023 +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 eea03b601f19bf95a6741ddae2f9a405ecfcdcdf
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon May 14 16:02:08 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 28 21:49:16 2023 +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 6e36a894489e5c83fc0cd49de73b62680d220f6e
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Jun 21 14:41:22 2015 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 28 21:48:47 2023 +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 1b01c6a1674b886b9f493901076c23d977bdc56f
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue Jul 20 11:54:05 2021 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 28 21:43:02 2023 +0100
these classes are used from non-merged libs
I found this bug with debug / ASAN build of LOKit. During startup:
program/libsclo.so: undefined symbol: _ZTIN3vcl23ILibreOfficeKitNotifierE
program/libfilelo.so: undefined symbol:
_ZTIN12connectivity5sdbcx17IObjectCollectionE
etc.
Change-Id: I2eb80d0b3002f174deea0d8657cb0cdbdec5be8f
diff --git a/include/connectivity/paramwrapper.hxx
b/include/connectivity/paramwrapper.hxx
index bf16e0851fcb..b862a619af85 100644
--- a/include/connectivity/paramwrapper.hxx
+++ b/include/connectivity/paramwrapper.hxx
@@ -49,7 +49,7 @@ namespace dbtools::param
/** wraps a parameter column as got from an SQLQueryComposer, so that it
has an additional
property "Value", which is forwarded to an XParameters interface
*/
- class UNLESS_MERGELIBS(OOO_DLLPUBLIC_DBTOOLS) ParameterWrapper final :
public ::cppu::OWeakObject
+ class OOO_DLLPUBLIC_DBTOOLS ParameterWrapper final : public
::cppu::OWeakObject
,public css::lang::XTypeProvider
,public ::comphelper::OMutexAndBroadcastHelper
,public ::cppu::OPropertySetHelper
diff --git a/include/connectivity/sdbcx/VCollection.hxx
b/include/connectivity/sdbcx/VCollection.hxx
index 0f5a0b3fbcb9..997df0dd2242 100644
--- a/include/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
@@ -58,7 +58,7 @@ namespace connectivity::sdbcx
typedef css::uno::Reference< css::beans::XPropertySet > ObjectType;
- class UNLESS_MERGELIBS(OOO_DLLPUBLIC_DBTOOLS) SAL_NO_VTABLE
IObjectCollection
+ class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE IObjectCollection
{
public:
virtual ~IObjectCollection();
diff --git a/include/ucbhelper/interactionrequest.hxx
b/include/ucbhelper/interactionrequest.hxx
index 78fc31f7a23b..16e9eda38b96 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -222,7 +222,7 @@ public:
* along with an interaction request to indicate the possibility to approve
* the request.
*/
-class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) InteractionApprove final : public
InteractionContinuation,
+class UCBHELPER_DLLPUBLIC InteractionApprove final : public
InteractionContinuation,
public css::lang::XTypeProvider,
public css::task::XInteractionApprove
{
@@ -255,7 +255,7 @@ public:
* along with an interaction request to indicate the possibility to disapprove
* the request.
*/
-class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) InteractionDisapprove final :
public InteractionContinuation,
+class UCBHELPER_DLLPUBLIC InteractionDisapprove final : public
InteractionContinuation,
public css::lang::XTypeProvider,
public css::task::XInteractionDisapprove
{
@@ -288,7 +288,7 @@ public:
* passed along with an authentication interaction request to enable the
* interaction handler to supply the missing authentication data.
*/
-class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) InteractionSupplyAuthentication
final :
+class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication final :
public InteractionContinuation,
public css::lang::XTypeProvider,
public css::ucb::XInteractionSupplyAuthentication2
diff --git a/include/vcl/IDialogRenderable.hxx
b/include/vcl/IDialogRenderable.hxx
index 68a573574186..bb5480f1bf4f 100644
--- a/include/vcl/IDialogRenderable.hxx
+++ b/include/vcl/IDialogRenderable.hxx
@@ -27,7 +27,7 @@ typedef std::pair<const OString, const OString>
LOKPayloadItem;
typedef sal_uInt32 LOKWindowId;
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) ILibreOfficeKitNotifier
+class VCL_DLLPUBLIC ILibreOfficeKitNotifier
{
public:
virtual ~ILibreOfficeKitNotifier();
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index c820d93b560c..06357c74a7eb 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -501,7 +501,7 @@ public:
void SetLen(sal_Int32 rLen) { mnLen = rLen; }
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaTextArrayAction final : public
MetaAction
+class VCL_DLLPUBLIC MetaTextArrayAction final : public MetaAction
{
private:
@@ -729,7 +729,7 @@ public:
void SetSize(const Size& rSz) { maSz = rSz; }
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaBmpScalePartAction final : public
MetaAction
+class VCL_DLLPUBLIC MetaBmpScalePartAction final : public MetaAction
{
private:
@@ -836,7 +836,7 @@ public:
bool IsTransparent() const override { return
GetBitmapEx().IsAlpha(); }
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaBmpExScalePartAction final : public
MetaAction
+class VCL_DLLPUBLIC MetaBmpExScalePartAction final : public MetaAction
{
private:
@@ -1084,7 +1084,7 @@ public:
void SetHatch(const Hatch& rHatch) { maHatch = rHatch; }
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaWallpaperAction final : public
MetaAction
+class VCL_DLLPUBLIC MetaWallpaperAction final : public MetaAction
{
private:
