Update 20241229

API_NetFramework/obj/Debug/API_NetFramework.csproj.FileListAbsolute.txt

@@ -215,9 +215,6 @@ E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\WebActivatorEx.dll
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\WebGrease.dll
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\VBFileManagement.dll
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\NLog.dll
-E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.DocIO.Base.dll
-E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.XlsIO.Base.dll
-E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.Pdf.Base.dll
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.DocToPDFConverter.Base.dll
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.ExcelToPDFConverter.Base.dll
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\OfficePrinter.dll
@@ -226,8 +223,6 @@ E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\BarcodeLib.dll
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\OnDocOffice.dll
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.Licensing.dll
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\NLog.Database.dll
-E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.Compression.Base.dll
-E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.OfficeChart.Base.dll
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\FastReport.dll
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\QRCoder.dll
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\FastReport.Compat.dll
@@ -280,9 +275,6 @@ E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Antlr3.Runtime.pdb
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\VBFileManagement.pdb
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\VBFileManagement.xml
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\NLog.xml
-E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.DocIO.Base.xml
-E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.XlsIO.Base.xml
-E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.Pdf.Base.xml
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.DocToPDFConverter.Base.xml
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.ExcelToPDFConverter.Base.xml
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\OfficePrinter.pdb
@@ -290,8 +282,6 @@ E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.Presentation.Ba
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\BarcodeLib.pdb
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\OnDocOffice.pdb
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\NLog.Database.xml
-E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.Compression.Base.xml
-E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.OfficeChart.Base.xml
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\FastReport.xml
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\de\System.Net.Http.Formatting.resources.dll
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\de\System.Web.Helpers.resources.dll

Client/Client.csproj

@@ -55,7 +55,7 @@
     <StartupObject>OnDoc.Program</StartupObject>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>OnDoc6_Transparent.ico</ApplicationIcon>
+    <ApplicationIcon>OnDoc.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup />
   <PropertyGroup>
@@ -941,7 +941,6 @@
     <None Include="Resources\delete.png" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="OnDoc6_Transparent.ico" />
     <None Include="Resources\Select_24x24-32.png" />
     <None Include="Resources\Select_16x16-32.png" />
     <None Include="Resources\Select_256x256-32.png" />
@@ -1288,5 +1287,8 @@
       <Version>5.0.1.1</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="OnDoc.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Client/Diverses/NativVorlagen.cs

@@ -59,7 +59,7 @@ namespace OnDoc.Diverses
 
             string line = "";
             int i = 1;
-            StreamReader sr = new StreamReader(Properties.Settings.Default.NativVorlagen+@"\klassifizierung.txt");
+            StreamReader sr = new StreamReader(AppParams.pathNativVorlagen+@"\klassifizierung.txt");
             line = sr.ReadLine();
             while (line != null)
             {
@@ -83,7 +83,7 @@ namespace OnDoc.Diverses
             catch { }
 
             string ext = "";
-            DirectoryInfo directoryInfo = new DirectoryInfo(Properties.Settings.Default.NativVorlagen);
+            DirectoryInfo directoryInfo = new DirectoryInfo(AppParams.pathNativVorlagen);
             if (directoryInfo.Exists)
             {
                 try

Client/Diverses/SplashScreen.Designer.cs

@@ -64,7 +64,7 @@
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(203, 26);
             this.label2.TabIndex = 2;
-            this.label2.Text = "23. Dezember 2024";
+            this.label2.Text = "29. Dezember 2024";
             // 
             // SplashScreen
             // 

Client/DocMgmt/Dokumenterstellung.cs

@@ -139,9 +139,12 @@ namespace OnDoc.DocMgmt
             Logging.DocLog.Info("Dokumenterstellung", "frmDokumenterstellung", dokumentid, ucAllgemeineDokumentParam1.partnernr.ToString(), "Dokumenterstellung");
             if (dokumentid != "")
             {
-                DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey);
+                DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey,AppParams.Office_Fill_DocIO);
                 clsdok dok = new clsdok("", "", "");
+                Logging.Logging.Debug("Generate_Doc_EDOKA", "Dokumenterstellung", dokumentid);
                 dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, ucAllgemeineDokumentParam1.ErstellungInOffice,AppParams.OfficeSpleep1);
+                Logging.Logging.Debug("Generate_Doc_EDOKA - Ende", "Dokumenterstellung", dokumentid);
+
 
                 interop = ucAllgemeineDokumentParam1.interop;
 

Client/DocMgmt/Dokumentpaket.Designer.cs

@@ -48,6 +48,9 @@
             this.sfListView1 = new Syncfusion.WinForms.ListView.SfListView();
             this.TabControlDokuments = new Syncfusion.Windows.Forms.Tools.TabControlAdv();
             this.tabPageAdv1 = new Syncfusion.Windows.Forms.Tools.TabPageAdv();
+            this.panelword = new System.Windows.Forms.Panel();
+            this.lbldokumentname = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
             this.pnlfooter = new System.Windows.Forms.Panel();
             this.progressBarAdv1 = new Syncfusion.Windows.Forms.Tools.ProgressBarAdv();
             this.pnlleft = new System.Windows.Forms.Panel();
@@ -59,6 +62,7 @@
             this.dokList1 = new OnDoc.UICintrols.DokList();
             ((System.ComponentModel.ISupportInitialize)(this.TabControlDokuments)).BeginInit();
             this.TabControlDokuments.SuspendLayout();
+            this.panelword.SuspendLayout();
             this.pnlfooter.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).BeginInit();
             this.pnlleft.SuspendLayout();
@@ -220,6 +224,7 @@
             // sfListView1
             // 
             this.sfListView1.AccessibleName = "ScrollControl";
+            this.sfListView1.AutoHideScrollBars = true;
             this.sfListView1.BackColor = System.Drawing.SystemColors.Window;
             this.sfListView1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.sfListView1.Location = new System.Drawing.Point(0, 149);
@@ -232,7 +237,6 @@
             // 
             // TabControlDokuments
             // 
-            this.TabControlDokuments.BeforeTouchSize = new System.Drawing.Size(1069, 660);
             this.TabControlDokuments.BorderVisible = true;
             this.TabControlDokuments.Controls.Add(this.tabPageAdv1);
             this.TabControlDokuments.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -250,10 +254,40 @@
             this.tabPageAdv1.Name = "tabPageAdv1";
             this.tabPageAdv1.ShowCloseButton = true;
             this.tabPageAdv1.Size = new System.Drawing.Size(1059, 630);
-            this.tabPageAdv1.TabIndex = 1;
             this.tabPageAdv1.Text = "tabPageAdv1";
             this.tabPageAdv1.ThemesEnabled = false;
             // 
+            // panelword
+            // 
+            this.panelword.BackColor = System.Drawing.Color.PowderBlue;
+            this.panelword.Controls.Add(this.lbldokumentname);
+            this.panelword.Controls.Add(this.label1);
+            this.panelword.Location = new System.Drawing.Point(437, 75);
+            this.panelword.Name = "panelword";
+            this.panelword.Size = new System.Drawing.Size(715, 354);
+            this.panelword.TabIndex = 24;
+            this.panelword.Visible = false;
+            // 
+            // lbldokumentname
+            // 
+            this.lbldokumentname.AutoSize = true;
+            this.lbldokumentname.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lbldokumentname.Location = new System.Drawing.Point(22, 81);
+            this.lbldokumentname.Name = "lbldokumentname";
+            this.lbldokumentname.Size = new System.Drawing.Size(167, 26);
+            this.lbldokumentname.TabIndex = 1;
+            this.lbldokumentname.Text = "Dokumentname";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label1.Location = new System.Drawing.Point(22, 25);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(443, 26);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "Folgendes Dokument wird in Word generiert:";
+            // 
             // pnlfooter
             // 
             this.pnlfooter.Controls.Add(this.progressBarAdv1);
@@ -379,6 +413,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(2124, 851);
+            this.Controls.Add(this.panelword);
             this.Controls.Add(this.groupBox3);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.pnlleft);
@@ -394,6 +429,8 @@
             this.Load += new System.EventHandler(this.Dokumentpaket_Load);
             ((System.ComponentModel.ISupportInitialize)(this.TabControlDokuments)).EndInit();
             this.TabControlDokuments.ResumeLayout(false);
+            this.panelword.ResumeLayout(false);
+            this.panelword.PerformLayout();
             this.pnlfooter.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).EndInit();
             this.pnlleft.ResumeLayout(false);
@@ -437,5 +474,8 @@
         private Syncfusion.Windows.Forms.Tools.ProgressBarAdv progressBarAdv1;
         private System.Windows.Forms.RibbonPanel ribbonPanel5;
         private System.Windows.Forms.RibbonButton ribbonButtonNew;
+        private System.Windows.Forms.Panel panelword;
+        private System.Windows.Forms.Label lbldokumentname;
+        private System.Windows.Forms.Label label1;
     }
 }

Client/DocMgmt/Dokumentpaket.cs

