diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/salvtables.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 10 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index 2416aa6ab696..3e09d2b12f0d 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -153,7 +153,7 @@ public: virtual void clear() override; virtual void 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) override; virtual void insert_separator(int pos, const OUString& rId) override; virtual void remove(const OString& rId) override; 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) diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index c5b47e5080e3..2091c41d4135 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -8282,7 +8282,7 @@ public: virtual void insert(int pos, const OUString& rId, const OUString& rStr, const OUString* pIconName, VirtualDevice* pImageSurface, - const css::uno::Reference<css::graphic::XGraphic>* pGraphic, + const css::uno::Reference<css::graphic::XGraphic>& rGraphic, TriState eCheckRadioFalse) override { GtkWidget* pImage = nullptr; @@ -8298,9 +8298,9 @@ public: { pImage = image_new_from_virtual_device(*pImageSurface); } - else if (pGraphic) + else if (rGraphic) { - if (GdkPixbuf* pixbuf = getPixbuf(*pGraphic)) + if (GdkPixbuf* pixbuf = getPixbuf(rGraphic)) { pImage = gtk_image_new_from_pixbuf(pixbuf); g_object_unref(pixbuf); |