shu/OnDoc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 20241217

Browse Source
This commit is contained in:
Stefan Hutter
2024-12-17 20:48:07 +01:00
parent 8f74cec1ab
commit 7e891afc23
108 changed files with 686 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OnDocOffice/clsoffice.cs
View File

@@ -183,10 +183,10 @@ namespace OnDocOffice
}
}
public string Generate_Word_in_Office(ref clsDocData docdata, ref clsdok dok, string vorlage, string connectionstring, string tempdir, string dokumentid, string apptype)
public string Generate_Word_in_Office(ref clsDocData docdata, ref clsdok dok, string vorlage, string connectionstring, string tempdir, string dokumentid, string apptype, string extension)
{
this.dokumentid = docdata.Dokumentid;
string filename = tempdir + dokumentid + "." + apptype;
string filename = tempdir + dokumentid + "." + extension;
int pos = 0;
int pos2 = 0;
@@ -313,10 +313,13 @@ namespace OnDocOffice
worddoc.Save();
worddoc.Close();
word.Quit(SaveChanges: false);
//word.Quit(SaveChanges: false);
string b64 = fh.Base64FromFile(filename);
word.Documents.Open(filename);
worddoc = null;
word = null;
return fh.Base64FromFile(filename);
return b64;
//return fh.Base64FromFile(filename);
}
private void Kopfzeile_generieren()