Update 20250107

This commit is contained in:
Stefan Hutter
2025-01-07 21:00:50 +01:00
parent 3b0a2b0527
commit af418d0114
706 changed files with 1054974 additions and 976 deletions

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.

View File

@@ -0,0 +1,26 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>
vbBarcodes
</name>
</assembly>
<members>
<member name="T:vbBarcodes.My.Resources.Resources">
<summary>
A strongly-typed resource class, for looking up localized strings, etc.
</summary>
</member>
<member name="P:vbBarcodes.My.Resources.Resources.ResourceManager">
<summary>
Returns the cached ResourceManager instance used by this class.
</summary>
</member>
<member name="P:vbBarcodes.My.Resources.Resources.Culture">
<summary>
Overrides the current thread's CurrentUICulture property for all
resource lookups using this strongly typed resource class.
</summary>
</member>
</members>
</doc>

View File

@@ -567,9 +567,7 @@ namespace OnDocOffice
//word.ActiveDocument.Close(false);
Thread.Sleep(OfficeSleep);
//worddoc = word.Documents.Open(filename);
Logging.Logging.Debug("Word Open", "clsOffice", dokumentid);
Logging.Logging.Debug("Word befüllen", "clsOffice", dokumentid);
Logging.Logging.Debug("Word Open und Befüllen", "clsOffice", dokumentid);
Thread.Sleep(OfficeSleep);
if (worddoc.ProtectionType != Microsoft.Office.Interop.Word.WdProtectionType.wdNoProtection)
{
@@ -615,7 +613,7 @@ namespace OnDocOffice
dv.FieldName.ToString() == "TGEDKCursor" || dv.FieldName.ToString() == "TGEDKCursorB") { cursorpositionieren = true; }
}
catch { }
Logging.Logging.Debug(dv.TMBeginn.ToString() + " / " + dv.TMEnd.ToString(), dv.Value.ToString(), dokumentid);
// Logging.Logging.Debug(dv.TMBeginn.ToString() + " / " + dv.TMEnd.ToString(), dv.Value.ToString(), dokumentid);
dialogGenerate.add_progress((int)progressstep);
if (dv.TMBeginn.ToString() != "" && dv.TMEnd.ToString() == "")
{
@@ -631,7 +629,7 @@ namespace OnDocOffice
//pos = worddoc.Bookmarks[dv.TMBeginn.ToString()].Start;
//pos2 = word.Selection.End;
Logging.Logging.Debug(dv.TMBeginn.ToString(), "Selection-End", dokumentid);
// Logging.Logging.Debug(dv.TMBeginn.ToString(), "Selection-End", dokumentid);
//------------------------------
if (dv.TMBeginn.ToString().Substring(0, 19) == "XTGEDKDirektTelefonB" ||
@@ -717,7 +715,7 @@ namespace OnDocOffice
//word.ScreenUpdating = true;
Logging.Logging.Debug("Word Befüllen Ende", "clsOffice", dokumentid);
if (docdata.Barcode == true) { Generate_Barcodes(ref docdata); }
if (docdata.Barcode == true) { Generate_Barcodes(ref docdata, tempdir); }
Logging.Logging.Debug("Barcodes", "clsOffice", dokumentid);
if (is_protected)
@@ -728,7 +726,7 @@ namespace OnDocOffice
}
catch { }
}
//word.Visible = true;
word.Visible = true;
Logging.Logging.Debug("Start Macros", "clsOffice", dokumentid);
run_macros(ref docdata, connectionstring);
@@ -742,6 +740,7 @@ namespace OnDocOffice
Thread.Sleep(OfficeSleep);
string b64 = fh.Base64FromFile(filename);
word.Documents.Open(filename);
word.Activate();
Logging.Logging.Debug("Word geöffnet", "clsOffice", dokumentid);
worddoc = null;
word = null;
@@ -896,11 +895,11 @@ namespace OnDocOffice
g.Dispose();
return (System.Drawing.Image)b;
}
private void Generate_Barcodes(ref clsDocData docdata)
private void Generate_Barcodes(ref clsDocData docdata, string tempdir)
{
Logging.Logging.Debug("Barcode genererien start","OnDoc clsOffice",dokumentid);
vbBarcodes.vbarcodes vbcode = new vbBarcodes.vbarcodes();
vbcode.GenerateBarcodes(ref word, ref docdata, connectstring);
vbcode.GenerateBarcodes(ref word, ref docdata, connectstring,tempdir);
vbcode = null;
Logging.Logging.Debug("Barcode genererien Ende", "OnDoc clsOffice", dokumentid);
return;

View File

@@ -1 +1 @@
eff1ecf5630e816ad910af8782780db65cdacb3303496110c342451497eb98f0
7f02ad11b4c6abece5a68cf32a18685d7763d4d7d6526e457a6fdb670aa8551e

View File

@@ -37,3 +37,9 @@ E:\Software-Projekte\OnDoc\OnDoc\OnDocOffice\obj\Release\OnDocOffice.csproj.Core
E:\Software-Projekte\OnDoc\OnDoc\OnDocOffice\obj\Release\OnDocOff.BFE3F2F7.Up2Date
E:\Software-Projekte\OnDoc\OnDoc\OnDocOffice\obj\Release\OnDocOffice.dll
E:\Software-Projekte\OnDoc\OnDoc\OnDocOffice\obj\Release\OnDocOffice.pdb
E:\Software-Projekte\OnDoc\OnDoc\OnDocOffice\bin\Release\vbBarcodes.dll
E:\Software-Projekte\OnDoc\OnDoc\OnDocOffice\bin\Release\MW6.SDK.dll
E:\Software-Projekte\OnDoc\OnDoc\OnDocOffice\bin\Release\vbBarcodes.pdb
E:\Software-Projekte\OnDoc\OnDoc\OnDocOffice\bin\Release\vbBarcodes.xml
E:\Software-Projekte\OnDoc\OnDoc\OnDocOffice\obj\Release\OnDocOffice.DialogGenerate.resources
E:\Software-Projekte\OnDoc\OnDoc\OnDocOffice\obj\Release\OnDocOffice.csproj.GenerateResource.cache