diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-05-24 21:49:20 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-06-01 22:45:18 +0200 |
| commit | 69d213526f3c1a6c08c5be8c35a9f8bcc02bf178 (patch) | |
| tree | f969800ffe0e79128088f87342c3359e42939121 | |
| parent | b44c53bd1c39aacc58987c9f77a1e3d0638da0fc (diff) | |
svx: fix one more EXCEPTION_INT_DIVIDE_BY_ZERO
See https://crashreport.libreoffice.org/stats/signature/SvxShowCharSet::PixelToMapIndex(Point%20const%20&)
Change-Id: Ied5698fd47220fae54d72be263c3eeed5fb77911
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134899
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 663abd7162c29d289f84781eac56ca2c28b3a356)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134909
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -rw-r--r-- | svx/source/dialog/charmap.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 5736ea26ce73..5b1abbc5730c 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -375,7 +375,9 @@ Point SvxShowCharSet::MapIndexToPixel( int nIndex ) const int SvxShowCharSet::PixelToMapIndex( const Point& point) const { int nBase = FirstInView(); - return (nBase + ((point.X() - m_nXGap)/nX) + ((point.Y() - m_nYGap)/nY) * COLUMN_COUNT); + int x = nX == 0 ? 0 : (point.X() - m_nXGap)/nX; + int y = nY == 0 ? 0 : (point.Y() - m_nYGap)/nY; + return (nBase + x + y * COLUMN_COUNT); } bool SvxShowCharSet::KeyInput(const KeyEvent& rKEvt) |