vcl/qt5/QtInstanceBuilder.cxx | 3 +++
vcl/qt5/QtInstanceRadioButton.cxx | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 342613810cf22fe3855b5cee12a0c6933fb18ce9
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sat Feb 22 00:07:50 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Feb 22 10:56:15 2025 +0100
tdf#130857 qt weld: Support macro security dialog
This means that native Qt widgets are used for that dialog
now when using the qt5 or qt6 VCL plugin and starting LO with
environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set.
This makes use of QtInstanceWindow::GetXWindow supported
since
Change-Id: I55637876c9b93bbbfb63459caba6c89dfd4188a9
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Fri Feb 21 23:48:47 2025 +0100
tdf#130857 qt weld: Introduce QtXWindow
To trigger the dialog + file dialog:
* start Writer
* "Tools" -> "Options" -> "Security" -> "Macro Security"
* in the "Macro Security" dialog, switch to the "Trusted Sources"
tab
* Click on the "Add" button in the "Trusted File Locations" section
to open a folder picker.
Change-Id: I117fcc966b1189d2d04f59a37df2f0b505c7970e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182026
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index 9dc90007c733..fa776220f574 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -128,6 +128,9 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile)
u"vcl/ui/printerpaperpage.ui"_ustr,
u"vcl/ui/printerpropertiesdialog.ui"_ustr,
u"vcl/ui/printprogressdialog.ui"_ustr,
+ u"xmlsec/ui/macrosecuritydialog.ui"_ustr,
+ u"xmlsec/ui/securitylevelpage.ui"_ustr,
+ u"xmlsec/ui/securitytrustpage.ui"_ustr,
u"writerperfect/ui/exportepub.ui"_ustr,
};
commit 9f3680935c15c780a3ab93fce3595a877a6b0f39
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sat Feb 22 00:03:49 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Feb 22 10:56:09 2025 +0100
tdf#130857 qt weld: Demote assert about radio button word wrap
Replace the assert by a warning that QRadioButton doesn't support
word wrap, so there's little that can be done on LibreOffice side at
the moment (other than implementing a custom widget), see QTBUG-5370 [1].
[1] https://bugreports.qt.io/browse/QTBUG-5370
Change-Id: I272f1916080e1ecdb04c7fdb0118b3c100c90fcb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182025
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceRadioButton.cxx
b/vcl/qt5/QtInstanceRadioButton.cxx
index 31475dd91d59..2ad75a7227e7 100644
--- a/vcl/qt5/QtInstanceRadioButton.cxx
+++ b/vcl/qt5/QtInstanceRadioButton.cxx
@@ -57,7 +57,8 @@ OUString QtInstanceRadioButton::get_label() const
void QtInstanceRadioButton::QtInstanceRadioButton::set_label_wrap(bool
/*bWrap*/)
{
- assert(false && "Not implemented yet");
+ // https://bugreports.qt.io/browse/QTBUG-5370
+ SAL_WARN("vcl.qt", "Qt doesn't support word wrap in radio buttons (see
QTBUG-5370)");
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
