Fixed a few merge problems.

Added web sample 4
Removed DxfId property

Author: JanKallman

EPPlus/ConditionalFormatting/Contracts/IExcelConditionalFormattingRule.cs

@@ -78,7 +78,7 @@ public interface IExcelConditionalFormattingRule
     /// <para>The possible values for this attribute are defined by the ST_DxfId simple type
     /// (§18.18.25).</para>
     /// </summary>
-    int DxfId { get; set; }
+//    int DxfId { get; set; }
     /// <summary>
     /// Gives access to the differencial styling (DXF) for the rule.
     /// </summary>

EPPlus/ConditionalFormatting/ExcelConditionalFormattingCollection.cs

@@ -377,7 +377,7 @@ public IExcelConditionalFormattingRule RulesByPriority(
     /// </summary>
     /// <param name="type"></param>
     /// <param name="address"></param>
-    /// <returns></returns>
+    /// <returns></returns>F
     internal IExcelConditionalFormattingRule AddRule(
       eExcelConditionalFormattingRuleType type,
       ExcelAddress address)

EPPlus/ConditionalFormatting/Rules/ExcelConditionalFormattingRule.cs

@@ -332,7 +332,7 @@ public bool StopIfTrue
     /// <summary>
     /// DxfId Style Attribute
     /// </summary>
-    public int DxfId
+    internal int DxfId
     {
       get
       {

EPPlus/ExcelStyles.cs

@@ -36,6 +36,7 @@
 using OfficeOpenXml.Style;
 using OfficeOpenXml.Style.XmlAccess;
 using OfficeOpenXml.Style.Dxf;
+using OfficeOpenXml.ConditionalFormatting;
 namespace OfficeOpenXml
 {
 	/// <summary>
@@ -608,15 +609,15 @@ public void UpdateXml()
                         int ix = Dxfs.FindIndexByID(cf.Style.Id);
                         if (ix < 0)
                         {
-                            cf.DxfId = Dxfs.Count;
+                            ((ExcelConditionalFormattingRule)cf).DxfId = Dxfs.Count;
                             Dxfs.Add(cf.Style.Id, cf.Style);
                             var elem = ((XmlDocument)TopNode).CreateElement("d", "dxf", ExcelPackage.schemaMain);
                             cf.Style.CreateNodes(new XmlHelperInstance(NameSpaceManager, elem), "");
                             dxfsNode.AppendChild(elem);
                         }
                         else
                         {
-                            cf.DxfId = ix;
+                            ((ExcelConditionalFormattingRule)cf).DxfId = ix;
                         }
                     }
                 }

EPPlus/ExcelWorksheet.cs

@@ -51,6 +51,7 @@
 using OfficeOpenXml.Table.PivotTable;
 using System.ComponentModel;
 using System.Drawing;
+using OfficeOpenXml.ConditionalFormatting;
 
 namespace OfficeOpenXml
 {
@@ -2637,6 +2638,23 @@ public ExcelPivotTableCollection PivotTables
                 return _pivotTables;
             }
         }
+        private ExcelConditionalFormattingCollection _conditionalFormatting = null;
+        /// <summary>
+        /// ConditionalFormatting defined in the worksheet. Use the Add methods to create ConditionalFormatting and add them to the worksheet. Then
+        /// set the properties on the instance returned.
+        /// </summary>
+        /// <seealso cref="ExcelConditionalFormattingCollection"/>
+        public ExcelConditionalFormattingCollection ConditionalFormatting
+        {
+            get
+            {
+                if (_conditionalFormatting == null)
+                {
+                    _conditionalFormatting = new ExcelConditionalFormattingCollection(this);
+                }
+                return _conditionalFormatting;
+            }
+        }
         private ExcelDataValidationCollection _dataValidation = null;
         /// <summary>
         /// DataValidation defined in the worksheet. Use the Add methods to create DataValidations and add them to the worksheet. Then

EPPlus/Properties/AssemblyInfo.cs

@@ -60,6 +60,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.0.2")]
-[assembly: AssemblyFileVersion("3.0.0.2")]
+[assembly: AssemblyVersion("3.1.0.0")]
+[assembly: AssemblyFileVersion("3.1.0.0")]
 [assembly: AllowPartiallyTrustedCallers]

EPPlus/XmlHelper.cs

@@ -682,13 +682,6 @@ internal int GetXmlNodeInt(string path)
                 return null;
             }
         }
