diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-09 12:07:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-12 17:22:14 +0100 |
| commit | a39a3f1ad1e5e39b09ce474c0f4c0f9f4e174bbe (patch) | |
| tree | 35c36f536d5eea1f6296c37f5f161e9b96f64794 /vcl/source/app | |
| parent | 1e3198931e6e230791e863272082c1d437975008 (diff) | |
weld impress annotation window
Change-Id: Idc89f4e382392103d373b6a84edaae10abd56056
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110650
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/app')
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index c5fba71e2b1a..867781476a18 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -694,7 +694,7 @@ Image createImage(const VirtualDevice& rDevice) sal_uInt16 insert_to_menu(sal_uInt16 nLastId, PopupMenu* pMenu, int pos, std::u16string_view rId, const OUString& rStr, const OUString* pIconName, const VirtualDevice* pImageSurface, - const css::uno::Reference<css::graphic::XGraphic>* pImage, + const css::uno::Reference<css::graphic::XGraphic>& rImage, TriState eCheckRadioFalse) { const sal_uInt16 nNewid = nLastId + 1; @@ -717,9 +717,9 @@ sal_uInt16 insert_to_menu(sal_uInt16 nLastId, PopupMenu* pMenu, int pos, std::u1 { pMenu->SetItemImage(nNewid, createImage(*pImageSurface)); } - else if (pImage) + else if (rImage) { - pMenu->SetItemImage(nNewid, Image(*pImage)); + pMenu->SetItemImage(nNewid, Image(rImage)); } return nNewid; } @@ -772,10 +772,10 @@ void SalInstanceMenu::set_visible(const OString& rIdent, bool bShow) void SalInstanceMenu::clear() { m_xMenu->Clear(); } void SalInstanceMenu::insert(int pos, const OUString& rId, const OUString& rStr, const OUString* pIconName, VirtualDevice* pImageSurface, - const css::uno::Reference<css::graphic::XGraphic>* pImage, + const css::uno::Reference<css::graphic::XGraphic>& rImage, TriState eCheckRadioFalse) { - m_nLastId = insert_to_menu(m_nLastId, m_xMenu, pos, rId, rStr, pIconName, pImageSurface, pImage, + m_nLastId = insert_to_menu(m_nLastId, m_xMenu, pos, rId, rStr, pIconName, pImageSurface, rImage, eCheckRadioFalse); } void SalInstanceMenu::insert_separator(int pos, const OUString& rId) |