sd/uiconfig/simpress/ui/remotedialog.ui | 4 ++--
vcl/inc/strings.hrc | 1 -
vcl/source/window/builder.cxx | 2 --
3 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit f9fb9de15fcae9051de9fdba6e0fd8921c9224ba
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jan 5 20:35:11 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jan 6 19:54:17 2021 +0100
replace only use of deprecated gtk-connect
Change-Id: I09cdb5c109b67f3686e701468c5a814c6c184832
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108819
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/uiconfig/simpress/ui/remotedialog.ui
b/sd/uiconfig/simpress/ui/remotedialog.ui
index 79e55d8e58c7..df93b98dfc88 100644
--- a/sd/uiconfig/simpress/ui/remotedialog.ui
+++ b/sd/uiconfig/simpress/ui/remotedialog.ui
@@ -22,13 +22,13 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ok">
- <property name="label">gtk-connect</property>
+ <property name="label" translatable="yes"
context="remotedialog|ok">C_onnect</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc
index d97ef387d9f4..152e97ab2c50 100644
--- a/vcl/inc/strings.hrc
+++ b/vcl/inc/strings.hrc
@@ -78,7 +78,6 @@
#define SV_BUTTONTEXT_PLAY NC_("SV_BUTTONTEXT_PLAY",
"~Play")
#define SV_BUTTONTEXT_FIND NC_("SV_BUTTONTEXT_FIND",
"~Find")
#define SV_BUTTONTEXT_STOP NC_("SV_BUTTONTEXT_STOP",
"~Stop")
-#define SV_BUTTONTEXT_CONNECT
NC_("SV_BUTTONTEXT_CONNECT", "C~onnect")
#define SV_BUTTONTEXT_SCREENSHOT
NC_("SV_BUTTONTEXT_SCREENSHOT", "~Screenshot")
#define SV_STDTEXT_SERVICENOTAVAILABLE
NC_("SV_STDTEXT_SERVICENOTAVAILABLE", "The component (%s) could not be
loaded.\nPlease start setup with the repair option.")
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index dde33eb5bc86..7834d9f9deed 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1137,8 +1137,6 @@ namespace
return VclResId(SV_BUTTONTEXT_FIND);
else if (rType == "gtk-stop")
return VclResId(SV_BUTTONTEXT_STOP);
- else if (rType == "gtk-connect")
- return VclResId(SV_BUTTONTEXT_CONNECT);
else if (rType == "gtk-yes")
return VclResId(SV_BUTTONTEXT_YES);
else if (rType == "gtk-no")
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
