Files
odfstudio/xmlsecurity/inc/bitmaps.hlst
T
Michael Weghorn 96596b4868 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.weghorn@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 7bd87eb30c
    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.weghorn@posteo.de>
2025-07-31 18:49:46 +02:00

22 lines
986 B
Plaintext

/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#pragma once
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"
inline constexpr OUString BMP_SIG_VALID = u"xmlsecurity/res/signet_11x16.png"_ustr;
inline constexpr OUString BMP_SIG_INVALID = u"svx/res/caution_11x16.png"_ustr;
inline constexpr OUString BMP_SIG_NOT_VALIDATED = u"xmlsecurity/res/notcertificate_16.png"_ustr;
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */