[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source

[Caolán McNamara]

 sc/source/filter/excel/xlescher.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 845bcfdcede2c59c592f0894ee29aed8241fa16a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 30 15:55:00 2017 +0000

    ofz#4406 limit escher object cell area to calc's limits
    
    Change-Id: I9b9b198f1f96c952692d052a9a527086e453779f
    Reviewed-on: https://gerrit.libreoffice.org/45616
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index dc25c1bdc0d7..a0ce92bee5b8 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -146,10 +146,10 @@ tools::Rectangle XclObjAnchor::GetRect( const XclRoot& rRoot, SCTAB nScTab, MapU
     ScDocument& rDoc = rRoot.GetDoc();
     double fScale = lclGetTwipsScale( eMapUnit );
     tools::Rectangle aRect(
-        lclGetXFromCol( rDoc, nScTab, maFirst.mnCol, mnLX, fScale ),
-        lclGetYFromRow( rDoc, nScTab, maFirst.mnRow, mnTY, fScale ),
-        lclGetXFromCol( rDoc, nScTab, maLast.mnCol,  mnRX + 1, fScale ),
-        lclGetYFromRow( rDoc, nScTab, maLast.mnRow,  mnBY, fScale ) );
+        lclGetXFromCol(rDoc, nScTab, std::min<SCCOL>(maFirst.mnCol, MAXCOL), mnLX, fScale),
+        lclGetYFromRow(rDoc, nScTab, std::min<SCROW>(maFirst.mnRow, MAXROW), mnTY, fScale),
+        lclGetXFromCol(rDoc, nScTab, std::min<SCCOL>(maLast.mnCol, MAXCOL),  mnRX + 1, fScale),
+        lclGetYFromRow(rDoc, nScTab, std::min<SCROW>(maLast.mnRow, MAXROW),  mnBY, fScale));
 
     // adjust coordinates in mirrored sheets
     if( rDoc.IsLayoutRTL( nScTab ) )