Version 20210518

master
Stefan Hutter 5 years ago
parent 1efa65864e
commit 278669ede2

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -29,4 +29,3 @@ E:\Software-Projekte\EDOKA\client\Common\obj\Debug\Common.vbproj.CopyComplete
E:\Software-Projekte\EDOKA\client\Common\obj\Debug\EDOKALib.Common.dll
E:\Software-Projekte\EDOKA\client\Common\obj\Debug\EDOKALib.Common.xml
E:\Software-Projekte\EDOKA\client\Common\obj\Debug\EDOKALib.Common.pdb
E:\Software-Projekte\EDOKA\client\Common\obj\Debug\Common.vbprojAssemblyReference.cache

@ -187,6 +187,15 @@ Public Class frmtextmarken
Me.Save_Office()
End Sub
Private Sub document_beforeclose(ByVal Doc As Microsoft.Office.Interop.Word.Document, ByRef Cancel As Boolean) Handles objword.DocumentBeforeClose
If Doc.Name = sbdokumentname And Not Schliessen_OK Then
MsgBox("Bitte schliessen Sie das Dokument durch schliessen des Fensters 'Dokumentbefülung bearbeiten'.", vbInformation)
Cancel = True
End If
End Sub
#End Region
#Region "Load"
@ -246,6 +255,7 @@ Public Class frmtextmarken
#End Region
#Region "Office"
Dim sbdokumentname As String = ""
Public Sub Load_Document(Optional ByVal visible As Boolean = True)
'Rel. Office 2010
Dim dokumentname As String = Globals.Applikationsdaten.Rows(0).Item("pfad_temporaer_dokumente") + Me.serienbriefnr.ToString + "_vorlage.docx"
@ -253,6 +263,7 @@ Public Class frmtextmarken
StartWord(True)
objword.Documents.Open(dokumentname)
objdoc = objword.ActiveDocument
sbdokumentname = objdoc.Name
objword.Visible = visible
objword.WindowState = Microsoft.Office.Interop.Word.WdWindowState.wdWindowStateMaximize
End Sub

@ -17,7 +17,7 @@ Module Globals
Public WithEvents Generic_Event_Handler As New Generic_Event_Handler
'EDOKA-Version
Public Version As String = "5.6"
Public Versionsdatum As String = "21.02.2021"
Public Versionsdatum As String = "18.06.2021"
Public Force_Exit As Boolean = False
'Datenbankvariablen
Public sConnectionString As String

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -1 +1 @@
d3adf2a1a4591bccec27d61069fbfb144d335bbf
29c8571abf91ec6ecdd735e42df52b191b4b68ce

Loading…
Cancel
Save