diff --git a/funcext/TSOffice/word/_WordSetLastTableProp.tsf b/funcext/TSOffice/word/_WordSetLastTableProp.tsf index 3afd055..52df9a0 100644 --- a/funcext/TSOffice/word/_WordSetLastTableProp.tsf +++ b/funcext/TSOffice/word/_WordSetLastTableProp.tsf @@ -10,7 +10,6 @@ Begin str += '"' $ value $ '"'; else str = str $ value; - println("str = {}", str); eval(&str); TOfficeApi().Set('LastTable', table); return true; diff --git a/funcext/TSOffice/word/_WordTemplate.tsf b/funcext/TSOffice/word/_WordTemplate.tsf index 6cb8ca1..bf862a7 100644 --- a/funcext/TSOffice/word/_WordTemplate.tsf +++ b/funcext/TSOffice/word/_WordTemplate.tsf @@ -1,10 +1,14 @@ -Function _WordTemplate(alias, fileName); +Function _WordTemplate(data, template, fileName); Begin + setsysparam('data', data); docx := new TSDocxFile(); - [err, msg] := docx.OpenFile(alias, fileName); + [err, msg] := docx.OpenFile('', template); if err then return false; docx.ExecInnerTSL(); - [err, msg] := docx.Save(); - if err then return false; + if ifstring(fileName) then + begin + [err, msg] := docx.SaveAs('', fileName); + if err then return false; + end return true; End;