|
@@ -531,20 +531,26 @@ var
|
|
|
iEndRow: Integer;
|
|
|
begin
|
|
|
sName := Trim(GetCellValue(AXlsFile, FCurRow, FXmjLevel7Col));
|
|
|
- if sName = '' then Exit;
|
|
|
-
|
|
|
- vXmj := FCacheTree.FindXmjChild(AParent, '', sName);
|
|
|
- if not Assigned(vXmj) then
|
|
|
+ if sName <> '' then
|
|
|
begin
|
|
|
- vXmj := FCacheTree.AddNode(AParent);
|
|
|
- vXmj.Name := sName;
|
|
|
- end;
|
|
|
+ vXmj := FCacheTree.FindXmjChild(AParent, '', sName);
|
|
|
+ if not Assigned(vXmj) then
|
|
|
+ begin
|
|
|
+ vXmj := FCacheTree.AddNode(AParent);
|
|
|
+ vXmj.Name := sName;
|
|
|
+ end;
|
|
|
|
|
|
- with AXlsFile.CellMergedBounds[FCurRow, FXmjLevel7Col] do
|
|
|
- iEndRow := FCurRow + Bottom - Top;
|
|
|
+ with AXlsFile.CellMergedBounds[FCurRow, FXmjLevel7Col] do
|
|
|
+ iEndRow := FCurRow + Bottom - Top;
|
|
|
|
|
|
- while FCurRow <= iEndRow do
|
|
|
- LoadBillsNode(AXlsFile, vXmj);
|
|
|
+ while FCurRow <= iEndRow do
|
|
|
+ LoadBillsNode(AXlsFile, vXmj);
|
|
|
+ end
|
|
|
+ else
|
|
|
+ begin
|
|
|
+ while FCurRow <= iEndRow do
|
|
|
+ LoadBillsNode(AXlsFile, AParent);
|
|
|
+ end;
|
|
|
end;
|
|
|
|
|
|
procedure TPlaneFxBillsExcelImport.WriteNodes(ADataSet: TsdDataSet);
|