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

[Julien Nabet]

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

New commits:
commit dd8f3000f00c360ef3553ace6dc58b036e775e0d
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
    
    Change-Id: Id467dd601a24ba46391544a79d4eecaf5370812c

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 4ecf0d5..c3a468b 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2505,7 +2505,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->nNewNetWidth > MINFLY )    // BoxUpWidth ?
+        if(pSFlyPara->nNewNetWidth > MINFLY && pSFlyPara->pFlyFmt)    // BoxUpWidth ?
         {
             long nW = pSFlyPara->nNewNetWidth;
             nW += pSFlyPara->nWidth - pSFlyPara->nNetWidth;   // Rand dazu