@@ -434,7 +434,7 @@ namespace OnDoc.DocMgmt
                 if (idokumentid == "" || uc.genertated_dokumentid == idokumentid)
                 {
 
-                    uc.Set_Edit_later();
+                    //uc.Set_Edit_later(); 
                     uc.Update_DocGenData();
                     clsDocData dokdata = new clsDocData();
                     uc.update_dokdata(ref dokdata);
@@ -446,13 +446,41 @@ namespace OnDoc.DocMgmt
                     uc.Show_Neugenerieren();
                     filter = filter + dokumentid + "','";
                     dokumentid = dokdata.Dokumentid;
+                    if (uc.docgendata.erstellungsart == Erstellungsart.DokumentPreview) { uc.docgendata.erstellungsart = Erstellungsart.DokumentSpäterBearbeiten; }
                     if (dokumentid != "")
                     {
                         Logging.DocLog.Info("Dokument erstellt", "Dokumentpaket", dokumentid, uc.partnernr.ToString(), "Dokument erstellt");
-                        DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI,AppParams.apikey);
+                        DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI,AppParams.apikey,AppParams.Office_Fill_DocIO);
                         clsdok dok = new clsdok("", "", "");
+                        if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice)
+                        {
+                            panelword.Visible = true;
+                            lbldokumentname.Text = tab.Text;
+                            Application.DoEvents();
+                            dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata,true,AppParams.OfficeSpleep1);
+                            panelword.Visible = false;
+                            Application.DoEvents();
+
+                        }
+                        else
+                        {
                             dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata);
 
+                        }
+
+                        if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice)
+                        {
+                            string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
+                            string filename_temp = filename + ".tmp";
+                            System.IO.File.WriteAllBytes(filename_temp, Convert.FromBase64String(dok.dokument));
+                            DB db = new DB(AppParams.connectionstring);
+                            db.Save_To_DB(dokdata.Dokumentid, filename_temp);
+                            db.Dok_in_Bearbeitung(1,dokdata.Dokumentid, AppParams.CurrentMitarbieter);
+                            db = null;
+                            System.IO.File.Delete(filename_temp);
+                            clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word");
+
+                        }
                         if (uc.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten)
                         {
                             string filename = AppParams.tempdir + dokumentid + "." + dok.extension;

Client/DocMgmt/FrmDokumenterstellung.cs

@@ -216,7 +216,7 @@ namespace OnDoc.DocMgmt
                     dokdata.barcode_content = dB.daten.Tables[0].Rows[0][1].ToString();
                     dB = null;
                 }
-                DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey);
+                DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey, AppParams.Office_Fill_DocIO);
 
                 clsdok dok = new clsdok("", "", "");
                 dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata);

Client/Klassen/clsAppParams.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Configuration;
+using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -43,6 +44,10 @@ namespace OnDoc.Klassen
 
         public static int OfficeSpleep1 { get; set; } = 500;
         public static int OfficeSpleep2 { get; set; } = 1000;
+
+        public static string pathNativVorlagen { get; set; } = "";
+
+        public static int Office_Fill_DocIO { get; set; } = 0;
         static AppParams()
         {
 
@@ -57,13 +62,32 @@ namespace OnDoc.Klassen
             logconnectionstring = System.IO.File.ReadAllText(startuppath + @"\logconn.cfg");
             logconnectionstring = StringCipher.Decrypt(logconnectionstring, "i%!k!7pab%bNLdA5hE4pkR4XaB%E^jB3d9tHuQ4pbF&BZjF7SB#WBWit5#HrbJiLrLVm");
             DB db = new DB(connectionstring);
+            db.Get_Tabledata("Select * from ondoc_appParams where usedbparams=1", false, true);
+            if (db.dsdaten.Tables[0].Rows.Count > 0)
+            {
+                tempdir = db.dsdaten.Tables[0].Rows[0][0].ToString();
+                Version = db.dsdaten.Tables[0].Rows[0][1].ToString();
+                UseAPI = db.dsdaten.Tables[0].Rows[0][2].ToString();
+                RESTURI = db.dsdaten.Tables[0].Rows[0][3].ToString();
+                wordprintmacro = db.dsdaten.Tables[0].Rows[0][5].ToString();
+                vbvorlagenmanagement = db.dsdaten.Tables[0].Rows[0][6].ToString();
+                barcodefont = db.dsdaten.Tables[0].Rows[0][7].ToString();
+                barcodefontsize = db.dsdaten.Tables[0].Rows[0][8].ToString();
+                barcodetextposition = db.dsdaten.Tables[0].Rows[0][9].ToString();
+                ZusatzFont = db.dsdaten.Tables[0].Rows[0][10].ToString();
+                ZusatzFontSize = db.dsdaten.Tables[0].Rows[0][11].ToString();
+                EDOKAPath = db.dsdaten.Tables[0].Rows[0][12].ToString();
+                OfficeSpleep1 = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][13]);
+                OfficeSpleep2 = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][14]);
+                pathNativVorlagen = db.dsdaten.Tables[0].Rows[0][15].ToString();
+                Office_Fill_DocIO= Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][15]);
+            }
+            else
+            {
                 db.Get_Tabledata("Select * from applikation where applikationsnr = 1", false, true);
                 tempdir = db.dsdaten.Tables[0].Rows[0]["pfad_temporaer_dokumente"].ToString();
-            db = null;
                 StaticValues.UserID = "Stefan Hutter";
 
-            apikey = System.IO.File.ReadAllText(startuppath + @"\apikey.cfg");
-            apikey = StringCipher.Decrypt(apikey, "PBod8b%s@c9ib7Lws#na5sGM2trugrx3h!oyB^y!Bc%fHEYUT3QvTVr6sAaAr9FoQWzb");
                 UseAPI = Properties.Settings.Default.UseAPI;
                 RESTURI = Properties.Settings.Default.RESTURI;
                 //apikey = Properties.Settings.Default.apikey;
@@ -75,6 +99,32 @@ namespace OnDoc.Klassen
                 ZusatzFont = Properties.Settings.Default.ZusatzFont;
                 ZusatzFontSize = Properties.Settings.Default.ZusatzFontSize;
                 EDOKAPath = Properties.Settings.Default.edokapath;
+                pathNativVorlagen = Properties.Settings.Default.NativVorlagen;
+            }
+            apikey = System.IO.File.ReadAllText(startuppath + @"\apikey.cfg");
+            apikey = StringCipher.Decrypt(apikey, "PBod8b%s@c9ib7Lws#na5sGM2trugrx3h!oyB^y!Bc%fHEYUT3QvTVr6sAaAr9FoQWzb");
+            db = null;
+            EvaluatePath(AppParams.tempdir);
+
+        }
+        private static String EvaluatePath(String path)
+        {
+
+            try
+            {
+                String folder = Path.GetDirectoryName(path);
+                if (!Directory.Exists(folder))
+                {
+                    // Try to create the directory.
+                    DirectoryInfo di = Directory.CreateDirectory(folder);
+                }
+            }
+            catch (IOException ioex)
+            {
+                Console.WriteLine(ioex.Message);
+                return "";
+            }
+            return path;
         }
     }
 

Client/Klassen/clsProcessWatch.cs

@@ -102,7 +102,7 @@ namespace OnDoc.Klassen
         private static void Remove_Dok_in_Bearbeitung(string dokumentid)
         {
             DB db = new DB(AppParams.connectionstring);
-            db.Dok_in_Bearbeietung(2, dokumentid, AppParams.CurrentMitarbieter);
+            db.Dok_in_Bearbeitung(2, dokumentid, AppParams.CurrentMitarbieter);
             db = null;
         }
         private static void Remove_Dokumentbearbeitung_Zwingend(string dokumentid)

Client/UIControls/Administrator/Dokumenttyp.Designer.cs

@@ -100,6 +100,7 @@
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.tsbtnsave = new System.Windows.Forms.ToolStripButton();
             this.grpVorlagenfeld = new System.Windows.Forms.GroupBox();
+            this.btnSaveVorlagenfeld = new System.Windows.Forms.Button();
             this.chkaktiv = new System.Windows.Forms.CheckBox();
             this.label14 = new System.Windows.Forms.Label();
             this.lblFeldregel = new System.Windows.Forms.TextBox();
@@ -144,7 +145,6 @@
             this.label16 = new System.Windows.Forms.Label();
             this.rbNr = new System.Windows.Forms.RadioButton();
             this.label15 = new System.Windows.Forms.Label();
-            this.btnSaveVorlagenfeld = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit();
             this.tabControlAdv1.SuspendLayout();
             this.tabPageAdv1.SuspendLayout();
@@ -178,7 +178,6 @@
             // 
             // tabControlAdv1
             // 
-            this.tabControlAdv1.BeforeTouchSize = new System.Drawing.Size(1019, 760);
             this.tabControlAdv1.Controls.Add(this.tabPageAdv1);
             this.tabControlAdv1.Controls.Add(this.tabPageAdv2);
             this.tabControlAdv1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -204,7 +203,6 @@
             this.tabPageAdv1.Name = "tabPageAdv1";
             this.tabPageAdv1.ShowCloseButton = true;
             this.tabPageAdv1.Size = new System.Drawing.Size(1016, 733);
-            this.tabPageAdv1.TabIndex = 1;
             this.tabPageAdv1.Text = "Allgemein";
             this.tabPageAdv1.ThemesEnabled = false;
             // 
@@ -325,7 +323,7 @@
             // 
             this.cbUnterschriftrechts.Location = new System.Drawing.Point(130, 28);
             this.cbUnterschriftrechts.Name = "cbUnterschriftrechts";
