mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accessibility: Avoid immediate crash in Impress

Browse Source 
When Accessibility is active Impress immediately crashes. We need to check that
mpParent isn't NULL before we try to call it's methods. This has been a
problem since at least commit 7ef4a5bd51.
I don't know if it is relevant to bring that back though.

Change-Id: Idaa1f30685205e3a62cec2a60a14791d798391a6
Reviewed-on: https://gerrit.libreoffice.org/8748
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Niklas Johansson
2014-03-25 16:01:50 +01:00
committed by Caolán McNamara
parent 729f40f035
commit e5d7a360e6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
svx/source/accessibility/AccessibleShape.cxx
View File

@@ -402,15 +402,18 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (::com::sun::star::uno::RuntimeException, std::exception)
{ {
::osl::MutexGuard aGuard (maMutex); ::osl::MutexGuard aGuard (maMutex);
if (mpParent == NULL)
return uno::Reference<XAccessibleRelationSet>();
::utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper; ::utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper;
//this mxshape is the captioned shape, only for sw //this mxshape is the captioned shape
uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
aSequence[0] = mpParent->GetAccessibleCaption(mxShape); aSequence[0] = mpParent->GetAccessibleCaption(mxShape);
if(aSequence[0].get()) if(aSequence[0].get())
{ {
pRelationSet->AddRelation( pRelationSet->AddRelation(
AccessibleRelation( AccessibleRelationType::DESCRIBED_BY, aSequence ) ); AccessibleRelation( AccessibleRelationType::DESCRIBED_BY, aSequence ) );
} }
return uno::Reference<XAccessibleRelationSet>(pRelationSet); return uno::Reference<XAccessibleRelationSet>(pRelationSet);
} }