Change .xla/.xlam enumeration approach

Author: govert

Source/ExcelDna.IntelliSense/Providers/WorkbookIntelliSenseProvider.cs

@@ -157,33 +157,70 @@ public void Initialize()
                         RegisterWithXmlProvider(wb);
                     }
                 }
-                if (ExcelDnaUtil.ExcelVersion >= 14.0)
+
+                // NOTE: This access to AddIns2 might have caused long load delays
+                //if (ExcelDnaUtil.ExcelVersion >= 14.0)
+                //{
+                //    foreach (AddIn addIn in xlApp.AddIns2)
+                //    {
+                //        if (addIn.IsOpen && Path.GetExtension(addIn.FullName) != ".xll")
+                //        {
+                //            // Can it be "Open" and not be loaded?
+                //            var name = addIn.Name;
+                //            Workbook wbAddIn;
+                //            try
+                //            {
+                //                // TODO: Log
+                //                wbAddIn = xlApp.Workbooks[name];
+                //            }
+                //            catch
+                //            {
+                //                // TODO: Log
+                //                continue;
+                //            }
+
+                //            WorkbookRegistrationInfo regInfo = new WorkbookRegistrationInfo(name);
+                //            _workbookRegistrationInfos[name] = regInfo;
+
+                //            regInfo.Refresh();
+
+                //            RegisterWithXmlProvider(wbAddIn);
+                //        }
+                //    }
+                //}
+
+                var loadedAddIns = Integration.XlCall.Excel(Integration.XlCall.xlfDocuments, 2) as object[,];
+                if (loadedAddIns == null)
+                {
+                    // This is normal if there are none
+                    Logger.Provider.Verbose($"WorkbookIntelliSenseProvider.Initialize - DOCUMENTS(2) returned null");
+                    return;
+                }
+                for (int i = 0; i < loadedAddIns.GetLength(1); i++)
                 {
-                    foreach (AddIn addIn in xlApp.AddIns2)
+                    var addInName = loadedAddIns[0, i] as string;
+                    if (addInName != null && Path.GetExtension(addInName) != ".xll")    // We don't actually expect the .xll add-ins here - and they're taken care of elsewhere
                     {
-                        if (addIn.IsOpen && Path.GetExtension(addIn.FullName) != ".xll")
+                        // Can it be "Open" and not be loaded?
+                        var name = addInName;
+                        Workbook wbAddIn;
+                        try
                         {
-                            // Can it be "Open" and not be loaded?
-                            var name = addIn.Name;
-                            Workbook wbAddIn;
-                            try
-                            {
-                                // TODO: Log
-                                wbAddIn = xlApp.Workbooks[name];
-                            }
-                            catch
-                            {
-                                // TODO: Log
-                                continue;
-                            }
+                            // TODO: Log
+                            wbAddIn = xlApp.Workbooks[name];
+                        }
+                        catch
+                        {
+                            // TODO: Log
+                            continue;
+                        }
 
-                            WorkbookRegistrationInfo regInfo = new WorkbookRegistrationInfo(name);
-                            _workbookRegistrationInfos[name] = regInfo;
+                        WorkbookRegistrationInfo regInfo = new WorkbookRegistrationInfo(name);
+                        _workbookRegistrationInfos[name] = regInfo;
 
-                            regInfo.Refresh();
+                        regInfo.Refresh();
 
-                            RegisterWithXmlProvider(wbAddIn);
-                        }
+                        RegisterWithXmlProvider(wbAddIn);
                     }
                 }
             }