-                }
-                else
-                {
-                    return null;
-                }
-            }
-        }
 
 		internal decimal GetXmlNodeDecimal(string path)
 		{

EPPlusWebSample/Default.aspx

@@ -54,6 +54,14 @@ A:hover{color:#CC6699}
             This sample demonstrates how to use a template stored in the Application cashe.
         </td>
         </tr>
+        <tr>
+        <td>
+        <asp:HyperLink ID="sample4" runat="server" NavigateUrl="~/GetSample.aspx?Sample=4">Sample 4</asp:HyperLink>
+        </td>
+        <td>
+            This sample demonstrates how to use a macro-enabled spreadsheet.
+        </td>
+        </tr>
         </table>
     </form>
 </body>

EPPlusWebSample/Default.aspx.designer.cs

@@ -34,6 +34,7 @@
 using System.IO;
 using OfficeOpenXml.Style;
 using System.Drawing;
+using System.Text;
 namespace EPPlusWebSample
 {
     public partial class GetSample : System.Web.UI.Page
@@ -51,6 +52,9 @@ protected void Page_Load(object sender, EventArgs e)
                 case "3":
                     Sample3();
                     break;
+                case "4":
+                    Sample4();
+                    break;
                 default:
                     Response.Write("<script>javascript:alert('Invalid querystring');</script>");
                     break;
@@ -135,5 +139,30 @@ private void Sample3()
             Response.ContentType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
             Response.AddHeader("content-disposition", "attachment;  filename=Sample3.xlsx");
         }
+        private void Sample4()
+        {
+             ExcelPackage pck = new ExcelPackage();
+
+            //Add a worksheet.
+            var ws=pck.Workbook.Worksheets.Add("VBA Sample");
+            ws.Drawings.AddShape("VBASampleRect", eShapeStyle.RoundRect);
+            
+            //Create a vba project             
+            pck.Workbook.CreateVBAProject();
+
+            //Now add some code that creates a bubble chart...
+            var sb = new StringBuilder();
+
+            sb.AppendLine("Private Sub Workbook_Open()");
+            sb.AppendLine("    [VBA Sample].Shapes(\"VBASampleRect\").TextEffect.Text = \"This text is set from VBA!\"");
+            sb.AppendLine("End Sub");
+            pck.Workbook.CodeModule.Code = sb.ToString();
+
+            Response.BinaryWrite(pck.GetAsByteArray());
+            Response.ContentType = "application/vnd.ms-excel.sheet.macroEnabled.12";            //.xlsm files uses a different contenttype than .xlsx
+            Response.AddHeader("content-disposition", "attachment;  filename=Sample4.xlsm");
+
+        }
+
     }
 }

EPPlusWebSample/GetSample.aspx.cs

@@ -88,8 +88,8 @@ public static string RunSample14(DirectoryInfo outputDir)
         cfRule1.LowValue.Color = ColorTranslator.FromHtml("#FFFFEB84");
         cfRule1.HighValue.Type = eExcelConditionalFormattingValueObjectType.Formula;
         cfRule1.HighValue.Formula = "IF($G$1=\"A</x:&'cfRule>\",1,5)";
-        cfRule1.DxfId = 34;
         cfRule1.StopIfTrue = true;
+        cfRule1.Style.Font.Bold = true;
 
         // But others you can't (readonly)
         // cfRule1.Type = eExcelConditionalFormattingRuleType.ThreeColorScale;
