diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-15 20:59:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-17 09:13:14 +0100 |
| commit | 61964fc19da92ad5ff988fc071a94da61434fb7d (patch) | |
| tree | 21e80ba2f88ccddd9dc8f7a99b2f224f31fe4a0a /vcl/source | |
| parent | 1c90deaa3f03978fcd31e8cf5c71e39cea455326 (diff) | |
weld SvxJavaClassPathDlg
Change-Id: I3938a05d96cb1fc171611e54fa34f780ba569268
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 4f5c0850418c..9556fcd8c659 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -1313,14 +1313,19 @@ public: nInsertedAt = m_xTreeView->InsertEntry(rStr, pos == -1 ? COMBOBOX_APPEND : pos); else { - assert((rImage == "dialog-warning" || rImage == "dialog-error" || rImage == "dialog-information") && "unknown stock image"); Image aImage; - if (rImage == "dialog-warning") - aImage = Image(BitmapEx(IMG_WARN)); - else if (rImage == "dialog-error") - aImage = Image(BitmapEx(IMG_ERROR)); - else if (rImage == "dialog-information") - aImage = Image(BitmapEx(IMG_INFO)); + if (rImage.lastIndexOf('.') != rImage.getLength() - 4) + { + assert((rImage == "dialog-warning" || rImage == "dialog-error" || rImage == "dialog-information") && "unknown stock image"); + if (rImage == "dialog-warning") + aImage = Image(BitmapEx(IMG_WARN)); + else if (rImage == "dialog-error") + aImage = Image(BitmapEx(IMG_ERROR)); + else if (rImage == "dialog-information") + aImage = Image(BitmapEx(IMG_INFO)); + } + else + aImage = Image(BitmapEx(rImage)); nInsertedAt = m_xTreeView->InsertEntry(rStr, aImage, pos == -1 ? COMBOBOX_APPEND : pos); } m_xTreeView->SetEntryData(nInsertedAt, new OUString(rId)); |