[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/qa sw/source

[Caolán McNamara]

 sw/qa/core/data/ww6/pass/crash-3.doc |binary
 sw/source/filter/ww8/ww8par2.cxx     |    1 +
 2 files changed, 1 insertion(+)

New commits:
commit 937e85beb5d0aeadf27c55f5ed3d50d7140538ff
Author: Caolán McNamara <caol...@redhat.com>
Date:   Fri Aug 21 13:04:57 2015 +0100

    fix another ww6 crash
    
    Change-Id: I47b4ffb1d96041d51dde313c080ed1d9cd4000be
    (cherry picked from commit 6405203750f7f779a3655bc5f415e8e0a2071d1b)
    Reviewed-on: https://gerrit.libreoffice.org/17908
    Reviewed-by: David Tardon <dtar...@redhat.com>
    Tested-by: David Tardon <dtar...@redhat.com>

diff --git a/sw/qa/core/data/ww6/pass/crash-3.doc 
b/sw/qa/core/data/ww6/pass/crash-3.doc
new file mode 100644
index 0000000..8646b7a
Binary files /dev/null and b/sw/qa/core/data/ww6/pass/crash-3.doc differ
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index f6df99f..83b6490 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -4327,6 +4327,7 @@ void WW8RStyle::ImportOldFormatStyles()
         {
             rSt.SeekRel(cbPapx-nByteCount);
             nByteCount += cbPapx-nByteCount;
+            break;
         }
 
         sal_uInt8 cb(0);

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits