diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-11-10 22:44:59 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-11-23 14:32:14 +0100 |
| commit | d4f4e80c2ceea0bbc612034ed23591c4891623dc (patch) | |
| tree | 1af129cb73858b202241cef67735bd206467d32d /sw | |
| parent | 83b05abd254ddbedaf923e836cb43bad787bba9c (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index cb22c8f8111c..9b6b7c4e74ed 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 |