[Libreoffice-commits] core.git: sc/source

David Tardon dtardon at redhat.com
Thu Nov 3 08:56:08 UTC 2016


 sc/source/ui/Accessibility/AccessibleDocument.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4a83464f718ba8534a738178670077d5636ad051
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Nov 3 09:54:29 2016 +0100

    tdf#103633 avoid segfault in a11y
    
    This partially reverts commit 8e8a88ec1ad02c153ae3c7653edc81716dc91b7a
    "loplugin:unusedfields".
    
    Change-Id: Id95a46374ed2b35e05dc32a8759e5db01829f050

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index f6bcddd..8fdbd07 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -453,7 +453,7 @@ bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentC
 {
     // create the new child
     rtl::Reference< ::accessibility::AccessibleShape > pReplacement(::accessibility::ShapeTypeHandler::Instance().CreateAccessibleObject (
-        ::accessibility::AccessibleShapeInfo ( _rxShape, pCurrentChild->getAccessibleParent() ),
+        ::accessibility::AccessibleShapeInfo ( _rxShape, pCurrentChild->getAccessibleParent(), this ),
         _rShapeTreeInfo
     ));
     if ( pReplacement.is() )
@@ -558,7 +558,7 @@ uno::Reference< XAccessible > ScChildrenShapes::Get(const ScAccessibleShapeData*
     if (!pData->pAccShape.is())
     {
         ::accessibility::ShapeTypeHandler& rShapeHandler = ::accessibility::ShapeTypeHandler::Instance();
-        ::accessibility::AccessibleShapeInfo aShapeInfo(pData->xShape, mpAccessibleDocument);
+        ::accessibility::AccessibleShapeInfo aShapeInfo(pData->xShape, mpAccessibleDocument, const_cast<ScChildrenShapes*>(this));
         pData->pAccShape = rShapeHandler.CreateAccessibleObject(
             aShapeInfo, maShapeTreeInfo);
         if (pData->pAccShape.is())


More information about the Libreoffice-commits mailing list