diff --git a/ClosedXML/Excel/Drawings/IXLPictures.cs b/ClosedXML/Excel/Drawings/IXLPictures.cs index dd1133d..ff449cd 100644 --- a/ClosedXML/Excel/Drawings/IXLPictures.cs +++ b/ClosedXML/Excel/Drawings/IXLPictures.cs @@ -17,11 +17,10 @@ IXLPicture Add(Stream stream, XLPictureFormat format, String name); -#if _NETFRAMEWORK_ IXLPicture Add(Bitmap bitmap); IXLPicture Add(Bitmap bitmap, String name); -#endif + IXLPicture Add(String imageFile); IXLPicture Add(String imageFile, String name); diff --git a/ClosedXML/Excel/Drawings/XLPictures.cs b/ClosedXML/Excel/Drawings/XLPictures.cs index 79c2030..38cac21 100644 --- a/ClosedXML/Excel/Drawings/XLPictures.cs +++ b/ClosedXML/Excel/Drawings/XLPictures.cs @@ -56,7 +56,6 @@ return picture; } -#if _NETFRAMEWORK_ public IXLPicture Add(Bitmap bitmap) { var picture = new XLPicture(_worksheet, bitmap); @@ -71,7 +70,6 @@ picture.Name = name; return picture; } -#endif public IXLPicture Add(string imageFile) { diff --git a/ClosedXML/Excel/IXLWorksheet.cs b/ClosedXML/Excel/IXLWorksheet.cs index a242d32..b5aecd7 100644 --- a/ClosedXML/Excel/IXLWorksheet.cs +++ b/ClosedXML/Excel/IXLWorksheet.cs @@ -444,11 +444,9 @@ IXLPicture AddPicture(Stream stream, XLPictureFormat format, String name); -#if _NETFRAMEWORK_ IXLPicture AddPicture(Bitmap bitmap); IXLPicture AddPicture(Bitmap bitmap, String name); -#endif IXLPicture AddPicture(String imageFile); diff --git a/ClosedXML/Excel/XLWorksheet.cs b/ClosedXML/Excel/XLWorksheet.cs index b362d68..2f5f028 100644 --- a/ClosedXML/Excel/XLWorksheet.cs +++ b/ClosedXML/Excel/XLWorksheet.cs @@ -1585,7 +1585,6 @@ return Pictures.Add(stream, format, name); } -#if _NETFRAMEWORK_ public IXLPicture AddPicture(Bitmap bitmap) { return Pictures.Add(bitmap); @@ -1595,7 +1594,6 @@ { return Pictures.Add(bitmap, name); } -#endif public IXLPicture AddPicture(string imageFile) { diff --git a/ClosedXML/XLHelper.cs b/ClosedXML/XLHelper.cs index 98bec54..d485d78 100644 --- a/ClosedXML/XLHelper.cs +++ b/ClosedXML/XLHelper.cs @@ -1,12 +1,9 @@ using System; +using System.Drawing; using System.Globalization; using System.Linq; using System.Text.RegularExpressions; -#if _NETFRAMEWORK_ - using System.Drawing; -#endif - namespace ClosedXML.Excel { /// @@ -23,10 +20,8 @@ private const Int32 TwoT26 = 26*26; -#if _NETFRAMEWORK_ internal static readonly Graphics Graphic = Graphics.FromImage(new Bitmap(200, 200)); internal static readonly Double DpiX = Graphic.DpiX; -#endif internal static readonly NumberStyles NumberStyle = NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign | NumberStyles.AllowLeadingWhite | NumberStyles.AllowTrailingWhite | NumberStyles.AllowExponent; internal static readonly CultureInfo ParseCulture = CultureInfo.InvariantCulture; @@ -201,7 +196,6 @@ return range.Contains('-') ? range.Replace('-', ':').Split(':') : range.Split(':'); } -#if _NETFRAMEWORK_ public static Int32 GetPtFromPx(Double px) { return Convert.ToInt32(px * 72.0 / DpiX); @@ -211,7 +205,6 @@ { return Convert.ToDouble(pt) * DpiX / 72.0; } -#endif internal static IXLTableRows InsertRowsWithoutEvents(Func insertFunc, XLTableRange tableRange, Int32 numberOfRows,