-            this.cbUnterschriftrechts.Size = new System.Drawing.Size(114, 24);
+            this.cbUnterschriftrechts.Size = new System.Drawing.Size(150, 24);
             this.cbUnterschriftrechts.TabIndex = 6;
             this.cbUnterschriftrechts.Text = "Unterschrift rechts";
             // 
@@ -846,7 +844,6 @@
             this.tabPageAdv2.Name = "tabPageAdv2";
             this.tabPageAdv2.ShowCloseButton = true;
             this.tabPageAdv2.Size = new System.Drawing.Size(1016, 733);
-            this.tabPageAdv2.TabIndex = 2;
             this.tabPageAdv2.Text = "Voralgenfelder";
             this.tabPageAdv2.ThemesEnabled = false;
             // 
@@ -986,6 +983,16 @@
             this.grpVorlagenfeld.TabStop = false;
             this.grpVorlagenfeld.Text = "Vorlagenfeld";
             // 
+            // btnSaveVorlagenfeld
+            // 
+            this.btnSaveVorlagenfeld.Location = new System.Drawing.Point(21, 622);
+            this.btnSaveVorlagenfeld.Name = "btnSaveVorlagenfeld";
+            this.btnSaveVorlagenfeld.Size = new System.Drawing.Size(248, 23);
+            this.btnSaveVorlagenfeld.TabIndex = 36;
+            this.btnSaveVorlagenfeld.Text = "Speichern";
+            this.btnSaveVorlagenfeld.UseVisualStyleBackColor = true;
+            this.btnSaveVorlagenfeld.Click += new System.EventHandler(this.btnSaveVorlagenfeld_Click);
+            // 
             // chkaktiv
             // 
             this.chkaktiv.AutoSize = true;
@@ -1446,16 +1453,6 @@
             this.label15.TabIndex = 7;
             this.label15.Text = "Sort";
             // 
-            // btnSaveVorlagenfeld
-            // 
-            this.btnSaveVorlagenfeld.Location = new System.Drawing.Point(21, 622);
-            this.btnSaveVorlagenfeld.Name = "btnSaveVorlagenfeld";
-            this.btnSaveVorlagenfeld.Size = new System.Drawing.Size(248, 23);
-            this.btnSaveVorlagenfeld.TabIndex = 36;
-            this.btnSaveVorlagenfeld.Text = "Speichern";
-            this.btnSaveVorlagenfeld.UseVisualStyleBackColor = true;
-            this.btnSaveVorlagenfeld.Click += new System.EventHandler(this.btnSaveVorlagenfeld_Click);
-            // 
             // Dokumenttyp
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

Client/UIControls/DokList.cs

@@ -405,7 +405,7 @@ namespace OnDoc.UICintrols
             DB db = new DB(AppParams.connectionstring);
             try
             {
-                if (db.Dok_in_Bearbeietung(3, selected_dokumentid, AppParams.CurrentMitarbieter) == false)
+                if (db.Dok_in_Bearbeitung(3, selected_dokumentid, AppParams.CurrentMitarbieter) == false)
                 {
                     MessageBox.Show("Das Dokument wird aktuell bearbeitet.", "Dokumentbearbeitung", MessageBoxButtons.OK, MessageBoxIcon.Information);
                     return;
@@ -426,7 +426,7 @@ namespace OnDoc.UICintrols
                         Logging.DocLog.Info("Verantwortung für Bearbeitung übernommen", "Doklist", selected_dokumentid, selected_partnernr, "Verantwortung übernommen");
                     }
                 }
-                db.Dok_in_Bearbeietung(1, selected_dokumentid, AppParams.CurrentMitarbieter);
+                db.Dok_in_Bearbeitung(1, selected_dokumentid, AppParams.CurrentMitarbieter);
 
             }
             catch { }
@@ -783,7 +783,7 @@ namespace OnDoc.UICintrols
                         return; 
                     }
 
-                    db.Dok_in_Bearbeietung(1, selected_dokumentid, AppParams.CurrentMitarbieter);
+                    db.Dok_in_Bearbeitung(1, selected_dokumentid, AppParams.CurrentMitarbieter);
                     db = null;
                     clsProcessWatch.AddToList(selected_dokumentid, filename, "Word");
                     break;

Client/UIControls/UCAllgemeineDokumentParam.Designer.cs

@@ -28,8 +28,8 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             this.GrpPartner = new System.Windows.Forms.GroupBox();
-            this.button1 = new System.Windows.Forms.Button();
             this.btneditadresse = new System.Windows.Forms.Button();
             this.btnweitereadressen = new System.Windows.Forms.Button();
             this.txtanrede = new System.Windows.Forms.TextBox();
@@ -76,6 +76,9 @@
             this.cbboxpostzustellung = new Syncfusion.WinForms.ListView.SfComboBox();
             this.lblPostzustellung = new System.Windows.Forms.Label();
             this.btnErneutGenerierung = new System.Windows.Forms.Button();
+            this.lblAnrede = new System.Windows.Forms.Label();
+            this.DateTerminText = new System.Windows.Forms.TextBox();
+            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.GrpPartner.SuspendLayout();
             this.groupBox5.SuspendLayout();
             this.groupBox6.SuspendLayout();
@@ -99,7 +102,7 @@
             // 
             // GrpPartner
             // 
-            this.GrpPartner.Controls.Add(this.button1);
+            this.GrpPartner.Controls.Add(this.lblAnrede);
             this.GrpPartner.Controls.Add(this.btneditadresse);
             this.GrpPartner.Controls.Add(this.btnweitereadressen);
             this.GrpPartner.Controls.Add(this.txtanrede);
@@ -116,15 +119,6 @@
             this.GrpPartner.TabStop = false;
             this.GrpPartner.Text = "Partner";
             // 
-            // button1
-            // 
-            this.button1.Location = new System.Drawing.Point(490, 226);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(75, 23);
-            this.button1.TabIndex = 8;
-            this.button1.Text = "button1";
-            this.button1.UseVisualStyleBackColor = true;
-            // 
             // btneditadresse
             // 
             this.btneditadresse.Image = global::OnDoc.Properties.Resources.EditDoc_16x16_32;
@@ -149,11 +143,10 @@
             // 
             // txtanrede
             // 
-            this.txtanrede.Location = new System.Drawing.Point(298, 156);
+            this.txtanrede.Location = new System.Drawing.Point(298, 169);
             this.txtanrede.Name = "txtanrede";
             this.txtanrede.Size = new System.Drawing.Size(200, 20);
             this.txtanrede.TabIndex = 6;
-            this.txtanrede.Text = "txtanrede";
             // 
             // groupBox5
             // 
@@ -547,6 +540,7 @@
             // 
             // groupBox9
             // 
+            this.groupBox9.Controls.Add(this.DateTerminText);
             this.groupBox9.Controls.Add(this.DateTermin);
             this.groupBox9.Controls.Add(this.lblTermin);
             this.groupBox9.Controls.Add(this.DateDokumentDatum);
@@ -563,11 +557,13 @@
             // 
             // DateTermin
             // 
-            this.DateTermin.Location = new System.Drawing.Point(398, 42);
+            this.DateTermin.DateTimeIcon = null;
+            this.DateTermin.Location = new System.Drawing.Point(476, 42);
             this.DateTermin.Name = "DateTermin";
-            this.DateTermin.Size = new System.Drawing.Size(107, 21);
+            this.DateTermin.Size = new System.Drawing.Size(29, 21);
             this.DateTermin.TabIndex = 5;
             this.DateTermin.ToolTipText = "";
+            this.DateTermin.ValueChanged += new Syncfusion.WinForms.Input.Events.DateTimeValueChangedEventHandler(this.DateTermin_ValueChanged);
             // 
             // lblTermin
             // 
@@ -580,6 +576,7 @@
             // 
             // DateDokumentDatum
             // 
+            this.DateDokumentDatum.DateTimeIcon = null;
             this.DateDokumentDatum.Location = new System.Drawing.Point(151, 44);
             this.DateDokumentDatum.Name = "DateDokumentDatum";
             this.DateDokumentDatum.Size = new System.Drawing.Size(107, 21);
@@ -627,6 +624,27 @@
             this.btnErneutGenerierung.Visible = false;
             this.btnErneutGenerierung.Click += new System.EventHandler(this.btnErneutGenerierung_Click);
             // 
+            // lblAnrede
+            // 
+            this.lblAnrede.AutoSize = true;
+            this.lblAnrede.Location = new System.Drawing.Point(298, 153);
+            this.lblAnrede.Name = "lblAnrede";
+            this.lblAnrede.Size = new System.Drawing.Size(151, 13);
+            this.lblAnrede.TabIndex = 8;
+            this.lblAnrede.Text = "Anrede (sofern nicht Standard)";
+            // 
+            // DateTerminText
+            // 
+            this.DateTerminText.Location = new System.Drawing.Point(406, 43);
+            this.DateTerminText.Name = "DateTerminText";
+            this.DateTerminText.Size = new System.Drawing.Size(69, 20);
+            this.DateTerminText.TabIndex = 6;
+            // 
+            // contextMenuStrip1
+            // 
+            this.contextMenuStrip1.Name = "contextMenuStrip1";
+            this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4);
+            // 
             // UCAllgemeineDokumentParam
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -723,7 +741,9 @@
         private System.Windows.Forms.Button btnErneutGenerierung;
         private System.Windows.Forms.Button btnweitereadressen;
         private System.Windows.Forms.TextBox txtanrede;
