From 4116a598130ef75d4370aa115be8af795fcef4d7 Mon Sep 17 00:00:00 2001
From: 0penBrain <48731257+0penBrain@users.noreply.github.com>
Date: Fri, 19 Nov 2021 16:44:08 +0100
Subject: [PATCH] [Sheet][Bugfix] Reject alignment change for merged cell
 except top-left one

---
 src/Mod/Spreadsheet/App/PropertySheet.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Mod/Spreadsheet/App/PropertySheet.cpp b/src/Mod/Spreadsheet/App/PropertySheet.cpp
index faf93456f9..7f73663540 100644
--- a/src/Mod/Spreadsheet/App/PropertySheet.cpp
+++ b/src/Mod/Spreadsheet/App/PropertySheet.cpp
@@ -485,6 +485,7 @@ void PropertySheet::setAlignment(CellAddress address, int _alignment)
 {
     Cell * cell = nonNullCellAt(address);
     assert(cell != 0);
+    if (cell->address != address) return; //Reject alignment change for merged cell except top-left one
     cell->setAlignment(_alignment);
 }