update 0250704

OnDocOffice/clsoffice.cs

@@ -1658,8 +1658,12 @@ namespace OnDocOffice
 
     public class word_signature
     {
-
+        
         private string ConnectionString = "";
+        public  string MachinName { get; set; } = "";
+        public  bool O365 { get; set; } = false;
+
+        
 
         public word_signature(string connectionstring)
         {
@@ -1673,11 +1677,12 @@ namespace OnDocOffice
             Logging.Logging.Debug("Sign_Doc", "OnDoc", dokumentid);
             docWord = word.ActiveDocument;
             this.word = word;
-
+            
             DB db = new DB(this.ConnectionString);
             db.clear_parameter();
             db.add_parameter("@dokumenttypnr",dokumenttypnr.ToString());
             db.add_parameter("@officeversion", "2016");
+            db.add_parameter("@machinname", System.Environment.MachineName);
             db.Get_Tabledata("sp_signatureposition", true,false);
             System.Data.DataTable position = db.dsdaten.Tables[0];
             db = null;
@@ -1698,8 +1703,10 @@ namespace OnDocOffice
                 List<string> list = new List<string>();
                 foreach (Microsoft.Office.Interop.Word.Bookmark bm in docWord.Bookmarks)
                 {
-                    if (bm.Name.Contains("VornameNameLinks") || bm.Name.Contains("UnterschriftLinks") || bm.Name == "TGEDKVornameNameL") { list.Add(bm.Name); }
-                    if (bm.Name.Contains("VornameNameRechts") || bm.Name.Contains("UnterschriftRechts") || bm.Name == "TGEDKVornameNameR") { list.Add(bm.Name); }
+                    if (bm.Name.Contains("VornameNameLinks") || bm.Name.Contains("UnterschriftLinks") || bm.Name == "TGEDKVornameNameL") { 
+                        list.Add(bm.Name); }
+                    if (bm.Name.Contains("VornameNameRechts") || bm.Name.Contains("UnterschriftRechts") || bm.Name == "TGEDKVornameNameR") { 
+                        list.Add(bm.Name); }
 
                 }
                 list.Sort();
@@ -1762,8 +1769,13 @@ namespace OnDocOffice
 
         public void insert_unterschrift(string bookmark, string imagepath, int l, int t, int w, int h, int type)
         {
-            if (imagepath == "") return;
 
+            object What = Microsoft.Office.Interop.Word.WdGoToItem.wdGoToBookmark;
+            object oMissing = System.Reflection.Missing.Value;
+            word.Selection.GoTo(What, oMissing, oMissing, bookmark);
+
+            if (imagepath == "") return;
+            
             object missing = Type.Missing;
             if (type == 1)
             {
@@ -1777,7 +1789,11 @@ namespace OnDocOffice
                 //myShape1.Top = myShape1.Top - myShape1.Height;
                 myShape1.Top = myShape1.Top + t;
                 myShape1.Left = myShape1.Left + l;
-                myShape1.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapBehind;
+//                myShape1.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapBehind;
+                myShape1.Name = "Unterschrift_" + bookmark;
+              
+                myShape1.LockAspectRatio = Microsoft.Office.Core.MsoTriState.msoTrue;
+                //myShape1.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapBehind;
             }
             if (type == 2)
             {
@@ -1790,7 +1806,8 @@ namespace OnDocOffice
                 docWord.Activate();
                 bm.Range.GoTo();
                 bm.Select();
-
+                Thread.Sleep(500);
+                System.Windows.Forms.Application.DoEvents();
                 Microsoft.Office.Interop.Word.Shape myShape = docWord.Shapes.AddPicture(imagepath, false, true, 0, 0, 120, 50, missing);
                 myShape.RelativeHorizontalPosition = Microsoft.Office.Interop.Word.WdRelativeHorizontalPosition.wdRelativeHorizontalPositionPage;
                 myShape.RelativeVerticalPosition = Microsoft.Office.Interop.Word.WdRelativeVerticalPosition.wdRelativeVerticalPositionPage;
@@ -1803,6 +1820,36 @@ namespace OnDocOffice
                 myShape.LockAspectRatio = Microsoft.Office.Core.MsoTriState.msoTrue;
                 myShape.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapBehind;
             }
+            if (type == 3)
+            {
+              
+                Microsoft.Office.Interop.Word.Range myRange = docWord.Bookmarks[bookmark].Range;
+
+                Microsoft.Office.Interop.Word.Bookmark bm = docWord.Bookmarks[bookmark];
+
+                float vertical = bm.Range.Information[Microsoft.Office.Interop.Word.WdInformation.wdVerticalPositionRelativeToPage];
+                float horizontal = bm.Range.Information[Microsoft.Office.Interop.Word.WdInformation.wdHorizontalPositionRelativeToPage];
+                vertical = vertical - 50;
+                vertical = 0;
+                horizontal = 0;
+                vertical = vertical + t;
+                horizontal  = horizontal + l;
+                Thread.Sleep(10);
+                Microsoft.Office.Interop.Word.Shape myshape = docWord.Shapes.AddTextbox(Microsoft.Office.Core
+                .MsoTextOrientation.msoTextOrientationHorizontal, (float)horizontal,
+                (float)vertical, 120, 50, missing);
+                Thread.Sleep(10);
+                myshape.Name = "Unterschrift" + "_" + bookmark;
+                myshape.TextFrame.ContainingRange.Borders.OutsideLineStyle = WdLineStyle.wdLineStyleNone;
+                myshape.TextFrame.ContainingRange.Borders.InsideLineStyle = WdLineStyle.wdLineStyleNone;
+                Thread.Sleep(10);
+                myshape.Fill.UserPicture(imagepath);
+                Thread.Sleep(10);
+                myshape.Fill.UserPicture(imagepath);
+                Thread.Sleep(10);
+                //myshape.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapBehind;
+                myshape.Line.Visible = Microsoft.Office.Core.MsoTriState.msoFalse;
+            }
             return;