diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-02 11:35:53 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-02 15:13:25 +0200 |
| commit | b4e9171e598dd6c2a5774b079e0b3203aaf1b29d (patch) | |
| tree | 6aaed5dfb0ce881c8106d530f04f4ae2e5efc93f /sw/source/filter/ww8/ww8par6.cxx | |
| parent | 39715e982cf599b6afe6e7736da844d5929f6a84 (diff) | |
ofz#7229 Divide by zero
Change-Id: I7bd2f19d5dc99e9041b3ef0fc10caef6d8b7ca6a
Reviewed-on: https://gerrit.libreoffice.org/52253
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/filter/ww8/ww8par6.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index a476a800dc93..2f6e45f1d373 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -330,6 +330,10 @@ bool wwSectionManager::SetCols(SwFrameFormat &rFormat, const wwSection &rSection if (nCols < 2) //check for no columns or other weird state return false; + const sal_uInt16 nNetWriterWidth = writer_cast<sal_uInt16>(nNetWidth); + if (nNetWriterWidth == 0) + return false; + SwFormatCol aCol; // Create SwFormatCol //sprmSDxaColumns - Default distance is 1.25 cm @@ -346,8 +350,7 @@ bool wwSectionManager::SetCols(SwFrameFormat &rFormat, const wwSection &rSection aCol.SetLineWidth(1); } - aCol.Init(nCols, writer_cast<sal_uInt16>(nColSpace), - writer_cast<sal_uInt16>(nNetWidth)); + aCol.Init(nCols, writer_cast<sal_uInt16>(nColSpace), nNetWriterWidth); // sprmSFEvenlySpaced if (!rSep.fEvenlySpaced) @@ -365,7 +368,7 @@ bool wwSectionManager::SetCols(SwFrameFormat &rFormat, const wwSection &rSection pCol->SetLeft(writer_cast<sal_uInt16>(nLeft)); pCol->SetRight(writer_cast<sal_uInt16>(nRight)); } - aCol.SetWishWidth(writer_cast<sal_uInt16>(nNetWidth)); + aCol.SetWishWidth(nNetWriterWidth); } rFormat.SetFormatAttr(aCol); return true; |