fix the issue that cannot emit MergeCells and DataValidations together

tealeg · Oct 16, 2023 · b3d7083 · b3d7083
1 parent e01f87e
commit b3d7083
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/xmlWorksheet.go b/xmlWorksheet.go
@@ -760,14 +760,18 @@ func (worksheet *xlsxWorksheet) WriteXML(xw *xmlwriter.Writer, s *Sheet, styles
 				if err != nil {
 					return err
 				}
-				return xw.Write(mergeCells)
+				if err := xw.Write(mergeCells); err != nil {
+					return err
+				}
 			}
 			if worksheet.DataValidations != nil {
 				dataValidation, err := emitStructAsXML(reflect.ValueOf(worksheet.DataValidations), "dataValidations", "")
 				if err != nil {
 					return err
 				}
-				return xw.Write(dataValidation)
+				if err := xw.Write(dataValidation); err != nil {
+					return err
+				}
 			}
 			return nil
 		}(),