diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-07-06 16:26:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-07-06 20:54:34 +0200 |
| commit | 96b461c36ec9c75bb03592c78c6fa641e3105c8d (patch) | |
| tree | 1eed8ccb22c336126c53196e38c120b632d15a89 | |
| parent | 5733166e7aeb7c1e08a3cd785d633e1e252e9c88 (diff) | |
add window-close-symbolic to allowed symbolic icon names
and for vcl use vcl/res/closedoc.png for it
Change-Id: If3c31298d40e6130de415998df8840021a706a3a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118516
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sfx2/uiconfig/ui/deck.ui | 2 | ||||
| -rw-r--r-- | sfx2/uiconfig/ui/infobar.ui | 2 | ||||
| -rw-r--r-- | vcl/source/window/builder.cxx | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/sfx2/uiconfig/ui/deck.ui b/sfx2/uiconfig/ui/deck.ui index 63252338677d..d3cd98e52981 100644 --- a/sfx2/uiconfig/ui/deck.ui +++ b/sfx2/uiconfig/ui/deck.ui @@ -101,7 +101,7 @@ <property name="can-focus">False</property> <property name="tooltip-text" translatable="yes" context="deck|SFX_STR_SIDEBAR_CLOSE_DECK">Close Sidebar Deck</property> <property name="use-underline">True</property> - <property name="icon-name">sfx2/res/closedoc.png</property> + <property name="icon-name">window-close-symbolic</property> <child internal-child="accessible"> <object class="AtkObject" id="button-atkobject"> <property name="AtkObject::accessible-name" translatable="yes" context="deck|SFX_STR_SIDEBAR_CLOSE_DECK">Close Sidebar Deck</property> diff --git a/sfx2/uiconfig/ui/infobar.ui b/sfx2/uiconfig/ui/infobar.ui index 3a9cc49a7f23..ae48bf3250c0 100644 --- a/sfx2/uiconfig/ui/infobar.ui +++ b/sfx2/uiconfig/ui/infobar.ui @@ -64,7 +64,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes" context="infobar|close|tooltip_text">Close Infobar</property> - <property name="icon_name">sfx2/res/closedoc.png</property> + <property name="icon_name">window-close-symbolic</property> </object> <packing> <property name="expand">False</property> diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 09dde08cb986..3a004e9fb660 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -108,6 +108,8 @@ namespace return IMG_PASTE; else if (sType == u"open-menu-symbolic") return IMG_MENU; + else if (sType == u"window-close-symbolic") + return SV_RESID_BITMAP_CLOSEDOC; else if (sType == u"x-office-calendar") return IMG_CALENDAR; return OUString(); |