diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeBase.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeBase.cs index f373b6d..1b2c754 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeBase.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/IXLRangeBase.cs @@ -231,10 +231,10 @@ Boolean IsEmpty(); Boolean IsEmpty(Boolean includeFormats); -#if DEBUG + IXLPivotTable CreatePivotTable(IXLCell targetCell); IXLPivotTable CreatePivotTable(IXLCell targetCell, String name); -#endif + //IXLChart CreateChart(Int32 firstRow, Int32 firstColumn, Int32 lastRow, Int32 lastColumn); diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeBase.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeBase.cs index a9ce9b8..4081f65 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeBase.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Ranges/XLRangeBase.cs @@ -1559,7 +1559,7 @@ // return chart; //} -#if DEBUG + IXLPivotTable IXLRangeBase.CreatePivotTable(IXLCell targetCell) { return CreatePivotTable(targetCell); @@ -1568,7 +1568,7 @@ { return CreatePivotTable(targetCell, name); } -#endif + public XLPivotTable CreatePivotTable(IXLCell targetCell) { diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs index 7676def..0a1b36e 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs @@ -1363,7 +1363,9 @@ { foreach (var formula in fr.Elements()) { - if (formula.Text != null && conditionalFormat.ConditionalFormatType == XLConditionalFormatType.CellIs) + if (formula.Text != null + && (conditionalFormat.ConditionalFormatType == XLConditionalFormatType.CellIs + || conditionalFormat.ConditionalFormatType == XLConditionalFormatType.Expression)) { String val = formula.Text.Replace("\"\"", "\""); //if (val.StartsWith("\"")) val = val.Substring(1, val.Length - 2); diff --git a/ClosedXML/ClosedXML/ClosedXML/Properties/AssemblyInfo.cs b/ClosedXML/ClosedXML/ClosedXML/Properties/AssemblyInfo.cs index e03acd3..497aa80 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Properties/AssemblyInfo.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.65.2.0")] -[assembly: AssemblyFileVersion("0.65.2.0")] +[assembly: AssemblyVersion("0.66.0.0")] +[assembly: AssemblyFileVersion("0.66.0.0")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("ClosedXML_Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a1fb8ba59167fe734d64128ca73d32c45cb8a117246d09c95c8769db88fe332b0a3396bedd0ea48ee42b0e5796fec0798ca5cb628a9a6de80d35d6c67b936ca1670347b3d4f2b769c8ce2ddcf959dbac6bcd88e6c08751ea1fffa0522de3507193e7035305a8aa008d6c88cca1341b3120fa9c347ab3f97e2d772e2709277da5")] \ No newline at end of file diff --git a/ClosedXML/ClosedXML/ClosedXML_Net3.5/Properties/AssemblyInfo.cs b/ClosedXML/ClosedXML/ClosedXML_Net3.5/Properties/AssemblyInfo.cs index d31b949..88a1184 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Net3.5/Properties/AssemblyInfo.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Net3.5/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.65.2.0")] -[assembly: AssemblyFileVersion("0.65.2.0")] +[assembly: AssemblyVersion("0.66.0.0")] +[assembly: AssemblyFileVersion("0.66.0.0")] diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs b/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs index fa70a33..9e2bb7b 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs @@ -12,10 +12,7 @@ { static void Main(string[] args) { - var wb = new XLWorkbook(); - var ws = wb.AddWorksheet("Sheet1"); - wb.SaveAs(@"Sandbox.xlsx"); } } @@ -24,7 +21,7 @@ public void RunAll(XLWorkbook wb) { Add_Row_Labels_and_Sum(wb); - //Add_category_on_row_and_SubCategory_on_column(wb); //not working + Add_category_on_row_and_SubCategory_on_column(wb); //not working } private void Add_Row_Labels_and_Sum(XLWorkbook wb) @@ -46,10 +43,10 @@ ws.Cell("C3").Value = 150; ws.Cell("C4").Value = 75; - //var pivotTable = ws.Range("A1:C4").CreatePivotTable(ws.Cell("E1")); - //pivotTable.RowLabels.Add("Category"); - //pivotTable.RowLabels.Add("SubCategory"); - //pivotTable.Values.Add("Number").SetSummaryFormula(XLPivotSummary.Sum); + var pivotTable = ws.Range("A1:C4").CreatePivotTable(ws.Cell("E1")); + pivotTable.RowLabels.Add("Category"); + pivotTable.RowLabels.Add("SubCategory"); + pivotTable.Values.Add("Number").SetSummaryFormula(XLPivotSummary.Sum); } @@ -73,10 +70,10 @@ ws.Cell("C3").Value = 150; ws.Cell("C4").Value = 75; - //var pivotTable = ws.Range("A1:C4").CreatePivotTable(ws.Cell("E1")); - //pivotTable.RowLabels.Add("Category"); - //pivotTable.ColumnLabels.Add("SubCategory"); - //pivotTable.Values.Add("Number").SetSummaryFormula(XLPivotSummary.Sum); + var pivotTable = ws.Range("A1:C4").CreatePivotTable(ws.Cell("E1")); + pivotTable.RowLabels.Add("Category"); + pivotTable.ColumnLabels.Add("SubCategory"); + pivotTable.Values.Add("Number").SetSummaryFormula(XLPivotSummary.Sum); } } }