pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Fix evaluation of worksheet rels. Fix copying comments (sourceforge issue #61)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8928 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2023-10-02 21:53:23 +00:00
parent a8a5cfe8eb
commit 9ca8cd943d
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/fpspreadsheet/source/common/fpspreadsheet.pas
View File

@ -1653,7 +1653,7 @@ begin
// Copy comment
if srcSheet.HasComment(AFromCell) then
WriteComment(AToCell, ReadComment(AFromCell));
WriteComment(AToCell, srcSheet.ReadComment(AFromCell));
// Copy hyperlink
hyperlink := srcSheet.FindHyperlink(AFromCell);

9
components/fpspreadsheet/source/common/xlsxooxml.pas
View File

@ -452,6 +452,7 @@ type
Target : String;
Hidden: Boolean;
SheetRels: TFPList;
SheetRelsFile: String;
Drawing_File: String;
DrawingRels: TRelationshipList;
VmlDrawing_File: String;
@ -3966,13 +3967,13 @@ procedure TsSpreadOOXMLReader.ReadSheetRels(AStream: TStream);
var
i: Integer;
sheetData: TSheetData;
relsFile: String;
begin
for i := 0 to FSheetList.Count-1 do
begin
sheetData := TSheetData(FSheetList[i]);
relsFile := OOXML_PATH_XL_WORKSHEETS + '_rels/sheet' + sheetData.ID + '.xml.rels';
ReadRels(AStream, relsfile, sheetData.SheetRels);
sheetData.Target := TRelationshipList(FWorkbookRels).FindTarget(sheetData.RelID);
sheetData.SheetRelsFile := OOXML_PATH_XL_WORKSHEETS + '_rels/' + ExtractFileName(sheetData.Target) + '.rels';
ReadRels(AStream, sheetData.SheetRelsFile, sheetData.SheetRels);
end;
end;
@ -3991,7 +3992,7 @@ var
begin
sheetIndex := TsWorksheet(AWorksheet).Index;
sheetData := TSheetData(FSheetList[sheetIndex]);
sheetRelsFile := OOXML_PATH_XL_WORKSHEETS_RELS + 'sheet' + sheetData.ID + '.xml.rels';
sheetRelsFile := sheetData.SheetRelsFile;
ANode := ANode.FirstChild;
while Assigned(ANode) do