summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-11-24 12:33:05 +0000
committerCaolán McNamara <caolanm@redhat.com>2020-11-24 17:01:46 +0100
commitd4ca173f2babde53c1d20f10e335244b092c5c97 (patch)
tree3050e4a14bbc827537ca6003b160a15488520784 /vcl
parent965f349952a90334c14a86ce1dd65711b73e8e85 (diff)
add set_buildable_name to enable distinguishing different instances
of widgets loaded from the same .ui snippet in the same dialog so ui-testing can identify the right one Change-Id: I2ecc7fd60ab891ae9f94971a3035585d4500f694 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106500 Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/salvtables.hxx2
-rw-r--r--vcl/source/app/salvtables.cxx2
-rw-r--r--vcl/unx/gtk3/gtk3gtkinst.cxx5
3 files changed, 9 insertions, 0 deletions
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index f3f4a585cecf..4fca8ff49cc5 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -234,6 +234,8 @@ public:
virtual OString get_buildable_name() const override;
+ virtual void set_buildable_name(const OString& rId) override;
+
virtual void set_help_id(const OString& rId) override;
virtual OString get_help_id() const override;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 03f68e381163..c1421562d2c0 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -312,6 +312,8 @@ vcl::Font SalInstanceWidget::get_font() { return m_xWidget->GetPointFont(*m_xWid
OString SalInstanceWidget::get_buildable_name() const { return m_xWidget->get_id().toUtf8(); }
+void SalInstanceWidget::set_buildable_name(const OString& rId) { return m_xWidget->set_id(OUString::fromUtf8(rId)); }
+
void SalInstanceWidget::set_help_id(const OString& rId) { return m_xWidget->SetHelpId(rId); }
OString SalInstanceWidget::get_help_id() const { return m_xWidget->GetHelpId(); }
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index c045e8e7ac80..af7653b71e57 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -2837,6 +2837,11 @@ public:
return OString(pStr, pStr ? strlen(pStr) : 0);
}
+ virtual void set_buildable_name(const OString& rId) override
+ {
+ gtk_buildable_set_name(GTK_BUILDABLE(m_pWidget), rId.getStr());
+ }
+
virtual void set_help_id(const OString& rHelpId) override
{
::set_help_id(m_pWidget, rHelpId);