diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2017-02-28 17:52:10 -0500 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2017-03-08 09:10:25 +0000 |
| commit | 6f36ee01ab3d7934880bfd8b5d337288dcbf62c7 (patch) | |
| tree | 28377bfd298f6963702ebfff07268ac08983f322 /vcl/unx/gtk/a11y/atktextattributes.cxx | |
| parent | 3e4db9f12046255dbcd968b28c670cb83cf83418 (diff) | |
Revert my fix for tdf#71409, to hopefully fix tdf#104381.
This reverts commit 87e040fd0f04307534920d0765af6d5878794a98.
This reverts commit a0ef7474521413c8967559a635e6fdc0d88f1df6.
Conflicts:
vcl/unx/gtk/a11y/atkutil.cxx
Change-Id: Ib3a799e27b2495ebd1e7723f1cb5babf0dfbc702
Reviewed-on: https://gerrit.libreoffice.org/34730
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
(cherry picked from commit 10077a06d8f6d08f276f99024528ee31a57390a9)
Reviewed-on: https://gerrit.libreoffice.org/34732
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl/unx/gtk/a11y/atktextattributes.cxx')
| -rw-r--r-- | vcl/unx/gtk/a11y/atktextattributes.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index 51c961892f6c..a9e26caef3d5 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -211,11 +211,14 @@ static css::uno::Reference<css::accessibility::XAccessibleComponent> getComponent( AtkText *pText ) throw (uno::RuntimeException) { AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pText ); - if (pWrap) + if( pWrap ) { - uno::Reference<accessibility::XAccessibleComponent> xAC( - pWrap->mpContext.get(), uno::UNO_QUERY); - return xAC; + if( !pWrap->mpComponent.is() ) + { + pWrap->mpComponent.set(pWrap->mpContext, css::uno::UNO_QUERY); + } + + return pWrap->mpComponent; } return css::uno::Reference<css::accessibility::XAccessibleComponent>(); |