-        private System.Windows.Forms.Button button1;
         private System.Windows.Forms.Button btneditadresse;
+        private System.Windows.Forms.Label lblAnrede;
+        private System.Windows.Forms.TextBox DateTerminText;
+        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
     }
 }

Client/UIControls/UCAllgemeineDokumentParam.cs

@@ -165,17 +165,22 @@ namespace OnDoc.UIControls
                 {
                     this.lblTermin.Visible = true;
                     this.DateTermin.Visible = true;
+                    this.DateTerminText.Visible = true;
+                    this.DateTerminText.Text = "";
+                    
                 }
                 else
                 {
                     this.lblTermin.Visible = false;
                     this.DateTermin.Visible = false;
+                    this.DateTerminText.Visible = false;
+                    this.DateTermin.Value = new DateTime(1900, 01, 01);
                 }
 
 
                 db.Get_Tabledata("Select beschreibung from physischesarchiv where physischesarchivnr = " + dr["physisches_archiv"].ToString(), false, true);
                 barcode_zusatz = db.dsdaten.Tables[0].Rows[0][0].ToString();
-                if (barcode_zusatz != "") { barcode_zusatz = " / " + barcode_zusatz; }
+                if (barcode_zusatz != "") { barcode_zusatz = " " + barcode_zusatz; }
 
                 db.Get_Tabledata("Select office_vorlagenr,kopfzeile_generieren, bcpt,bcpl, bcw, bch, bchorizontal, barcodetype, datamatrixcontent  from office_vorlage where office_vorlagenr="+dr["office_vorlagenr"].ToString(),false,true);
                 this.vorlagenr = Convert.ToInt32(dr["office_vorlagenr"]);
@@ -567,7 +572,14 @@ namespace OnDoc.UIControls
             dokdata.barcode_textposition = AppParams.barcodetextposition;
             dokdata.barcode_type = barcode_type;
             dokdata.barcode_content = barcode_content;
+            if (DateTerminText.Text == "")
+            {
+                dokdata.Termin = "01.01.1900";
+            }
+            else
+            {
                 dokdata.Termin = DateTermin.Value.ToString();
+            }
             dokdata.Bezeichnung = txtbezeichnung.ToString();
             dokdata.zustelladresse = docgendata.zustelladresse;
             dokdata.anrede = docgendata.anrede;
@@ -586,7 +598,7 @@ namespace OnDoc.UIControls
             if (ps.DialogResult == DialogResult.OK)
             {
                 this.partnernr = ps.partnernr;
-                if (ps.bpperson_changed) { lblPartner.ForeColor = System.Drawing.Color.Red; } else { lblPartner.ForeColor = System.Drawing.Color.Black; }
+                if (ps.bpperson_changed) { lblPartner.ForeColor = System.Drawing.Color.Blue; } else { lblPartner.ForeColor = System.Drawing.Color.Black; }
                 update_partner();
             }
         }
@@ -798,5 +810,10 @@ namespace OnDoc.UIControls
             }
             catch { }
         }
+
+        private void DateTermin_ValueChanged(object sender, Syncfusion.WinForms.Input.Events.DateTimeValueChangedEventArgs e)
+        {
+            this.DateTerminText.Text = DateTermin.Value.ToString().Substring(0,10);
+        }
     }
 }

Client/UIControls/UCAllgemeineDokumentParam.resx

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

Client/bin/Debug/_Zipit.bat

@@ -1,4 +1,4 @@
 delete EDKB02DMS.zip
-"C:\Program Files\7-Zip\7z.exe" -pshu*tkb98125 a OnDocClient.zip OnDoc.exe OnDoc.pdb
+"C:\Program Files\7-Zip\7z.exe" -pshu*tkb98125 a OnDocClient.zip OnDoc.exe OnDoc.pdb OnDocOffice.dll Docgen.dll database.dll barcodelib.dll 
 copy OnDocClient.zip H:\NextCloud\ZZDownload
 pause

Client/obj/Client.csproj.nuget.dgspec.json

@@ -237,6 +237,9 @@
               "E:\\Software-Projekte\\OnDoc\\OnDoc\\Helper\\Helper.csproj": {
                 "projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Helper\\Helper.csproj"
               },
+              "E:\\Software-Projekte\\OnDoc\\OnDoc\\Logging\\Logging.csproj": {
+                "projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Logging\\Logging.csproj"
+              },
               "E:\\Software-Projekte\\OnDoc\\OnDoc\\Model\\Model.csproj": {
                 "projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Model\\Model.csproj"
               }

Client/obj/project.assets.json

@@ -322,6 +322,7 @@
         "type": "project",
         "dependencies": {
           "Helper": "1.0.0",
+          "Logging": "1.0.0",
           "Model": "1.0.0"
         },
         "compile": {
@@ -662,6 +663,7 @@
         "type": "project",
         "dependencies": {
           "Helper": "1.0.0",
+          "Logging": "1.0.0",
           "Model": "1.0.0"
         },
         "compile": {
@@ -1002,6 +1004,7 @@
         "type": "project",
         "dependencies": {
           "Helper": "1.0.0",
+          "Logging": "1.0.0",
           "Model": "1.0.0"
         },
         "compile": {
@@ -1342,6 +1345,7 @@
         "type": "project",
         "dependencies": {
           "Helper": "1.0.0",
+          "Logging": "1.0.0",
           "Model": "1.0.0"
         },
         "compile": {
@@ -1682,6 +1686,7 @@
         "type": "project",
         "dependencies": {
           "Helper": "1.0.0",
+          "Logging": "1.0.0",
           "Model": "1.0.0"
         },
         "compile": {

Client/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "//oMcuein6o=",
+  "dgSpecHash": "KeklD2p55VM=",
   "success": true,
   "projectFilePath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Client\\Client.csproj",
   "expectedPackageFiles": [

DOCGEN/Klassen/DocGenerator_from_EDOKA.cs

@@ -25,6 +25,7 @@ namespace DOCGEN.Generator
         private static readonly NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();
         public string apikey = "";
         public string resturi = "";
+        public int Office_Fill_DocIO = 0;
 
         public void Lic()
         {
@@ -47,12 +48,13 @@ namespace DOCGEN.Generator
             this.resturi= RestUri;
         }
 
-        public DocGenerator_from_EDOKA(string connectionstring, string tempdir, string RestUri, string ApiKey)
+        public DocGenerator_from_EDOKA(string connectionstring, string tempdir, string RestUri, string ApiKey, int Office_Fill_DocIO)
         {
             this.connectionstring = connectionstring; 
             this.tempdir = tempdir;
             this.resturi = RestUri;
             this.apikey = ApiKey;
+            this.Office_Fill_DocIO= Office_Fill_DocIO;
         }
 
         public clsdok Generate_Doc_EDOKA(string dokumentid, ref clsDocData docdata, bool useoffice = false, int OfficeSleep=0)
@@ -62,6 +64,8 @@ namespace DOCGEN.Generator
             DataTable dt2 = new DataTable();
             string Apptype = "";
             string Extension = "";
+            Logging.Logging.Debug("Generate_Doc_EDOKA", "Get_Vorlage", dokumentid);
+
             dt = db.Get_Vorlage_By_DokumentID(dokumentid,useoffice);
             db.dsdaten.Tables.Clear();
             dt2 = db.Get_ApplicationType_from_Vorlage(Convert.ToInt32(dt.Rows[0]["nr"].ToString()));
@@ -75,11 +79,20 @@ namespace DOCGEN.Generator
                     generate_docdata(dokumentid, ref docdata);
                     clsdok dok = new clsdok("", "", "");
                     if (useoffice == false) {
+                        Logging.Logging.Debug("Generate_Word", "Start", dokumentid);
                         dok.dokument = sfword.Generate_Word(dt.Rows[0][0].ToString(), docdata);
-                    } else
+                        Logging.Logging.Debug("Generate_Word", "Ende", dokumentid);
+
+                    }
+                    else
                     {
+                        Logging.Logging.Debug("Generate_Word_in_Office", "Init", dokumentid);
                         OnDocOffice.clsWordEdit oo = new OnDocOffice.clsWordEdit("", "","");
-                        dok.dokument = oo.Generate_Word_in_Office(ref docdata, ref dok, dt.Rows[0][0].ToString(), connectionstring, tempdir, dokumentid, Apptype,Extension,OfficeSleep);
+                        Logging.Logging.Debug("Generate_Word_in_Office", "Start", dokumentid);
+
+                        dok.dokument = oo.Generate_Word_in_Office(ref docdata, ref dok, dt.Rows[0][0].ToString(), connectionstring, tempdir, dokumentid, Apptype,Extension,OfficeSleep,Office_Fill_DocIO);
+                        Logging.Logging.Debug("Generate_Word_in_Office", "Ende", dokumentid);
+                        oo = null;                        
                     }
 
                     dok.doktype = "D";
@@ -88,12 +101,24 @@ namespace DOCGEN.Generator
                     return dok;
                 case "XLSM": case "XLSX": case "XLST": case "XLS": case "XLT":
                 case "EXCEL":
+
                     SyncFExcel sfexcel = new SyncFExcel();
                     generate_docdata(dokumentid, ref docdata);
                     clsdok dokexcel = new clsdok("", "", "");
+                    if (useoffice == false)
+                    {
                         dokexcel.dokument = sfexcel.Generate_Excel(dt.Rows[0][0].ToString(), docdata);
                         dokexcel.doktype = "X";
                         dokexcel.extension = dt2.Rows[0][1].ToString();
+                    }
+                    else
+                    {
+                        OnDocOffice.clsExcelEdit eo = new OnDocOffice.clsExcelEdit("", "", "");
+                        dokexcel.dokument = eo.Generate_Excel_in_Office(ref docdata, ref dokexcel, dt.Rows[0][0].ToString(), connectionstring, tempdir, dokumentid, Apptype, Extension, OfficeSleep, Office_Fill_DocIO);
+                        dokexcel.doktype = "X";
+                        dokexcel.extension = dt2.Rows[0][1].ToString();
+                        eo = null;
+                    }
                     return dokexcel;
                 //break;
                 case "PDF": case "ACROBAT": case "FORMULAR": case "DOKUMENT":

DOCGEN/Klassen/SyncFExcel.cs

@@ -76,6 +76,11 @@ namespace DOCGEN.Klassen
                     //    Debug.Print(name.Value);
                     //}
                 }
+               
+            }
+            if (docdata.Barcode == true)
+            {
+                Insert_Barcode(workBook, docdata);
             }
 
             MemoryStream destms = new MemoryStream();
@@ -119,5 +124,45 @@ namespace DOCGEN.Klassen
             ex.Dispose();
 
         }
+        public void Insert_Barcode(IWorkbook workBook, clsDocData docData)
+        {
+            System.Drawing.Image barcodeimage;
+            BarcodeLib.Barcode Barcode = new BarcodeLib.Barcode();
+            switch (docData.barcode_type)
+            {
+                case "0":
+                    int rotation = 0;
+                    if (docData.barcode_horizontal == 0) { rotation = 270; }
+                    barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5, docData.Dokumentid.Substring(6, 16), docData.Dokumentid.Substring(6, 16) + docData.barcode_zusatz, docData.barcode_textposition, docData.Zusatz_Font, Convert.ToInt32(docData.Zusatz_FontSize), rotation);
+                    break;
+                case "1":
+
+                    //barcodeimage = Barcode.Get_Datamatrix(DataMatrix.net.DmtxScheme.DmtxSchemeAutoBest, docData.barcode_content, 4, 0, 0, "Left", docData.barcode_content, docData.barcode_font, docData.barcode_fontsize);
+
+                    barcodeimage = Barcode.Get_Datamatrix(DataMatrix.net.DmtxScheme.DmtxSchemeAscii, docData.barcode_content, 6, 6, 0, "Right", docData.barcode_text + docData.barcode_zusatz, docData.barcode_font, docData.barcode_fontsize + 5);
+                    //barcodeimage.Save(@"x:\bctest.png");
+                    break;
+                default:
+                    barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5C, docData.Dokumentid.Substring(9, 13), docData.Dokumentid.Substring(6, 16) + docData.barcode_zusatz, docData.barcode_textposition, docData.barcode_font, Convert.ToInt32(docData.barcode_fontsize), 0);
+                    break;
+            }
+            foreach (IWorksheet worksheet in workBook.Worksheets)
+            {
+                foreach (IName name in workBook.Names)
+                {
+                    if (name.Name.ToString().ToUpper().Substring(0, 7) == "TGEDKBC")
+                    {
+                        int i = name.Index;
+                        int row = worksheet.Range[name.Name].Row;
+                        int col = worksheet.Range[name.Name].Column;
+
+                        IPictureShape picture = worksheet.Pictures.AddPicture(row, col, barcodeimage);
+                    }
+
+                }
+            }
+
+                //            System.Drawing.Im
+            }
         }
 }

