Merge branch 'master' of https://github.com/Excel-DNA/Samples.git

Author: govert

FSharpRibbon/MyRibbon.fs

@@ -6,7 +6,7 @@ open Microsoft.Office.Interop.Excel
 open ExcelDna.Integration
 open ExcelDna.Integration.CustomUI
 
-// This defines a regular Excel macro (in Excel you can press F8, type in the name "showMessage", then click the Run button).
+// This defines a regular Excel macro (in Excel you can press Alt + F8, type in the name "showMessage", then click the Run button).
 // For the ribbon, it will be run through the ExcelRibbon.RunTagMacro(...) helper, which run whatever macro is specified in the button tag attribute
 // One advantage is that you can 
 [<ExcelCommand>]
@@ -21,7 +21,7 @@ type public MyRibbon() =
     inherit ExcelRibbon()
 
     // The ribbon xml definition could also be placed in the .dna file
-    // Remeber to switch on the ExcelOption "Show add-in user interface errors" option (under the Advanced tab under General)
+    // Remember to switch on the ExcelOption "Show add-in user interface errors" option (under the Advanced tab under General)
     override this.GetCustomUI(ribbonId) = 
         @"<customUI xmlns='http://schemas.microsoft.com/office/2006/01/customui' >
           <ribbon>
@@ -47,4 +47,4 @@ type public MyRibbon() =
         cellA1.Value2 <- app.Version
         // could also replace the last line with
         //     cellA1.Value(XlRangeValueDataType.xlRangeValueDefault) <- app.Version 
-        // but Range.Value is an indexer property, so it's a bit inconvenient
+        // but Range.Value is an indexer property, so it's a bit inconvenient

FSharpRibbon/README.md

@@ -10,6 +10,8 @@ The interesting code is in MyRibbon.fs
 * Copy the test code into Library1.fs
 * F5 to run and check that the funciton works in Excel
 * Add new file with the code in MyRibbon.fs
+* Add a reference to System.Windows.Forms.dll
+* Install-Package Excel-DNA.Interop
 * F5 to run and check that the ribbon is there and the buttons work
 
 ## Using the COM object model

Misc/ComObjectModel.cs

@@ -0,0 +1,23 @@
+// Shows how to get hold of the Excel COM Application object
+
+// Install the 'ExcelDna.Interop' package from NuGet, or reference the two assemblies:
+// * Microsoft.Office.Interop.Excel.dll
+// * Office.dll
+
+using ExcelDna.Integration;
+using Microsoft.Office.Interop.Excel;
+
+public class TestCommands
+{
+    // Defines a macro that uses the COM object model to add a diamond shape to the active sheet.
+    [ExcelCommand(ShortCut = "^D")] // Ctrl+Shift+D
+    public static void AddDiamond()
+    {
+        Application xlApp = (Application)ExcelDnaUtil.Application;
+        string version = xlApp.Version;
+
+        Worksheet ws = xlApp.ActiveSheet as Worksheet;  // Need to change type - it might be a Chart, then ws would be null
+        Shape diamond = ws.Shapes.AddShape(Microsoft.Office.Core.MsoAutoShapeType.msoShapeDiamond, 10, 10, 100, 100);
+        diamond.Fill.BackColor.RGB = (int)XlRgbColor.rgbSlateBlue;
+    }
+}