diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-03-22 15:59:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-24 18:19:29 +0100 |
| commit | f920e86fbf3968104e1dfc0e9934e80652ed0837 (patch) | |
| tree | 01f8ed9c445821739b9709c5fee6e51eab0ae24d /vcl/source | |
| parent | da881f38c088c439f034e340bbbb4ca53e67389f (diff) | |
weld SvxSearchDialog
I have to use the other way to specify an a11y role, both are implemented in
the vcl parser, but in my gtk3-3.24.7 the role tag crashes the gtk parser,
while the other route works fine.
The CONTENT_FLOWS_TO accessibility relation is another additional complexity
over the norm
Change-Id: Ia096bcbe9f00f9944e4e4d5ad9bb1a52d19c7b3f
Reviewed-on: https://gerrit.libreoffice.org/69569
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 10 | ||||
| -rw-r--r-- | vcl/source/window/window2.cxx | 16 |
2 files changed, 26 insertions, 0 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 6a27b64f2974..01069b134a81 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -480,6 +480,16 @@ public: m_xWidget->SetAccessibleRelationLabelFor(pAtkLabeled); } + virtual void add_extra_accessible_relation(const css::accessibility::AccessibleRelation &rRelation) override + { + m_xWidget->AddExtraAccessibleRelation(rRelation); + } + + virtual void clear_extra_accessible_relations() override + { + m_xWidget->ClearExtraAccessibleRelations(); + } + virtual void set_tooltip_text(const OUString& rTip) override { m_xWidget->SetQuickHelpText(rTip); diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 66df5fa5781f..dfcec76e9b48 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -45,6 +45,7 @@ #include <salframe.hxx> #include <scrwnd.hxx> +#include <com/sun/star/accessibility/AccessibleRelation.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> using namespace com::sun::star; @@ -1946,6 +1947,21 @@ const std::vector<VclPtr<FixedText> >& Window::list_mnemonic_labels() const return mpWindowImpl->m_aMnemonicLabels; } +void Window::AddExtraAccessibleRelation(const css::accessibility::AccessibleRelation &rRelation) +{ + mpWindowImpl->m_aExtraAccessibleRelations.push_back(rRelation); +} + +const std::vector<css::accessibility::AccessibleRelation>& Window::GetExtraAccessibleRelations() const +{ + return mpWindowImpl->m_aExtraAccessibleRelations; +} + +void Window::ClearExtraAccessibleRelations() +{ + mpWindowImpl->m_aExtraAccessibleRelations.clear(); +} + } /* namespace vcl */ void DrawFocusRect(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) |