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

修复bugs

This commit is contained in:
csh 2024-02-07 16:01:32 +08:00
parent 4cac47522a
commit f685fdced1
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
docx/TSDocxRange.tsf
View File

@ -405,30 +405,38 @@ Begin
if flag then if flag then
begin begin
document_.Paragraphs.AddParagraph(last_node, new_node, direction); document_.Paragraphs.AddParagraph(last_node, new_node, direction);
return array(flag, new_node);
end end
else begin else begin
index := direction = "before" ? 0 : range_obj_.Size()-1; paragraph := self.InsertNewParagraph();
new_node := range_obj_[index].TParagraph.Root(); return array(flag, paragraph);
end end
return new_node;
end end
case collapse_ of case collapse_ of
TSDocxEnumerations.wdCollapseStart(): TSDocxEnumerations.wdCollapseStart():
new_node := ##psplit("before"); [flag, paragraph] := ##psplit("before");
TSDocxEnumerations.wdCollapseEnd(): TSDocxEnumerations.wdCollapseEnd():
new_node := ##psplit("after"); [flag, paragraph] := ##psplit("after");
else begin else begin
new_node := range_obj_[range_obj_.Size()-1].TParagraph.Root(); flag := true;
paragraph := range_obj_[range_obj_.Size()-1].TParagraph.Root();
clear_flag := true; clear_flag := true;
end end
end; end;
data := nils(numRows, numColumns); data := nils(numRows, numColumns);
ttable := docx_.CreateTable(data); ttable := docx_.CreateTable(data);
table := ##padd_table(ttable, new_node); if flag then
document_.Paragraphs.AddTableToParagraphs(new_node, table); begin
table := ##padd_table(ttable, paragraph);
document_.Paragraphs.AddTableToParagraphs(paragraph, table);
end
else begin
table := ##padd_table(ttable, paragraph.Object().Root());
paragraph.Range.Clear(true);
end
if clear_flag then self.Clear(true); if clear_flag then self.Clear(true);
return table; return table;
End; End;
@ -793,7 +801,7 @@ Function TSDocxRange.InsertFile(FileName, Range, ConfirmConversions, Link, Attac
Begin Begin
alias := ""; alias := "";
paragraph := self.InsertNewParagraph(); paragraph := self.InsertNewParagraph();
docx_.InsertFile(alias, FileName, paragraph.Root()); docx_.InsertFile(alias, FileName, paragraph.Object().Root());
paragraph.Range.Delete(); paragraph.Range.Delete();
document_.Paragraphs.Init(docx_); document_.Paragraphs.Init(docx_);
End; End;

6
docx/paragraphformat/TSDocxParagraphFormat.tsf
View File

@ -203,17 +203,17 @@ End;
Function TSDocxParagraphFormat.Space1();virtual; Function TSDocxParagraphFormat.Space1();virtual;
Begin Begin
self.LineSpacingRule := TSDocxEnumerations.wdLineSpaceSingle(); self.LineSpacing := 12;
End; End;
Function TSDocxParagraphFormat.Space15();virtual; Function TSDocxParagraphFormat.Space15();virtual;
Begin Begin
self.LineSpacingRule := TSDocxEnumerations.wdLineSpace1pt5(); self.LineSpacing := 18;
End; End;
Function TSDocxParagraphFormat.Space2();virtual; Function TSDocxParagraphFormat.Space2();virtual;
Begin Begin
self.LineSpacingRule := TSDocxEnumerations.wdLineSpaceDouble(); self.LineSpacing := 24;
End; End;
// property // property

13
docx/shading/TSDocxShadingRange.tsf
View File

@ -125,7 +125,7 @@ Begin
End; End;
Function TSDocxShadingRange.ReadTexture();override; Function TSDocxShadingRange.ReadTexture();override;
Begin Begin
CallFunction("ReadTexture"); return CallFunction("ReadTexture");
End; End;
Function TSDocxShadingRange.WriteForegroundPatternColorIndex(value);override; Function TSDocxShadingRange.WriteForegroundPatternColorIndex(value);override;
@ -134,36 +134,33 @@ Begin
End; End;
Function TSDocxShadingRange.ReadForegroundPatternColorIndex();override; Function TSDocxShadingRange.ReadForegroundPatternColorIndex();override;
Begin Begin
CallFunction("ReadForegroundPatternColorIndex"); return CallFunction("ReadForegroundPatternColorIndex");
End; End;
Function TSDocxShadingRange.WriteForegroundPatternColor(value);override; Function TSDocxShadingRange.WriteForegroundPatternColor(value);override;
Begin Begin
CallFunction("WriteForegroundPatternColor", value); CallFunction("WriteForegroundPatternColor", value);
End; End;
Function TSDocxShadingRange.ReadForegroundPatternColor();override; Function TSDocxShadingRange.ReadForegroundPatternColor();override;
Begin Begin
CallFunction("ReadForegroundPatternColor"); return CallFunction("ReadForegroundPatternColor");
End; End;
Function TSDocxShadingRange.WriteBackgroundPatternColorIndex(value);override; Function TSDocxShadingRange.WriteBackgroundPatternColorIndex(value);override;
Begin Begin
CallFunction("WriteBackgroundPatternColorIndex", value); CallFunction("WriteBackgroundPatternColorIndex", value);
End; End;
Function TSDocxShadingRange.ReadBackgroundPatternColorIndex();override; Function TSDocxShadingRange.ReadBackgroundPatternColorIndex();override;
Begin Begin
CallFunction("ReadBackgroundPatternColorIndex"); return CallFunction("ReadBackgroundPatternColorIndex");
End; End;
Function TSDocxShadingRange.WriteBackgroundPatternColor(value);override; Function TSDocxShadingRange.WriteBackgroundPatternColor(value);override;
Begin Begin
CallFunction("WriteBackgroundPatternColor", value); CallFunction("WriteBackgroundPatternColor", value);
End; End;
Function TSDocxShadingRange.ReadBackgroundPatternColor();override; Function TSDocxShadingRange.ReadBackgroundPatternColor();override;
Begin Begin
CallFunction("ReadBackgroundPatternColor"); return CallFunction("ReadBackgroundPatternColor");
End; End;