DOCGEN/Klassen/SyncFWord.cs

@@ -153,6 +153,7 @@ namespace DOCGEN.Klassen
         //    return (Image)new Bitmap(imgToResize, size);
 
         //}
+  
         public string Generate_Word(string base64, clsDocData docdata,  string img_UL="", string img_UR="",string img_faktura="")
         {
             string formattype = "";
@@ -168,11 +169,11 @@ namespace DOCGEN.Klassen
                     
                     break;
                 default:
-                    document.Settings.CompatibilityMode = CompatibilityMode.Word2010;
+                    document.Settings.CompatibilityMode = CompatibilityMode.Word2003;
                     break;
             }
-            if (compatibilityMode == CompatibilityMode.Word2010) { document.Settings.CompatibilityMode = CompatibilityMode.Word2010; }
+            //if (compatibilityMode == CompatibilityMode.Word2010) { document.Settings.CompatibilityMode = CompatibilityMode.Word2010; }
-            if (compatibilityMode > CompatibilityMode.Word2010) { document.Settings.CompatibilityMode = CompatibilityMode.Word2010; }
+            //if (compatibilityMode > CompatibilityMode.Word2010) { document.Settings.CompatibilityMode = CompatibilityMode.Word2013; }
             formattype = document.ActualFormatType.ToString();
             var formattype_original = document.ActualFormatType;
             string ppimg = "";
@@ -188,12 +189,31 @@ namespace DOCGEN.Klassen
 
             if (docdata.Kopfzeile_generieren == true)
             {
-                //BookmarksNavigator bookmarkNavigator = new BookmarksNavigator(document);
+                try
-                //bookmarkNavigator.MoveToBookmark("TGEDKCompanyBBEB99");
+                {
-                //IWParagraph paragraph = new WParagraph(document);
+                    BookmarksNavigator bookmarkNavigator = new BookmarksNavigator(document);
-                //paragraph.AppendBreak(BreakType.LineBreak);
+                    bookmarkNavigator.MoveToBookmark("TGEDKCompanyBBEB99");
+                    IWParagraph paragraph = new WParagraph(document);
+                    paragraph.AppendBreak(BreakType.LineBreak);
 
+                }
+                catch {
+                    foreach (WSection section in document.Sections)
+                    {
+                        IWParagraph p;
 
+                        p = section.HeadersFooters.FirstPageHeader.AddParagraph();
+                        foreach (clsDocValue dv in docdata.DocValues)
+                        {
+                            if (dv.TMBeginn.ToString() == "TGEDKCompanyBBEB99")
+                            {
+                                p.AppendText(dv.Value);
+                            }
+                        }
+                        p.AppendBookmarkStart("TGEDKCompanyBBEB99");
+                        p.AppendBreak(BreakType.LineBreak);
+                    }
+                }
             }
             if (img_faktura != "")
             {

DOCGEN/obj/Debug/DOCGEN.csproj.FileListAbsolute.txt

@@ -66,6 +66,7 @@ X:\docdemo\EDOKA_2024\DOCGEN\bin\Debug\EDOKA_Barcode.dll
 X:\docdemo\EDOKA_2024\DOCGEN\bin\Debug\BarcodeStandard.dll
 X:\docdemo\EDOKA_2024\DOCGEN\bin\Debug\EDOKA_Barcode.pdb
 X:\docdemo\EDOKA_2024\DOCGEN\bin\Debug\EDOKA_Barcode.dll.config
+E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\Syncfusion.XlsIO.Base.xml
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DocGen.csproj.AssemblyReference.cache
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DocGen.csproj.CoreCompileInputs.cache
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\libSkiaSharp.dylib
@@ -129,7 +130,6 @@ E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\Syncfusion.ExcelToPdfConverter
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\Syncfusion.OfficeChart.Base.xml
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\Syncfusion.Pdf.Base.xml
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\Syncfusion.Presentation.Base.xml
-E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\Syncfusion.XlsIO.Base.xml
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\System.Buffers.xml
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\System.Memory.xml
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\System.Numerics.Vectors.xml

Database/db.cs

@@ -883,7 +883,7 @@ namespace Database
             }
         }
 
-        public bool Dok_in_Bearbeietung(int typ, string dokumentid, int mitarbeiter)
+        public bool Dok_in_Bearbeitung(int typ, string dokumentid, int mitarbeiter)
         {
             switch (typ)
             {
@@ -1724,28 +1724,38 @@ namespace Database
                 }
                 daten.Tables[0].Rows.Add(nr);
             }
+            Update_Data();
+            Get_Tabledata_for_Update("Select * from EDKB09_" + sb.serienbriefnr.ToString() + " where inteintragnr=-1", false, true);
 
             foreach (System.Data.DataRow dr in ndt.Rows)
             {
-
+                DataRow nrow = daten.Tables[0].NewRow();
-                string s = "insert into edkb09_" + sb.serienbriefnr.ToString();
-                s = s + "(";
                 foreach (System.Data.DataColumn col in ndt.Columns)
                 {
-                    s = s + "[" + col.ColumnName.ToString() + "],";
+                    nrow[col.ColumnName.ToString()] = dr[col.ColumnName.ToString()];
-                }
-                s = s.Substring(0, s.Length - 1);
-                s = s + ") values (";
-                foreach (System.Data.DataColumn col in ndt.Columns)
-                {
-                    s = s + "'" + dr[col.ColumnName].ToString() + "',";
-                }
-                s = s.Substring(0, s.Length - 1);
-                s = s + ")";
-
-                Exec_SQL(s);
 
                 }
