This commit is contained in:
2022-07-08 08:12:43 +02:00
parent 697b78e3c9
commit 7f5057dc3e
121 changed files with 8039 additions and 19322 deletions

View File

@@ -41,7 +41,7 @@ Public Class cDATENSERVER
Sub New(da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_name, Optional da_KundenNr = 0)
Me.rootDir = DATENVERVER_OPTIONS.initRootDir()
Me.da_KundenNr = da_KundenNr
Me.da_vorlage = (da_KundenNr <= 0)
Me.da_vorlage = 0 '(da_KundenNr <= 0)
Me.da_kategorie = da_kategorie
Me.da_ordner = da_ordner
Me.da_uOrdner1 = replaceInvalidCahr(If(da_uOrdner1, ""))
@@ -55,7 +55,7 @@ Public Class cDATENSERVER
Sub New(da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_name, da_KundenNr, da_multifiles)
Me.rootDir = DATENVERVER_OPTIONS.initRootDir()
Me.da_KundenNr = da_KundenNr
Me.da_vorlage = (da_KundenNr <= 0)
Me.da_vorlage = 0 '(da_KundenNr <= 0)
Me.da_kategorie = da_kategorie
Me.da_ordner = da_ordner
Me.da_uOrdner1 = replaceInvalidCahr(If(da_uOrdner1, ""))
@@ -1082,9 +1082,11 @@ Public Class cFormularManager
Public Shared Sub mergePDFs(files As List(Of String), ByRef outputFile As String)
Dim doc As Spire.Pdf.PdfDocumentBase = Spire.Pdf.PdfDocument.MergeFiles(files.ToArray)
doc.Save(outputFile, Spire.Pdf.FileFormat.PDF)
files.RemoveAll(Function(v) v.Equals("")) 'Alle leeren Stings löschen
If files.Count > 0 Then
Dim doc As Spire.Pdf.PdfDocumentBase = Spire.Pdf.PdfDocument.MergeFiles(files.ToArray)
doc.Save(outputFile, Spire.Pdf.FileFormat.PDF)
End If
End Sub