diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-24 20:15:53 +0200 |
---|---|---|
committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2021-12-28 13:36:00 +0100 |
commit | 0c183add008e3604711d1995716cdcffc0881dc6 (patch) | |
tree | 78c8ac3faa490293d7872d6784e4e83d48a2f999 /comphelper | |
parent | 487b2db4dffcc7894bd76fd2d77fe8051f89016e (diff) |
tdf#145090 LO Calc Crash with drop-down-menu
avoid attempting to call into widgets while in the middle of dispose
regression from
commit 8d485ec0cd35ee1ae7684f2b6ca96c0f0c6f9dac
IsDisposed->isDisposed in vcl/../window
Change-Id: If346dc9dc8547f8da28d091bfa20eff39162a0b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127437
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 3454055d4da3326540905fc69626b934d5aa0744)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127483
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'comphelper')
-rw-r--r-- | comphelper/source/misc/accessiblewrapper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index 9aa1b48e2f1e..1167f56403c3 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.cxx @@ -86,7 +86,7 @@ namespace comphelper Reference< XAccessible > OWrappedAccessibleChildrenManager::getAccessibleWrapperFor( const Reference< XAccessible >& _rxKey ) { - Reference< XAccessible > xValue; + rtl::Reference< OAccessibleWrapper > xValue; if( !_rxKey.is() ) { @@ -140,7 +140,7 @@ namespace comphelper Reference< XComponent > xContextComponent; if( rChild.second.is() ) - xContextComponent.set( rChild.second->getAccessibleContext(), + xContextComponent.set( rChild.second->getContextNoCreate(), ::css::uno::UNO_QUERY ); if( xContextComponent.is() ) xContextComponent->dispose(); |