summaryrefslogtreecommitdiff
path: root/xmlsecurity/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-06-05 10:57:25 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-06-05 20:33:28 +0200
commit68db2d42c1518fdb777faeff891155f350da538c (patch)
tree5a07696b7e09451541ae1215a96863ac14aadfc9 /xmlsecurity/source
parent638f2642769cc73ad6dfa75d33145f03fa408d7f (diff)
have just one way to set expander image
Change-Id: Ic07709a864620c6146616c8e0a1417343c0937de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95590 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'xmlsecurity/source')
-rw-r--r--xmlsecurity/source/dialogs/certificateviewer.cxx4
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx2
2 files changed, 4 insertions, 2 deletions
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<CertPath_UserData>(rxCert, bValid));
OUString sId(OUString::number(reinterpret_cast<sal_Int64>(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);