diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs index 71676dbc..e4f3bbc1 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs @@ -845,7 +845,19 @@ namespace VEPROMS.CSLA.Library // 9.25 is the approximate offset of the base line of the font, i.e. doesn't include descender. float y = (float)sel.get_Information(LBWdInformation.wdVerticalPositionRelativeToTextBoundary) + ((sel.Font.Size * 9.25F) / 12); sel.Text = ""; - LBShape shape = myDoc.Shapes.AddPicture(roImageFile.MyFile.FullName, x, y, sel.Range); + LBShape shape = null; + if (MSWordToPDF.DebugStatus==0 && !roImageFile.MyFile.FullName.ToUpper().EndsWith("GIF")) + { + System.Drawing.Image img = System.Drawing.Image.FromFile(roImageFile.MyFile.FullName); + string newname = Regex.Replace(roImageFile.MyFile.FullName,@"\.[A-Z]+$",".GIF"); + roImageFile.MyGifFile = new FileInfo(newname); + img.Save(newname, ImageFormat.Gif); + shape = myDoc.Shapes.AddPicture(newname, x, y, sel.Range); + } + else + { + shape = myDoc.Shapes.AddPicture(roImageFile.MyFile.FullName, x, y, sel.Range); + } shape.RelativeVerticalPosition = LBWdRelativeVerticalPosition.wdRelativeVerticalPositionMargin; shape.Top = y; // Reset value after setting flag RelativeVerticalPosition shape.RelativeHorizontalPosition = LBWdRelativeHorizontalPosition.wdRelativeHorizontalPositionMargin; diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ROImageExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ROImageExt.cs index 0f0455c0..a6733e82 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ROImageExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ROImageExt.cs @@ -264,6 +264,12 @@ namespace VEPROMS.CSLA.Library { get { return _MyFile; } } + private FileInfo _MyGifFile = null; + public FileInfo MyGifFile + { + get { return _MyGifFile; } + set { _MyGifFile = value; } + } private string _Extension = "TIF"; public string Extension { @@ -281,6 +287,8 @@ namespace VEPROMS.CSLA.Library try { _MyFile.Delete(); + if (_MyGifFile != null) + _MyGifFile.Delete(); } catch (IOException ex) {