From 68db2d42c1518fdb777faeff891155f350da538c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 5 Jun 2020 10:57:25 +0100 Subject: have just one way to set expander image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic07709a864620c6146616c8e0a1417343c0937de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95590 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- xmlsecurity/inc/certificateviewer.hxx | 1 + xmlsecurity/source/dialogs/certificateviewer.cxx | 4 +++- xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'xmlsecurity') diff --git a/xmlsecurity/inc/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx index 719db4764520..e0c42416b8b4 100644 --- a/xmlsecurity/inc/certificateviewer.hxx +++ b/xmlsecurity/inc/certificateviewer.hxx @@ -137,6 +137,7 @@ private: std::vector> maUserData; std::unique_ptr mxCertPathLB; + std::unique_ptr mxScratchIter; std::unique_ptr mxViewCertPB; std::unique_ptr mxCertStatusML; std::unique_ptr mxCertOK; diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index da924838c143..ea87640472c4 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -254,6 +254,7 @@ CertificateViewerCertPathTP::CertificateViewerCertPathTP(weld::Container* pParen , mpParent(pDlg) , mbFirstActivateDone(false) , mxCertPathLB(mxBuilder->weld_tree_view("signatures")) + , mxScratchIter(mxCertPathLB->make_iterator()) , mxViewCertPB(mxBuilder->weld_button("viewcert")) , mxCertStatusML(mxBuilder->weld_text_view("status")) , mxCertOK(mxBuilder->weld_label("certok")) @@ -358,7 +359,8 @@ void CertificateViewerCertPathTP::InsertCert(const weld::TreeIter* pParent, cons OUString sImage = bValid ? OUStringLiteral(BMP_CERT_OK) : OUStringLiteral(BMP_CERT_NOT_OK); maUserData.emplace_back(std::make_unique(rxCert, bValid)); OUString sId(OUString::number(reinterpret_cast(maUserData.back().get()))); - mxCertPathLB->insert(pParent, -1, &rName, &sId, nullptr, nullptr, &sImage, false, nullptr); + mxCertPathLB->insert(pParent, -1, &rName, &sId, nullptr, nullptr, false, mxScratchIter.get()); + mxCertPathLB->set_image(*mxScratchIter, sImage); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index d90bd33f9cfa..3d81083978f5 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -644,7 +644,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() } m_xSignaturesLB->insert(nullptr, n, nullptr, nullptr, - &sImage, nullptr, nullptr, false, nullptr); + &sImage, nullptr, false, nullptr); m_xSignaturesLB->set_text(n, aSubject, 1); m_xSignaturesLB->set_text(n, aIssuer, 2); m_xSignaturesLB->set_text(n, aDateTimeStr, 3); -- cgit