[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/source

[Noel Grandin (via logerrit)]

 sw/source/core/access/accfrmobj.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 3e7c55e34ab55e13d6eda54f947eb2e4bb2c22b8
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Nov 23 17:47:24 2023 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Nov 24 09:44:47 2023 +0100

    tdf#158338 Opening file with image when JAWS is running causes endless loop
    
    Revert "tdf#112865 assigning to mpDrawObj here is unnecessary"
    
    This reverts commit 1c1647e6ee252fe68d7406d01043e88f1721590f.
    
    Change-Id: I056123a90850989436dadf2d4504230550b9ae2b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159768
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    (cherry picked from commit 1e51005a2413457a9030c565d627e39670785b56)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159892
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/source/core/access/accfrmobj.cxx 
b/sw/source/core/access/accfrmobj.cxx
index d8e78836b2a1..f78dc2d155db 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -106,7 +106,9 @@ void SwAccessibleChild::Init( const SdrObject* pDrawObj )
 void SwAccessibleChild::Init( const SwFrame* pFrame )
 {
     mpFrame = pFrame;
-    mpDrawObj = nullptr;
+    mpDrawObj = mpFrame && mpFrame->IsFlyFrame()
+                ? static_cast < const SwFlyFrame * >( mpFrame 
)->GetVirtDrawObj()
+                : nullptr;
     mpWindow = nullptr;
 }