Update 20241118

DOCGEN/DocGen.csproj

@@ -138,6 +138,10 @@
       <Project>{a1fd0973-89a7-4588-877d-373835d6e00c}</Project>
       <Name>Model</Name>
     </ProjectReference>
+    <ProjectReference Include="..\OnDocOffice\OnDocOffice.csproj">
+      <Project>{ff8f7808-3af7-467c-947b-d8d3c6bf7bd7}</Project>
+      <Name>OnDocOffice</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />

DOCGEN/Klassen/DocGenerator_from_EDOKA.cs

@@ -11,6 +11,7 @@ using Model;
 using System.Diagnostics;
 using NLog;
 using System.Security.Policy;
+using OfficePrinter;
 
 namespace DOCGEN.Generator
 {
@@ -42,7 +43,7 @@ namespace DOCGEN.Generator
             this.tempdir = tempdir;
         }
 
-        public clsdok Generate_Doc_EDOKA(string dokumentid, ref clsDocData docdata )
+        public clsdok Generate_Doc_EDOKA(string dokumentid, ref clsDocData docdata, bool useoffice = false )
         {
             DB db = new DB(connectionstring);
             DataTable dt = new DataTable();
@@ -59,7 +60,14 @@ namespace DOCGEN.Generator
                     SyncFWord sfword = new SyncFWord();
                     generate_docdata(dokumentid, ref docdata);
                     clsdok dok = new clsdok("", "", "");
-                    dok.dokument= sfword.Generate_Word(dt.Rows[0][0].ToString(), docdata);
+                    if (useoffice == false) { 
+                        dok.dokument = sfword.Generate_Word(dt.Rows[0][0].ToString(), docdata); 
+                    } else
+                    {
+                        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);
+                    }
+
                     dok.doktype = "D";
                     dok.extension = dt2.Rows[0][1].ToString();
                     //if (dok.extension.ToUpper()=="DOTM") { dok.extension = "docm"; }

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

@@ -132,3 +132,5 @@ E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\FastReport.xml
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DocGen.csproj.Up2Date
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DOCGEN.dll
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DOCGEN.pdb
+E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\OnDocOffice.dll
+E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\OnDocOffice.pdb

DOCGEN/obj/Debug/DocGen.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-0a239b9ab18e54ef74fccb23ad3fd662228282573aa6dcf292e80f21c2df4095
+4da3193ff40a54fa181ed15ea9573eaab157bd10f4799f82d43d0e49007a526c