+            }
+            Update_Data();
+
+            //    string s = "insert into edkb09_" + sb.serienbriefnr.ToString();
+            //    s = s + "(";
+            //    foreach (System.Data.DataColumn col in ndt.Columns)
+            //    {
+            //        s = s + "[" + col.ColumnName.ToString() + "],";
+            //    }
+            //    s = s.Substring(0, s.Length - 1);
+            //    s = s + ") values (";
+            //    foreach (System.Data.DataColumn col in ndt.Columns)
+            //    {
+            //        s = s + "'" + dr[col.ColumnName].ToString() + "',";
+            //    }
+            //    s = s.Substring(0, s.Length - 1);
+            //    s = s + ")";
+
+            //    Exec_SQL(s);
+
+            //}
             return;
 
             //var connection = new SqlConnection();

DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-c8a90e57c085ddd4f891eadf36ff7c6cc6c16732a03d79813263c8d6eaa41f44
+0b751f06f028e3d390f6c2033c9311ee419ed5a435c1a009b1fa660a7e6b1d25

Excel_Test/bin/Debug/DOCGEN.dll.config

@@ -16,7 +16,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Syncfusion.Licensing" publicKeyToken="632609b4d040f6b4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-28.1462.35.0" newVersion="28.1462.35.0" />
+        <bindingRedirect oldVersion="0.0.0.0-28.1462.33.0" newVersion="28.1462.33.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -30,6 +30,14 @@
         <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Syncfusion.Pdf.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-28.1462.35.0" newVersion="28.1462.35.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Syncfusion.XlsIO.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-28.1462.35.0" newVersion="28.1462.35.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>

Excel_Test/bin/Debug/Syncfusion.DocIO.Base.xml

@@ -20901,14 +20901,13 @@
             <param name="columnsUsesPrefWidth">List containing index of preferred width based columns</param>
             <param name="calculatedColumnWidth">List containing calculated column width</param>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsResizeColumnsBasedOnTextWrap(Syncfusion.DocIO.DLS.WTable,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Single,System.Boolean,System.Collections.Generic.List{System.Single}@)">
+        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsResizeColumnsBasedOnTextWrap(Syncfusion.DocIO.DLS.WTable,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Single,System.Collections.Generic.List{System.Single}@)">
             <summary>
             Checks whether any cell has disabled TextWrap and calculates cell width based on cell maximum para width
             </summary>
             <param name="table">Current table</param>
             <param name="columns">Table columns(grid)</param>
             <param name="tableWidth">Table width</param>
-            <param name="isTableHasMergeCells">Boolean to check whether table has merge cells or not.</param>
             <param name="calculatedColumnWidth">List containing calculated column width</param>
             <returns></returns>
         </member>
@@ -20950,7 +20949,7 @@
             <param name="clientWidth">Table client width</param>
             <returns></returns>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsPointTableResizeColBasedOnCellPrefWidth(Syncfusion.DocIO.DLS.WTable,System.Int32,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Collections.Generic.List{System.Single}@,System.Single@,System.Single,System.Boolean)">
+        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsPointTableResizeColBasedOnCellPrefWidth(Syncfusion.DocIO.DLS.WTable,System.Int32,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Collections.Generic.List{System.Single}@,System.Single@,System.Single)">
             <summary>
             Check whether the point width table need to be resized according to the cell preferred width
             </summary>
@@ -20960,7 +20959,6 @@
             <param name="calculatedColumnWidth">List containing calculated column width</param>
             <param name="totalCellPreferredWidth">Total cell preferred width</param>
             <param name="tableWidth">Table width</param>
-            <param name="isTableHasMergeCells">Boolean to check whether table has merge cells or not.</param>
             <returns>True, if the point width table is need to resized according to the calculated column width</returns>
         </member>
         <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.CheckPreferredWidth(System.Collections.Generic.List{System.Single}@,Syncfusion.DocIO.DLS.WTable,System.Single@,System.Int32,System.Single,Syncfusion.DocIO.DLS.WTableColumnCollection)">
@@ -20986,7 +20984,7 @@
             <returns>True, if the table needs to resize as per maximum word width
             of the table even though if table exceeds the table width else false</returns>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsAutoTableResizeColumnsBasedOnCellPctPrefWidth(Syncfusion.DocIO.DLS.WTable,System.Collections.Generic.List{System.Int32}@,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Single,System.Int32,System.Boolean)">
+        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsAutoTableResizeColumnsBasedOnCellPctPrefWidth(Syncfusion.DocIO.DLS.WTable,System.Collections.Generic.List{System.Int32}@,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Single,System.Int32)">
             <summary>
             Check whether the auto table need to resize as per percentage cell preferred width
             </summary>
@@ -20994,7 +20992,6 @@
             <param name="pctCellWidthRowIndexes">Row index containing the preferred cell width as percentage</param>
             <param name="columns">Table columns</param>
             <param name="clientWidth">Table owner width</param>
-            <param name="isTableHasMergeCells">Boolean to check whether table has merge cells or not.</param>
             <returns>True, if the table needs to resize as per percentage cell preferred width; else, false</returns>
         </member>
         <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.GetPctCellPrefWidthRowIndexes(Syncfusion.DocIO.DLS.WTable,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Single)">
@@ -21015,7 +21012,7 @@
             <param name="table">Current table</param>
             <param name="clientWidth">Table owner width</param>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsResizeColumnBasedOnCellPreferredWidth(Syncfusion.DocIO.DLS.WTable,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Single,System.Single@,System.Collections.Generic.List{System.Single}@,System.Int32,System.Single,System.Boolean)">
+        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsResizeColumnBasedOnCellPreferredWidth(Syncfusion.DocIO.DLS.WTable,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Single,System.Single@,System.Collections.Generic.List{System.Single}@,System.Int32,System.Single)">
             <summary>
             Check whether the table need to be resized according to the cell preferred width
             </summary>
@@ -21025,7 +21022,6 @@
             <param name="totalCellPreferredWidth">Total cell preferred width</param>
             <param name="calculatedColumnWidth">List containing calculated column width</param>
             <param name="maxCellCount">Maximum cell count in the table</param>
-            <param name="isTableHasMergeCells">Boolean to check whether table has merge cells or not.</param>
             <returns>True, if table is need to resized according to the calculated column width</returns>
         </member>
         <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsEnoughCalculatedWidth(Syncfusion.DocIO.DLS.WTableColumnCollection,System.Collections.Generic.List{System.Single},System.Single,System.Single)">
@@ -21090,7 +21086,7 @@
             </summary>
             <param name="columns">table columns</param>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.ChecksNestedTableNeedToRecalculate(Syncfusion.DocIO.DLS.WTable,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Single,System.Single,System.Single,System.Boolean)">
+        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.ChecksNestedTableNeedToRecalculate(Syncfusion.DocIO.DLS.WTable,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Single,System.Single,System.Single)">
             <summary>
             Checks whether the nested table need to recalculate or not
             </summary>
@@ -21099,7 +21095,6 @@
             <param name="clientWidth">The nested table client width</param>
             <param name="totalColumnWidth">The total column width of the nested table.</param>
             <param name="tableWidth">The nested table width.</param>
-            <param name="isNestedTableHasMergeCells">Boolean to check whether nested table has merge cells or not.</param>
         </member>
         <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsNestedTableShrinkToClientWidth(Syncfusion.DocIO.DLS.WTable,Syncfusion.DocIO.DLS.WTable,System.Single,System.Single)">
             <summary>
@@ -21128,17 +21123,16 @@
             <param name="columns">Current table columns</param>
             <returns>True, if column not has enough width to store maximum word width else false.</returns>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsAutoTableUsesCellPointPrefWidth(Syncfusion.DocIO.DLS.WTable,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Single,System.Single@,System.Collections.Generic.List{System.Single}@,System.Int32,System.Boolean)">
+        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsAutoTableUsesCellPointPrefWidth(Syncfusion.DocIO.DLS.WTable,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Single,System.Single@,System.Collections.Generic.List{System.Single}@,System.Int32)">
             <summary>
             Check the whether table width is auto and it uses the cell preferred width.
             </summary>
-            <param name="table">Current table.</param>
+            <param name="table"></param>
-            <param name="columns">The Tablegrid.</param>
+            <param name="columns"></param>
-            <param name="clientWidth">The client width.</param>
+            <param name="clientWidth"></param>
-            <param name="totalCellPreferredWidth">Sum of cell preferred width</param>
+            <param name="totalCellPreferredWidth"></param>
-            <param name="calculatedColumnWidth">List containing calculated widths.</param>
+            <param name="calculatedColumnWidth"></param>
-            <param name="maxCellCount">Maximum Cell count.</param>
+            <param name="maxCellCount"></param>
-            <param name="isTableHasMergeCells">Boolean to check whether table has merge cells or not.</param>
             <returns></returns>
         </member>
         <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsCalculatedWidthEnoughForMaxWordWidth(System.Collections.Generic.List{System.Single},Syncfusion.DocIO.DLS.WTableColumnCollection)">
@@ -21158,35 +21152,31 @@
             <param name="totalCellPrefWidth">Total maximum cell preferred width</param>
             <returns>List of maximum preferred width for each column </returns>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsAutoTableUsesNestedTableWidth(Syncfusion.DocIO.DLS.WTable,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Int32,System.Boolean)">
+        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsAutoTableUsesNestedTableWidth(Syncfusion.DocIO.DLS.WTable,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Int32)">
             <summary>
             Check whether the auto table uses its nested table width
             </summary>
             <param name="table">Current table</param>
             <param name="columns">Table columns</param>
             <param name="maxCellCount">Maximum cell count</param>
