Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

This commit is contained in:
2025-01-10 15:24:03 +01:00

View File

@@ -5,13 +5,13 @@ Imports System.Windows.Documents
Imports com.sun.org.apache.xml.internal.resolver Imports com.sun.org.apache.xml.internal.resolver
Imports com.sun.tools.internal.ws.wsdl.framework Imports com.sun.tools.internal.ws.wsdl.framework
Imports DocumentFormat.OpenXml.Office2010.Drawing.Charts Imports DocumentFormat.OpenXml.Office2010.Drawing.Charts
Imports itextsharp.text.pdf Imports iTextSharp.text.pdf
Imports itextsharp.text.pdf.parser Imports iTextSharp.text.pdf.parser
Imports java.text.Normalizer Imports java.text.Normalizer
Imports jdk.nashorn.internal.objects.annotations Imports jdk.nashorn.internal.objects.annotations
'Imports DocumentFormat.OpenXml.Drawing.Charts 'Imports DocumentFormat.OpenXml.Drawing.Charts
Imports Microsoft.Office.Interop Imports Microsoft.Office.Interop
Imports org.BouncyCastle.Pqc.Crypto Imports Org.BouncyCastle.Pqc.Crypto
Imports sun.swing Imports sun.swing
Imports VERAG_PROG_ALLGEMEIN Imports VERAG_PROG_ALLGEMEIN
@@ -1521,11 +1521,11 @@ Public Class frmMDM_USTVAntrag
Try Try
Dim fi As New System.IO.DirectoryInfo(path_src) Dim fi As New System.IO.DirectoryInfo(path_src)
Dim pdfReader As itextsharp.text.pdf.PdfReader = New itextsharp.text.pdf.PdfReader(path_src) Dim pdfReader As iTextSharp.text.pdf.PdfReader = New iTextSharp.text.pdf.PdfReader(path_src)
Dim TMP_Path_New = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(fi.Name, fi.Extension,, True, "IDS-Rechnungen") Dim TMP_Path_New = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(fi.Name, fi.Extension,, True, "IDS-Rechnungen")
Dim srcDoc As New itextsharp.text.Document() Dim srcDoc As New iTextSharp.text.Document()
Dim PdfCopyProvider As New itextsharp.text.pdf.PdfCopy(srcDoc, New FileStream(TMP_Path_New, System.IO.FileMode.Create)) Dim PdfCopyProvider As New iTextSharp.text.pdf.PdfCopy(srcDoc, New FileStream(TMP_Path_New, System.IO.FileMode.Create))
PdfCopyProvider.SetFullCompression() PdfCopyProvider.SetFullCompression()
srcDoc.Open() srcDoc.Open()
PdfReader.unethicalreading = True PdfReader.unethicalreading = True
@@ -1536,7 +1536,7 @@ Public Class frmMDM_USTVAntrag
Dim strategy As ITextExtractionStrategy = New SimpleTextExtractionStrategy() Dim strategy As ITextExtractionStrategy = New SimpleTextExtractionStrategy()
Dim currentpagetext As String = PdfTextExtractor.GetTextFromPage(pdfReader, page, strategy) Dim currentpagetext As String = PdfTextExtractor.GetTextFromPage(pdfReader, page, strategy)
Dim searchtext As String = ReNr Dim searchtext As String = ReNr
Dim impPage As itextsharp.text.pdf.PdfImportedPage = Nothing Dim impPage As iTextSharp.text.pdf.PdfImportedPage = Nothing
If (currentpagetext.Contains(searchtext)) Then If (currentpagetext.Contains(searchtext)) Then
@@ -1549,7 +1549,7 @@ Public Class frmMDM_USTVAntrag
impPage = PdfCopyProvider.GetImportedPage(pdfReader, page) impPage = PdfCopyProvider.GetImportedPage(pdfReader, page)
' ----- Ermitteln der Seitenauflösung und setzen für die neue Seite ' ----- Ermitteln der Seitenauflösung und setzen für die neue Seite
PdfCopyProvider.SetPageSize(New itextsharp.text.Rectangle(0.0F, 0.0F, impPage.Width, impPage.Height, pdfReader.GetPageRotation(page))) PdfCopyProvider.SetPageSize(New iTextSharp.text.Rectangle(0.0F, 0.0F, impPage.Width, impPage.Height, pdfReader.GetPageRotation(page)))
' ----- PDF Seite in das neue Dokument einfügen ' ----- PDF Seite in das neue Dokument einfügen
If impPage IsNot Nothing Then PdfCopyProvider.AddPage(impPage) If impPage IsNot Nothing Then PdfCopyProvider.AddPage(impPage)
Catch ex As Exception Catch ex As Exception