From 6803af4dc4bec1c7394403cd54153b706f4cfd11 Mon Sep 17 00:00:00 2001 From: Aapo Date: Fri, 20 Nov 2020 19:56:47 +0200 Subject: [PATCH] [TD] Fix column index range checking bug in std::string DrawViewSpreadsheet::getSheetImage(void) --- src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp index ef9de0ca56..eb1007a836 100644 --- a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp +++ b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp @@ -211,13 +211,6 @@ std::string DrawViewSpreadsheet::getSheetImage(void) } } - //check for logical range - if ( (sColStart > sColEnd) || - (iRowStart > iRowEnd) ) { - Base::Console().Error("%s - cell range is illogical\n",getNameInDocument()); - return result.str(); - } - std::vector availcolumns = getAvailColumns(); //validate range start column in sheet's available columns @@ -236,6 +229,13 @@ std::string DrawViewSpreadsheet::getSheetImage(void) return result.str(); } + //check for logical range + if ( (iAvailColStart > iAvailColEnd) || + (iRowStart > iRowEnd) ) { + Base::Console().Error("%s - cell range is illogical\n",getNameInDocument()); + return result.str(); + } + // build row and column ranges std::vector validColNames; std::vector validRowNumbers;