@@ -160,8 +160,7 @@ public static string RunSample14(DirectoryInfo outputDir)
         // -------------------------------------------------------------------
         var cfRule9 = worksheet.ConditionalFormatting.AddAboveStdDev(
           new ExcelAddress("B11:B20"));
-
-        cfRule9.StdDev = 0;
+          cfRule9.StdDev = 0;
 
         // -------------------------------------------------------------------
         // Create a Below StdDev rule

SampleApp/Sample14.cs

@@ -1,4 +1,32 @@
-using System;
+/* 
+ * You may amend and distribute as you like, but don't remove this header!
+ * 
+ * EPPlus provides server-side generation of Excel 2007 spreadsheets.
+ * See http://www.codeplex.com/EPPlus for details.
+ * 
+ * All rights reserved.
+ * 
+ * EPPlus is an Open Source project provided under the 
+ * GNU General Public License (GPL) as published by the 
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 
+ * The GNU General Public License can be viewed at http://www.opensource.org/licenses/gpl-license.php
+ * If you unfamiliar with this license or have questions about it, here is an http://www.gnu.org/licenses/gpl-faq.html
+ * 
+ * The code for this project may be used and redistributed by any means PROVIDING it is 
+ * not sold for profit without the author's written consent, and providing that this notice 
+ * and the author's name and all copyright notices remain intact.
+ * 
+ * All code and executables are provided "as is" with no warranty either express or implied. 
+ * The author accepts no liability for any damage or loss of business that this product may cause.
+ *
+ *  Code change notes:
+ * 
+ * Author							Change						Date
+ * ******************************************************************************
+ * Jan Källman                      Added       		        2012-05-01
+ *******************************************************************************/
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -14,8 +42,9 @@ class Sample15
     {
         public static void VBASample(DirectoryInfo outputDir)
         {
-            //Create a macroenabled workbook from scratch.
+            //Create a macro-enabled workbook from scratch.
             VBASample1(outputDir);
+            
             //Open Sample 1 and add code to change the chart to a bubble chart.
             VBASample2(outputDir);
 
@@ -38,21 +67,10 @@ private static void VBASample1(DirectoryInfo outputDir)
             var sb = new StringBuilder();
 
             sb.AppendLine("Private Sub Workbook_Open()");
-            sb.AppendLine("    [VBA Sample].Shapes(\"VBASampleRect\").TextEffect.Text = \"This test is set from VBA!\"");
+            sb.AppendLine("    [VBA Sample].Shapes(\"VBASampleRect\").TextEffect.Text = \"This text is set from VBA!\"");
             sb.AppendLine("End Sub");
             pck.Workbook.CodeModule.Code = sb.ToString();            
 
-            /*** Try to find a cert valid for signing... ***/
-            X509Store store = new X509Store(StoreLocation.CurrentUser);
-            store.Open(OpenFlags.ReadOnly);
-            foreach (var cert in store.Certificates)
-            {
-                if(cert.HasPrivateKey && cert.NotBefore <= DateTime.Today && cert.NotAfter >= DateTime.Today)
-                {
-                    //pck.Workbook.VbaProject.Signature.Certificate = cert;
-                }
-            }
-
             //And Save as xlsm
             pck.SaveAs(new FileInfo(outputDir.FullName + @"\sample15-1.xlsm"));
         }
@@ -94,6 +112,9 @@ private static void VBASample2(DirectoryInfo outputDir)
 
         private static void VBASample3(DirectoryInfo outputDir)
         {
+            //Now, lets do something a little bit more fun.
+            //We are going to create a simple battleships game from scratch.
+
             ExcelPackage pck = new ExcelPackage();
 
             //Add a worksheet.
@@ -107,6 +128,7 @@ private static void VBASample3(DirectoryInfo outputDir)
 
             int gridSize=10;
 
+            //Create the boards
             var board1 = ws.Cells[2, 2, 2 + gridSize - 1, 2 + gridSize - 1];
             var board2 = ws.Cells[2, 4+gridSize-1, 2 + gridSize-1, 4 + (gridSize-1)*2];
             CreateBoard(board1);
@@ -121,14 +143,15 @@ private static void VBASample3(DirectoryInfo outputDir)
             //Password protect your code
             pck.Workbook.VbaProject.Protection.SetPassword("EPPlus");
 
+            //Add all the code from the textfiles in the Vba-Code sub-folder.
             pck.Workbook.CodeModule.Code = File.ReadAllText("..\\..\\VBA-Code\\ThisWorkbook.txt");
 
             //Add the sheet code
             ws.CodeModule.Code = File.ReadAllText("..\\..\\VBA-Code\\BattleshipSheet.txt");
             var m1=pck.Workbook.VbaProject.Modules.AddModule("Code");
             string code = File.ReadAllText("..\\..\\VBA-Code\\CodeModule.txt");
 
-            //Insert your ships on the right board
+            //Insert your ships on the right board. you can changes these, but don't cheat ;)
             var ships = new string[]{
                 "N3:N7",
                 "P2:S2",
@@ -138,6 +161,7 @@ private static void VBASample3(DirectoryInfo outputDir)
 
             code = string.Format(code, ships[0],ships[1],ships[2],ships[3],ships[4], board1.Address, board2.Address);  //Ships are injected into the constants in the module
             m1.Code = code;
+
             //Ships are displayed with a black background
             string shipsaddress = string.Join(",", ships);
             ws.Cells[shipsaddress].Style.Fill.PatternType = OfficeOpenXml.Style.ExcelFillStyle.Solid;
@@ -149,17 +173,32 @@ private static void VBASample3(DirectoryInfo outputDir)
             var c1 = pck.Workbook.VbaProject.Modules.AddClass("Ship",false);
             c1.Code = File.ReadAllText("..\\..\\VBA-Code\\ShipClass.txt");
 
+            //Add the info text shape.
             var tb = ws.Drawings.AddShape("txtInfo", eShapeStyle.Rect);
             tb.SetPosition(1, 0, 27, 0);
             tb.Fill.Color = Color.LightSlateGray;
             var rt1 = tb.RichText.Add("Battleships");
             rt1.Bold = true;
             tb.RichText.Add("\r\nDouble-click on the left board to make your move. Find and sink all ships to Win!");
 
+            //Set the headers.
             ws.SetValue("B1", "Computer Grid");
             ws.SetValue("M1", "Your Grid");
             ws.Row(1).Style.Font.Size = 18;
 
+            //If you have a valid certificate for code signing you can use this code to set it.
+            ///*** Try to find a cert valid for signing... ***/
+            //X509Store store = new X509Store(StoreLocation.CurrentUser);
+            //store.Open(OpenFlags.ReadOnly);
+            //foreach (var cert in store.Certificates)
+            //{
+            //    if (cert.HasPrivateKey && cert.NotBefore <= DateTime.Today && cert.NotAfter >= DateTime.Today)
+            //    {
+            //        pck.Workbook.VbaProject.Signature.Certificate = cert;
+            //        break;
+            //    }
+            //}
+
             pck.SaveAs(new FileInfo(outputDir.FullName + @"\sample15-3.xlsm"));
         }
 

SampleApp/Sample15.cs

@@ -11,6 +11,9 @@ Public Property Set Position(ByVal value As Range)
 End Property
 
 Public Function IsHit(cell As Range) As Boolean
+Attribute IsHit.VB_Description = "Checks if the current move is a hit"
+Attribute IsHit.VB_HelpID = 1
+'Sample of attribute use on function level (show up in the objectbrowser(F2) --> Method --> Properties
    If Code.Collide(cell, Position) Then
         cell.Worksheet.Unprotect
         cell.Interior.Color = vbRed