-            <param name="isTableHasMergeCells">Boolean to check whether table has merge cells or not.</param>
             <returns>True, if the auto table uses its nested table width; else, false</returns>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsAutoTableUsesCellPrefWidth(Syncfusion.DocIO.DLS.WTable,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Single,System.Single,System.Boolean)">
+        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsAutoTableUsesCellPrefWidth(Syncfusion.DocIO.DLS.WTable,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Single,System.Single)">
             <summary>
             Check whether the table should use the cell preferred width
             </summary>
             <param name="table">Outermost table</param>
             <param name="columns">Table columns</param>
-            <param name="maxCellCount">Maximum cell count</param>
+            <param name="tableMaxCellCount">Maximum cell count</param>
-            <param name="clientWidth">The client width.</param>
-            <param name="isTableHasMergeCells">Boolean to check whether table has merge cells or not.</param>
             <returns>True, if the table should use the cell preferred width; else, false</returns>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsNestedTableUsesOwnerWidth(Syncfusion.DocIO.DLS.WTable,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Int32,System.Boolean)">
+        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsNestedTableUsesOwnerWidth(Syncfusion.DocIO.DLS.WTable,Syncfusion.DocIO.DLS.WTableColumnCollection,System.Int32)">
             <summary>
             Check whether the nested table should use owner width
             </summary>
             <param name="table">Current table</param>
             <param name="columns">Table columns</param>
             <param name="maxCellCount">Maximum cell count</param>
-            <param name="isTableHasMergeCells">Boolean to check whether table has merge cells or not.</param>
             <returns>True, if the nested table should use owner width; else, false</returns>
         </member>
         <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.HasLeftorRightPadding(Syncfusion.DocIO.DLS.WTableCell)">
@@ -21261,7 +21251,7 @@
             Validate and update the preferredwidth of the cells for column spanned cells.
             </summary>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsResizeColumnWidthBasedOnMaximumParaWidth(Syncfusion.DocIO.DLS.WTable,System.Single,System.Single,System.Single,System.Single,System.Boolean)">
+        <member name="M:Syncfusion.DocIO.DLS.WTableColumnCollection.IsResizeColumnWidthBasedOnMaximumParaWidth(Syncfusion.DocIO.DLS.WTable,System.Single,System.Single,System.Single,System.Single)">
             <summary>
             Checks whether to resize the column based on the cell maximum para width 
             </summary>
@@ -26934,13 +26924,6 @@
             Adds the new paragraph.
             </summary>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.HTMLConverterImpl.IsValidPTag(Syncfusion.DocIO.DLS.HtmlNode)">
-            <summary>
-            Checks if the specified node has a matching uncreated parent node for any of the specified HTML tags.
-            </summary>
-            <param name="node">The node to check for matching parent nodes.</param>
-            <returns></returns>
-        </member>
         <member name="M:Syncfusion.DocIO.DLS.HTMLConverterImpl.NodeIsInDiv(Syncfusion.DocIO.DLS.HtmlNode)">
             <summary>
             Determine whether the Node is in Div
@@ -32862,14 +32845,11 @@
             Update the main document path
             </summary>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.Convertors.DocxParser.GetPathByContentType(System.String,Syncfusion.DocIO.DLS.Package,System.Boolean)">
+        <member name="M:Syncfusion.DocIO.DLS.Convertors.DocxParser.GetPathByContentType(System.String,Syncfusion.DocIO.DLS.Package)">
             <summary>
             Get the path by its content type
             </summary>
-            <param name="contentType">Content type value of an xml file</param>
+            <param name="document">The extension.</param>
-            <param name="wordPackage">Document package</param>
-            <param name="skipGlossary">Boolean to decide whether glossary document need to skip or not</param>
-            <returns>Return the xml file name based on contenttype</returns>
         </member>
         <member name="M:Syncfusion.DocIO.DLS.Convertors.DocxParser.GetExtensionContentType(System.String)">
             <summary>
@@ -32889,20 +32869,12 @@
             </summary>
             <param name="document">The document.</param>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.Convertors.DocxParser.ParseDocument(Syncfusion.DocIO.DLS.Package,System.Boolean)">
+        <member name="M:Syncfusion.DocIO.DLS.Convertors.DocxParser.ParseDocument(Syncfusion.DocIO.DLS.Package)">
             <summary>
             Parse the document and its relations
             </summary>
             <param name="wordPackage"></param>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.Convertors.DocxParser.GetSettingsPath(Syncfusion.DocIO.DLS.Package,System.Boolean)">
-            <summary>
-            Gets the settings XML file name
-            </summary>
-            <param name="wordPackage">Document package</param>
-            <param name="isFlatOPC">Boolean to decide whether it is WordML fiel or not</param>
-            <returns>Return the settings XML file name if content type name and document relations name is same else null</returns>
-        </member>
         <member name="M:Syncfusion.DocIO.DLS.Convertors.DocxParser.RemoveInvalidCustomXML(Syncfusion.DocIO.DLS.PartContainer)">
             <summary>
             Check and Filters the Xml parts.
@@ -62219,7 +62191,7 @@
                 IWParagraph paragraph = section.HeadersFooters.Footer.AddParagraph();
                 paragraph.ParagraphFormat.Tabs.AddTab(523f, TabJustification.Right, Syncfusion.DocIO.DLS.TabLeader.NoLeader);
                 //Add text for the footer paragraph
-                paragraph.AppendText("Copyright Northwind Inc. 2001 - 2015");
+                paragraph.AppendText("Copyright Northwind Inc. 2001 - 2024");
                 //Add page number field to the document
                 paragraph.AppendText("\tPage ");
                 paragraph.AppendField("Page", FieldType.FieldPage);
@@ -62270,7 +62242,7 @@
                 Dim paragraph As IWParagraph = section.HeadersFooters.Footer.AddParagraph()
                 paragraph.ParagraphFormat.Tabs.AddTab(523F, TabJustification.Right, Syncfusion.DocIO.DLS.TabLeader.NoLeader)
                 'Add text for the footer paragraph
-                paragraph.AppendText("Copyright Northwind Inc. 2001 - 2015")
+                paragraph.AppendText("Copyright Northwind Inc. 2001 - 2024")
                 'Add page number field to the document
                 paragraph.AppendText(vbTab &amp; "Page ")
                 paragraph.AppendField("Page", FieldType.FieldPage)
@@ -65066,12 +65038,6 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WParagraph.IsEmptyTextRangeAdded">
-            <summary>
-            Determines whether the last item is empty text range or not
-            </summary>
-            <returns></returns>
-        </member>
         <member name="M:Syncfusion.DocIO.DLS.WParagraph.IsContainDinOffcFont">
             <summary>
             Determine whether the paragraph contains DIN Offc font text. 
@@ -69709,7 +69675,15 @@
             </summary>
             <value><b>True</b> if this paragraph is in cell; otherwise, <b>false</b>.</value>
         </member>
-        <!-- Badly formed XML comment ignored for member "P:Syncfusion.DocIO.DLS.WParagraph.IsCreatedWithPTag" -->
+        <member name="P:Syncfusion.DocIO.DLS.WParagraph.HasParRTFTag">
+            <summary>
+            Gets or sets a value indicating whether this paragraph contains "\par" RTF tag. 
+            </summary>
+            <value>if this paragraph contains "\par" RTF tag, set to <c>true</c>.</value>
+            <Remarks>
+            It's presence in last paragraph of the RTF from clipboard means that the copied content includes the last paragraph mark and its formatting should be copied in the pasted document. Also, the last paragraph should be preserved as separate paragraph and should not be merged in cursor position.
+            </Remarks>
+        </member>
         <member name="P:Syncfusion.DocIO.DLS.WParagraph.IsEndOfSection">
             <summary>
             Gets a value indicating whether the current paragraph is end of the section. Read-only.
@@ -69810,6 +69784,15 @@
             <c>true</c> if HTML is appending in this paragraph; otherwise, <c>false</c>.
             </value>
         </member>
+        <member name="P:Syncfusion.DocIO.DLS.WParagraph.IsCreatedUsingHtmlSpanTag">
+            <summary>
+            Gets or sets a value indicating whether the Paragraph created using span tag in HTML.
+            </summary>
+            <value>
+            <c>true</c> if the paragraph is created using span tag in HTML; otherwise, <c>false</c>.
+            </value>
+            <remarks> This property is implemented for document editor internal use only.</remarks>
+        </member>
         <member name="P:Syncfusion.DocIO.DLS.WParagraph.InternalText">
             <summary>
             Get or set the internal text property
@@ -73780,14 +73763,13 @@
             <param name="maxCellPrefWidth">The maximum cell preferred width list.</param>
             <returns>True if the the table grid update based on maximum cell preferred width else False.</returns>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTable.IsGridUpdateBasedOnMaxPrefWidthPoint(System.Single,System.Single@,System.Collections.Generic.List{System.Single}@,System.Boolean)">
+        <member name="M:Syncfusion.DocIO.DLS.WTable.IsGridUpdateBasedOnMaxPrefWidthPoint(System.Single,System.Single@,System.Collections.Generic.List{System.Single}@)">
             <summary>
             Checks whether the table grid should update based on maximum cell preferred width in point.
             </summary>
             <param name="tableWidth">The table width.</param>
             <param name="totalMaxCellPrefWidth">The sum of maximum cell preferred width.</param>
             <param name="maxCellPrefWidth">The maximum cell preferred width list.</param>
