From ddaa8410366b2a28204ff0187a766027c82be573 Mon Sep 17 00:00:00 2001
From: Ryan Kembrey <ryan.kembrey@student.uts>
Date: Mon, 8 Sep 2025 00:23:22 +1000
Subject: [PATCH] TechDraw: Fix spreadsheet incorrect render due to cell merges

---
 src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp
index 36bd382ffd..3b1d7c8d6d 100644
--- a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp
+++ b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp
@@ -259,12 +259,16 @@ std::string DrawViewSpreadsheet::getSheetImage()
          col != validColNames.end(); ++col) {
         // create a group for each column
         result << "  <g id=\"" << ViewName << "_col" << (*col) << "\">" << std::endl;
+        float naturalColumnWidth = 0.0;
         for (std::vector<int>::const_iterator row = validRowNumbers.begin();
              row != validRowNumbers.end(); ++row) {
             // get cell size
             std::stringstream srow;
             srow << (*row);
             App::CellAddress address((*col) + srow.str());
+            if (naturalColumnWidth == 0.0) {
+                naturalColumnWidth = sheet->getColumnWidth(address.col());
+            }
             cellwidth = sheet->getColumnWidth(address.col());
             cellheight = sheet->getRowHeight(address.row());
             celltext = "";
@@ -372,7 +376,7 @@ std::string DrawViewSpreadsheet::getSheetImage()
         }
         result << "  </g>" << std::endl;
         rowoffset = 0.0;
-        coloffset += cellwidth;
+        coloffset += naturalColumnWidth;
     }
 
     // close the containing group