fpspreadsheet: Fix incorrect writing order of merged cells and hyperlinks in xlsx files causing an Excel read error (issue #0029640)

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4495 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-02-12 14:04:35 +00:00
parent 9a35171efd
commit 8a0351fde3

View File

@ -3450,8 +3450,8 @@ begin
WriteSheetViews(FSSheets[FCurSheetNum], AWorksheet);
WriteCols(FSSheets[FCurSheetNum], AWorksheet);
WriteSheetData(FSSheets[FCurSheetNum], AWorksheet);
WriteHyperlinks(FSSheets[FCurSheetNum], AWorksheet);
WriteMergedCells(FSSheets[FCurSheetNum], AWorksheet);
WriteHyperlinks(FSSheets[FCurSheetNum], AWorksheet); // must be after MergedCells, otherwise Excel2007 cannot read it !!!
WritePrintOptions(FSSheets[FCurSheetNum], AWorksheet);
WritePageMargins(FSSheets[FCurSheetNum], AWorksheet);
WritePageSetup(FSSheets[FCurSheetNum], AWorksheet);