sfx2/uiconfig/ui/deck.ui | 2 +-
sfx2/uiconfig/ui/infobar.ui | 2 +-
vcl/source/window/builder.cxx | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 96b461c36ec9c75bb03592c78c6fa641e3105c8d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jul 6 16:26:30 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jul 6 20:54:34 2021 +0200
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 <caol...@redhat.com>
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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