-            <param name="isTableHasMergeCells">Boolean to check whether table has merge cells or not.</param>
             <returns>True if the the table grid update based on maximum cell preferred width in point, else False.</returns>
         </member>
         <member name="M:Syncfusion.DocIO.DLS.WTable.UpdateMaxPrefWidthBasedOnTableWidth(System.Single,System.Single@,System.Collections.Generic.List{System.Single}@)">
@@ -73855,7 +73837,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTable.IsNeedToMergeTwoTables(System.Boolean,System.Int32)">
+        <member name="M:Syncfusion.DocIO.DLS.WTable.IsNeedToMergeTwoTables">
             <summary>
             Check whether the neighbour tables need to merge
             </summary>
@@ -73884,7 +73866,7 @@
             </summary>
             <returns>True, If the preferred width of the column is not defined. Else returns false</returns>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTable.CheckIsNeedToSkipGridValue(System.Single,System.Boolean,System.Single,System.Boolean)">
+        <member name="M:Syncfusion.DocIO.DLS.WTable.CheckIsNeedToSkipGridValue(System.Single,System.Boolean,System.Single)">
             <summary>
             Checks whether we need to skip the grid value or not based on cell preferred width and maximumWordWidth.
             </summary>
@@ -73897,7 +73879,7 @@
             <param name="isNeedToConsidervMerge">True, if the verical merge is need to consider; else false</param>
             <returns>True, If the table have merge columns either vertically or horizontally or having cellspan. Else returns false</returns>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTable.IsAutoTableSkipTableGrid(System.Boolean)">
+        <member name="M:Syncfusion.DocIO.DLS.WTable.IsAutoTableSkipTableGrid">
             <summary>
             Checks whether the auto table is need to skip the table grid.
             </summary>
@@ -73950,7 +73932,7 @@
             <param name="cell">The cell.</param>
             <returns></returns>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTable.SetNewWidthToCells(System.Boolean,System.Int32)">
+        <member name="M:Syncfusion.DocIO.DLS.WTable.SetNewWidthToCells(System.Boolean)">
             <summary>
             Set the column to each cells.
             </summary>
@@ -73961,7 +73943,7 @@
             </summary>
             <returns>Maximum nested table width from last column</returns>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTable.SetNewWidthToNestedTableCells(System.Int32,System.Boolean)">
+        <member name="M:Syncfusion.DocIO.DLS.WTable.SetNewWidthToNestedTableCells">
             <summary>
             Sets the width to nested table cells
             </summary>
@@ -74008,7 +73990,7 @@
             <param name="tableWidth">Table Width</param>
             <returns>True if columns doesn't have enough width to store max word width. Otherwise False</returns>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTable.IsTableBasedOnContent(Syncfusion.DocIO.DLS.WTable,System.Int32,System.Boolean)">
+        <member name="M:Syncfusion.DocIO.DLS.WTable.IsTableBasedOnContent(Syncfusion.DocIO.DLS.WTable)">
             <summary>
             Checks whether the cell width need to assign base on content
             </summary>
@@ -74139,7 +74121,7 @@
             <param name="tableWidth">Width of the table.</param>
             <returns></returns>
         </member>
-        <member name="M:Syncfusion.DocIO.DLS.WTable.GetCellWidth(Syncfusion.DocIO.DLS.WTableCell,System.Single,System.Single,System.Single,System.Single,System.Boolean,System.Boolean,System.Int32,System.Boolean,System.Collections.Generic.List{System.Single},System.Single)">
+        <member name="M:Syncfusion.DocIO.DLS.WTable.GetCellWidth(Syncfusion.DocIO.DLS.WTableCell,System.Single,System.Single,System.Single,System.Single,System.Boolean,System.Boolean,System.Int32)">
             <summary>
             Gets the width of the cell.
             </summary>
@@ -74150,9 +74132,6 @@
             <param name="maxRowWidth">Width of the max row.</param>
             <param name="isTableGridMissMatch">if set to <c>true</c> [is table grid miss match].</param>
             <param name="isRowHasDefinedCells">True if the table has any one row having all cells have defined cell widths; else false</param>
-            <param name="maxPrefCellWidthOfColumns">List containing maximum preferred width in columns.</param>
-            <param name="hasMergeCellsInTable">Boolean to check whether table has merge cells or not.</param>
-            <param name="totalCellPreferredWidth">Summation of cells preferred width.</param>
             <returns></returns>
         </member>
         <member name="M:Syncfusion.DocIO.DLS.WTable.GetMaxPrefCellWidthOfColumns(System.Single@,System.Int32)">
@@ -104294,14 +104273,6 @@
             <param name="bookmarkName">The bookmark name.</param>
             <param name="isTargetNull">The target is nothing.</param>
         </member>
-        <member name="M:Syncfusion.DocIO.Rendering.DrawingContext.IsHyperlinkNeedToBeCreated(System.String,System.Drawing.RectangleF,System.Drawing.RectangleF)">
-            <summary>
-            Determines whether a new hyperlink needs to be created.
-            </summary>
-            <param name="bookmarkName"></param>
-            <param name="existingSourceBounds"></param>
-            <param name="currBounds"></param>
-        </member>
         <member name="M:Syncfusion.DocIO.Rendering.DrawingContext.CreateAndAddLinkToBookmark(System.Drawing.RectangleF,System.String,System.Boolean)">
             <summary>
             Creates bookmark hyperlink and add into list.

Excel_Test/bin/Debug/Syncfusion.DocToPDFConverter.Base.xml

@@ -4269,14 +4269,6 @@
             <param name="bookmarkName">The bookmark name.</param>
             <param name="isTargetNull">The target is nothing.</param>
         </member>
-        <member name="M:Syncfusion.DocToPdfConverter.Rendering.PDFDrawingContext.IsHyperlinkNeedToBeCreated(System.String,System.Drawing.RectangleF,System.Drawing.RectangleF)">
-            <summary>
-            Determines whether a new hyperlink needs to be created.
-            </summary>
-            <param name="bookmarkName"></param>
-            <param name="existingSourceBounds"></param>
-            <param name="currBounds"></param>
-        </member>
         <member name="M:Syncfusion.DocToPdfConverter.Rendering.PDFDrawingContext.CreateAndAddLinkToBookmark(System.Drawing.RectangleF,System.String,System.Boolean)">
             <summary>
             Creates bookmark hyperlink and add into list.

Excel_Test/bin/Debug/Syncfusion.XlsIO.Base.xml

@@ -158067,11 +158067,6 @@
             Extended view fields record.
             </summary>
         </member>
-        <member name="F:Syncfusion.XlsIO.Implementation.PivotTables.PivotDataField.m_nameModified">
-            <summary>
-            Represents the datafield name is modified.
-            </summary>
-        </member>
         <member name="M:Syncfusion.XlsIO.Implementation.PivotTables.PivotDataField.#ctor(System.String,Syncfusion.XlsIO.PivotSubtotalTypes,Syncfusion.XlsIO.Implementation.PivotTables.PivotFieldImpl)">
             <summary>
             Initializes a new instance of the data field.
@@ -158134,11 +158129,6 @@
             Gets or sets name of the data field.
             </summary>
         </member>
-        <member name="P:Syncfusion.XlsIO.Implementation.PivotTables.PivotDataField.NameModified">
-            <summary>
-            Represents the datafield name is modified.
-            </summary>
-        </member>
         <member name="P:Syncfusion.XlsIO.Implementation.PivotTables.PivotDataField.Subtotal">
             <summary>
             Gets or sets the subtotal function used for data field.
@@ -218014,11 +218004,6 @@
             Collection of regex pattern and their hyperlink type.
             </summary>
         </member>
-        <member name="F:Syncfusion.XlsIO.Implementation.WorksheetImpl.m_isSorting">
-            <summary>
-            Represents if it is sorting.
-            </summary>
-        </member>
         <member name="F:Syncfusion.XlsIO.Implementation.WorksheetImpl.m_slicers">
             <summary>
             Represents the slicers in the worksheet.
@@ -222138,13 +222123,6 @@
             <param name="iColumnIndex">One-based column index.</param>
             <param name="value">Width to set.</param>
         </member>
-        <member name="M:Syncfusion.XlsIO.Implementation.WorksheetImpl.SetColumnWidthInPixels(System.Int32,System.Double)">
-            <summary>
-            Sets column width in pixels as double value for the specified column.
-            </summary>
-            <param name="iColumn">One-based column index.</param>
-            <param name="value">Width in double to set.</param>
-        </member>
         <member name="M:Syncfusion.XlsIO.Implementation.WorksheetImpl.SetColumnWidthInPixels(System.Int32,System.Int32)">
             <summary>
             Sets column width in pixels for the specified column.
@@ -223466,11 +223444,6 @@
             Indicates whether subtotal applied worksheet contains array separated formula.
             </summary>
         </member>
-        <member name="P:Syncfusion.XlsIO.Implementation.WorksheetImpl.IsSorting">
-            <summary>
-            Gets or sets a value indicating if it is sorting or not, Default is false.
-            </summary>
-        </member>
         <member name="P:Syncfusion.XlsIO.Implementation.WorksheetImpl.RecordsCells">
             <summary>
             The dictionary holds a records objects, representing each cell.