[Libreoffice-commits] core.git: 2 commits - download.lst sw/source

[Michael Stahl]

 download.lst                        |    3 ---
 sw/source/core/access/accfrmobj.cxx |   12 ++++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit ade1d4c36053c2a7aed959e3dd09ebc1b8430ea8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jan 6 22:37:17 2017 +0100

    tdf#105009 sw: fix a11y crash when removing drawing object
    
    SwFrame::RemoveDrawObj() calls SwAnchoredObject::ChgAnchorFrame(0)
    so the SwAnchoredDrawObj has no anchor frame later when
    SwAccessibleMap::InvalidateCursorPosition() asks for the parent.
    
    (regression from 76c549eb01dcb7b5bf28a271ce00e386f3d388ba)
    
    Change-Id: Id55cb5fc41a4e37e863498265d1565e1621d508e

diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index 3c6b3e5..9c8d515 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -379,10 +379,14 @@ const SwFrame* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
             else
             {
                 // In any other case the parent is the root frm
-                if( bInPagePreview )
-                    pParent = pContact->GetAnchorFrame()->FindPageFrame();
-                else
-                    pParent = pContact->GetAnchorFrame()->getRootFrame();
+                SwFrame const*const pAnchor(pContact->GetAnchorFrame());
+                if (pAnchor) // null if object removed from layout
+                {
+                    if (bInPagePreview)
+                        pParent = pAnchor->FindPageFrame();
+                    else
+                        pParent = pAnchor->getRootFrame();
+                }
             }
         }
     }
commit 2f1cf69153593ba61da672be72eb2ff4a5a7dad8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jan 6 21:05:57 2017 +0100

    remove obsolete MOZ_ZIP_* variables
    
    Change-Id: Ie83ff9e50534536326c78de1b6b717fe18b6dae1

diff --git a/download.lst b/download.lst
index 52b5210..c28b972 100644
--- a/download.lst
+++ b/download.lst
@@ -175,6 +175,3 @@ export ZLIB_TARBALL := zlib-1.2.8.tar.gz
 export ZMF_MD5SUM := c611df8664240de0276ab95670f413d8
 export ZMF_TARBALL := libzmf-0.0.1.tar.bz2
 
-export MOZ_ZIP_INC := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)inc.zip
-export MOZ_ZIP_LIB := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)lib.zip
-export MOZ_ZIP_RUNTIME := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)runtime.zip