v1.8.7
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
// Version 1.8.6
|
// Version 1.8.7
|
||||||
Function TOfficeObj(n);
|
Function TOfficeObj(n);
|
||||||
Begin
|
Begin
|
||||||
case lowercase(n) of
|
case lowercase(n) of
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
// Version 1.8.6
|
// Version 1.8.7
|
||||||
Type TSDocxFile = Class
|
Type TSDocxFile = Class
|
||||||
///Version: V1.0 2022-09-20
|
///Version: V1.0 2022-09-20
|
||||||
///适用于 Microsoft Word docx格式文件
|
///适用于 Microsoft Word docx格式文件
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
// Version 1.8.6
|
// Version 1.8.7
|
||||||
Type TSXlsxFile = Class
|
Type TSXlsxFile = Class
|
||||||
///Version: V1.0 2022-08-08
|
///Version: V1.0 2022-08-08
|
||||||
///适用于 Microsoft Excel? 2007 及以上版本创建的电子表格文档。支持 XLSX / XLSM / XLTM / XLTX 等多种文档格式。
|
///适用于 Microsoft Excel? 2007 及以上版本创建的电子表格文档。支持 XLSX / XLSM / XLTM / XLTX 等多种文档格式。
|
||||||
|
|||||||
@@ -501,18 +501,16 @@ private
|
|||||||
Function GetNewName(name);
|
Function GetNewName(name);
|
||||||
Begin
|
Begin
|
||||||
new_name := name;
|
new_name := name;
|
||||||
count := 0;
|
|
||||||
while ifObj(old_style_obj_.GetStyle(class(TSXml).Utf8ToCurCodePage(new_name))) or style_name_map2_[new_name] do
|
while ifObj(old_style_obj_.GetStyle(class(TSXml).Utf8ToCurCodePage(new_name))) or style_name_map2_[new_name] do
|
||||||
new_name := new_name $ count++;
|
new_name := new_name $ crc32(inttostr(random(2000000)));
|
||||||
return new_name;
|
return new_name;
|
||||||
End;
|
End;
|
||||||
|
|
||||||
Function GetNewId(id);
|
Function GetNewId(id);
|
||||||
Begin
|
Begin
|
||||||
new_id := id;
|
new_id := id;
|
||||||
count := 0;
|
|
||||||
while ifObj(old_style_obj_.GetStyleById(new_id)) or style_id_map2_[new_id] do
|
while ifObj(old_style_obj_.GetStyleById(new_id)) or style_id_map2_[new_id] do
|
||||||
new_id := new_id $ count++;
|
new_id := new_id $ crc32(inttostr(random(2000000)));
|
||||||
return new_id;
|
return new_id;
|
||||||
End;
|
End;
|
||||||
|
|
||||||
|
|||||||
@@ -141,6 +141,7 @@ Type TDocxStyles = Class
|
|||||||
Begin
|
Begin
|
||||||
if ifObj(newstyle) and ifObj(newstyle.node_) then Begin
|
if ifObj(newstyle) and ifObj(newstyle.node_) then Begin
|
||||||
node := stylesXml_.FirstChildElement('w:styles').InsertEndChild(newstyle.node_.Marshal()[0]);
|
node := stylesXml_.FirstChildElement('w:styles').InsertEndChild(newstyle.node_.Marshal()[0]);
|
||||||
|
node.DeleteAttribute('w:default');
|
||||||
obj := TOfficeObj('TDocxStyle');
|
obj := TOfficeObj('TDocxStyle');
|
||||||
obj.StyleId := node.GetAttribute('w:styleId');
|
obj.StyleId := node.GetAttribute('w:styleId');
|
||||||
obj.Name := node.FirstChildElement('w:name').GetAttribute('w:val');
|
obj.Name := node.FirstChildElement('w:name').GetAttribute('w:val');
|
||||||
|
|||||||
Reference in New Issue
Block a user