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>

3 files changed, 5 insertions, 2 deletions

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<std::unique_ptr<CertPath_UserData>> maUserData;
 
     std::unique_ptr<weld::TreeView> mxCertPathLB;
+    std::unique_ptr<weld::TreeIter> mxScratchIter;
     std::unique_ptr<weld::Button> mxViewCertPB;
     std::unique_ptr<weld::TextView> mxCertStatusML;
     std::unique_ptr<weld::Label> 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<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);