coverity#704523 Division or modulo by zero

and coverity#704522 Change-Id: Ieccd4c4e16a14ea68f8b4879232924a1d05e29ea

coverity#704523 Division or modulo by zero
and coverity#704522 Change-Id: Ieccd4c4e16a14ea68f8b4879232924a1d05e29ea
b061dbd7 · Caolán McNamara · 5741e67a · b061dbd7
Kaydet (Commit) b061dbd7 authored Nis 18, 2014 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

ndtbl.cxx sw/source/core/docnode/ndtbl.cxx +4 -2

No files found.
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -977,7 +977,8 @@ lcl_SetTableBoxWidths(SwTable & rTable, size_t const nMaxBoxes,
    }
    else
    {
-        rBoxFmt.SetFmtAttr(SwFmtFrmSize(ATT_VAR_SIZE, USHRT_MAX / nMaxBoxes));
+        size_t nWidth = nMaxBoxes ? USHRT_MAX / nMaxBoxes : USHRT_MAX;
+        rBoxFmt.SetFmtAttr(SwFmtFrmSize(ATT_VAR_SIZE, nWidth));
    }
 }

@@ -1310,8 +1311,9 @@ lcl_SetTableBoxWidths2(SwTable & rTable, size_t const nMaxBoxes,
            pNewFmt->Add(rBoxes.back());
        }
    }
+    size_t nWidth = nMaxBoxes ? USHRT_MAX / nMaxBoxes : USHRT_MAX;
    // default width for all boxes not at the end of an incomplete line
-    rBoxFmt.SetFmtAttr(SwFmtFrmSize(ATT_VAR_SIZE, USHRT_MAX / nMaxBoxes));
+    rBoxFmt.SetFmtAttr(SwFmtFrmSize(ATT_VAR_SIZE, nWidth));
 }

 SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,