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

[Caolán McNamara]

 sw/source/filter/ww8/ww8scan.hxx |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 6b8662de23b354f36a4ca48f2c36b7da5d2bc7ea
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 18 10:22:29 2013 +0100

    Resolves: fdo#69220 crash in doc (ww6)
    
    Change-Id: I5a09d121a0b0342f28ba5d2d39027b27e9c9eba2
    (cherry picked from commit 2e93541d00f9d4aaa6ad2aeb35ee0c901d216cc0)
    Reviewed-on: https://gerrit.libreoffice.org/5991
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index e52cbc5..f1cf6ec 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -790,7 +790,21 @@ struct WW8PLCFxDesc
     //With nStartPos set to WW8_CP_MAX then in the case of a pap or chp
     //GetSprms will not search for the sprms, but instead take the
     //existing ones.
-    WW8PLCFxDesc() : pIdStk(0), nStartPos(WW8_CP_MAX) {}
+    WW8PLCFxDesc()
+        : pIdStk(0)
+        , pMemPos(0)
+        , nOrigSprmsLen(0)
+        , nStartPos(WW8_CP_MAX)
+        , nEndPos(WW8_CP_MAX)
+        , nOrigStartPos(WW8_CP_MAX)
+        , nOrigEndPos(WW8_CP_MAX)
+        , nCp2OrIdx(WW8_CP_MAX)
+        , nSprmsLen(0)
+        , nCpOfs(0)
+        , bFirstSprm(false)
+        , bRealLineEnd(false)
+    {
+    }
     void ReduceByOffset();
 };