summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2014-11-10 22:44:59 +0100
committerJulien Nabet <serval2412@yahoo.fr>2014-11-10 22:49:07 +0100
commitdd8f3000f00c360ef3553ace6dc58b036e775e0d (patch)
tree117d68c4c04ee47a274c8f2c6c8d2b08a8478608
parent290943d20551a8504efe10f6f954aa16995bf95a (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 Change-Id: Id467dd601a24ba46391544a79d4eecaf5370812c
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 4ecf0d542ef5..c3a468b57d26 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