[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source

[Caolán McNamara]

 sw/source/core/access/accfrmobj.cxx |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 0ae00643fc87ca30ddf788df9f31cec8dae4e544
Author: Caolán McNamara <caol...@redhat.com>
Date:   Thu Jun 4 16:20:18 2015 +0100

    GetWin seen as NULL sometimes
    
    Change-Id: I08974e3a8a3f34e2c1f0843c536e72ca0eb4b29d
    (cherry picked from commit 4bf829ba2a4e02188b41064759d17eaf57f22dfe)

diff --git a/sw/source/core/access/accfrmobj.cxx 
b/sw/source/core/access/accfrmobj.cxx
index ce9d3d8..a1bd0bf 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -262,10 +262,14 @@ SwRect SwAccessibleChild::GetBox( const SwAccessibleMap& 
rAccMap ) const
     }
     else if ( mpWindow )
     {
-        aBox = SwRect( rAccMap.GetShell()->GetWin()->PixelToLogic(
-                                        Rectangle( mpWindow->GetPosPixel(),
-                                                   mpWindow->GetSizePixel() ) 
) );
-}
+        vcl::Window *pWin = rAccMap.GetShell()->GetWin();
+        if (pWin)
+        {
+            aBox = SwRect( pWin->PixelToLogic(
+                                            Rectangle( mpWindow->GetPosPixel(),
+                                                       
mpWindow->GetSizePixel() ) ) );
+        }
+    }
 
     return aBox;
 }

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits