tinysoft
/
PdfConverter
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bugs

This commit is contained in:
csh 2024-09-06 17:18:34 +08:00
parent 440788412b
commit 43ffb5b5c0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
range/Advanced/TSPdfTableRange.tsf
View File

@ -118,6 +118,9 @@ begin
tc_x += cell_range.Width; tc_x += cell_range.Width;
end end
end end
for pos,arr in vmerge_arr do
if ifarray(arr) then
cell_range_array_[arr[0]][pos].VMerge := arr[1];
// for i,arr in cell_range_array_ do // for i,arr in cell_range_array_ do
// begin // begin
@ -131,7 +134,7 @@ begin
i := 0; i := 0;
vmerge_arr := array(); vmerge_arr := array();
row_height := array(); row_height := array();
while i < length(cell_range_array_)-1 do while i < length(cell_range_array_) do
begin begin
tc_y := {self.}EndY; tc_y := {self.}EndY;
max_height := 0; max_height := 0;
@ -175,15 +178,14 @@ begin
page_ := docx_to_pdf_.GetNextPage(page_); page_ := docx_to_pdf_.GetNextPage(page_);
[x, y] := docx_to_pdf_.CalculateTextCoordinates(); [x, y] := docx_to_pdf_.CalculateTextCoordinates();
{self.}EndY := y; {self.}EndY := y;
println("y = {}", y);
recompute_flag := true; recompute_flag := true;
break; break;
end end
if range.VMerge then vmerge_arr[j] := array(i, range.VMerge); if range.VMerge then vmerge_arr[j] := array(i, range.VMerge);
if not range.VMerge and range.DynamicHeight > max_height then max_height := range.DynamicHeight; if not range.VMerge and range.DynamicHeight > max_height then max_height := range.DynamicHeight;
if range.FixedHeight > max_height then max_height := tc_h;
end end
if recompute_flag then continue; if recompute_flag then continue;
if range.FixedHeight > max_height then max_height := tc_h;
row_height[i] := max_height; row_height[i] := max_height;
for _,col_index in vmerge_flag_arr do for _,col_index in vmerge_flag_arr do
begin begin