[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source

[Julien Nabet]

 sw/source/filter/ww8/ww8par6.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b003182e9c3f63956a45de3f106b8503dc86d1b7
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Nov 10 22:44:59 2014 +0100

    Resolves fdo#86008: fix a crash when open doc file
    
    This was the only block, in this part of the code, which wasn't checking pSFlyPara->pFlyFmt
    
    Cherry-picked from dd8f3000f00c360ef3553ace6dc58b036e775e0d
    
    Conflicts:
    	sw/source/filter/ww8/ww8par6.cxx
    
    Change-Id: Id467dd601a24ba46391544a79d4eecaf5370812c
    Reviewed-on: https://gerrit.libreoffice.org/12356
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index cb22c8f..9b6b7c4 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2504,7 +2504,7 @@ void SwWW8ImplReader::StopApo()
         // function, the extension of the SW-fly has to be set
         // manually as the SW fly has no auto function to adjust the
         // frame´s size.
-        if( pSFlyPara->nNewNettoWidth > MINFLY )    // BoxUpWidth ?
+        if(pSFlyPara->nNewNettoWidth > MINFLY && pSFlyPara->pFlyFmt)    // BoxUpWidth ?
         {
             long nW = pSFlyPara->nNewNettoWidth;
             nW += pSFlyPara->nWidth - pSFlyPara->nNettoWidth;   // Rand dazu