vcl/qt5/QtInstanceBuilder.cxx | 2 ++
vcl/qt5/QtInstanceTextView.cxx | 10 +++++++++-
xmlsecurity/inc/bitmaps.hlst | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 96596b48681af169256119e84a5a150aedbe4422
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Jul 30 13:49:09 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Jul 31 18:49:46 2025 +0200
tdf#130857 xmlsecurity: Fix path for unvalidated cert icon
The path was missing an "s" in "xmlsecurity".
As a consequence, the icon couldn't be loaded, and thus
couldn't be displayed.
For the qt6 VCL plugin with SAL_VCL_QT_USE_WELDED_WIDGETS=1,
it triggered first a warning, and then an assert:
warn:vcl:3089384:3089384:vcl/source/bitmap/BitmapEx.cxx:103:
BitmapEx::BitmapEx(): could not load image
xmlecurity/res/notcertificate_40x56.png via icon theme breeze
soffice.bin:
/home/michi/development/git/libreoffice/include/vcl/qt/QtUtils.hxx:48: QPixmap
toQPixmap(const BitmapEx &): Assertion `!aPixmap.isNull() && "Failed to create
icon pixmap"' failed.
Support for that dialog was added in previous commit
Change-Id: Ib0ec32ff50744f4e265a743f2b0e5f240253ee5f
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Wed Jul 30 11:51:12 2025 +0200
tdf#130857 qt weld: Support "View Certificate" dialog
The issue could be triggered as follows when a GPG certificate
that is not considered validated is used:
* start Writer
* save doc
* "File" -> "Digital Signatures" -> "Digital Signatures"
* press "Sign Document"
* select an existing certificate/GPG key
* press "View Certificate"
Now, the icon is shown as expected with all of gtk3, gen and qt6.
Path was spelled the wrong way way ever since
commit 7bd87eb30ca5df683fa3bd94ca5be9dbca362c03
Date: Wed Apr 26 09:35:24 2017 +0100
remove xmlsecurity bitmaps from .src files
Change-Id: Icbe2f56dc0b831a0d56fc2707fed6480cb0b9bae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188600
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/xmlsecurity/inc/bitmaps.hlst b/xmlsecurity/inc/bitmaps.hlst
index 42248818392f..f11359db61bf 100644
--- a/xmlsecurity/inc/bitmaps.hlst
+++ b/xmlsecurity/inc/bitmaps.hlst
@@ -9,7 +9,7 @@
#pragma once
-inline constexpr OUString BMP_STATE_NOT_VALIDATED =
u"xmlecurity/res/notcertificate_40x56.png"_ustr;
+inline constexpr OUString BMP_STATE_NOT_VALIDATED =
u"xmlsecurity/res/notcertificate_40x56.png"_ustr;
#define BMP_CERT_OK "xmlsecurity/res/certificate_16.png"
#define BMP_CERT_NOT_OK "xmlsecurity/res/notcertificate_16.png"
commit 2441ba4e65538560177621560b16c5078d15e4fc
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Jul 30 11:51:12 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Jul 31 18:49:40 2025 +0200
tdf#130857 qt weld: Support "View Certificate" 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 dialog can be triggered as follows:
* start Writer
* save doc
* "File" -> "Digital Signatures" -> "Digital Signatures"
* press "Sign Document"
* select an existing certificate/GPG key
* press "View Certificate"
Change-Id: Ib0ec32ff50744f4e265a743f2b0e5f240253ee5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188599
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index e1ea56634e0d..31bfced4044c 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -190,6 +190,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile, const weld::W
u"xmlsec/ui/macrosecuritydialog.ui"_ustr,
u"xmlsec/ui/securitylevelpage.ui"_ustr,
u"xmlsec/ui/securitytrustpage.ui"_ustr,
+ u"xmlsec/ui/viewcertdialog.ui"_ustr,
u"writerperfect/ui/exportepub.ui"_ustr,
};
@@ -202,6 +203,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile, const weld::W
u"cui/ui/textattrtabpage.ui"_ustr,
u"cui/ui/textanimtabpage.ui"_ustr,
u"cui/ui/textcolumnstabpage.ui"_ustr, u"svt/ui/datewindow.ui"_ustr,
u"svx/ui/colorwindow.ui"_ustr, u"vcl/ui/editmenu.ui"_ustr,
+ u"xmlsec/ui/certdetails.ui"_ustr, u"xmlsec/ui/certgeneral.ui"_ustr,
};
if (aSupportedUIFiles.contains(rUIFile))
commit eb248d7c15b4027065afa1aedd9afe6a5d5e1e14
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Jul 30 11:50:01 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Jul 31 18:49:35 2025 +0200
tdf#130857 qt weld: Implement QtInstanceTextView::set_monospace
Used e.g. by the "View Certificate" dialog for which
support will be added in an upcoming commit.
Change-Id: Ibd2c8236df812481f81274be8d0c53e268fcf7d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188598
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceTextView.cxx b/vcl/qt5/QtInstanceTextView.cxx
index fab6f2809561..cb37716a43b1 100644
--- a/vcl/qt5/QtInstanceTextView.cxx
+++ b/vcl/qt5/QtInstanceTextView.cxx
@@ -91,7 +91,15 @@ bool QtInstanceTextView::get_editable() const
return bEditable;
}
-void QtInstanceTextView::set_monospace(bool) { assert(false && "Not
implemented yet"); }
+void QtInstanceTextView::set_monospace(bool bMonospace)
+{
+ SolarMutexGuard g;
+
+ GetQtInstance().RunInMainThread([&] {
+ m_pTextEdit->setFont(bMonospace ?
QFontDatabase::systemFont(QFontDatabase::FixedFont)
+ : QApplication::font());
+ });
+}
void QtInstanceTextView::set_max_length(int) { assert(false && "Not
implemented yet"); }
