Skip to content

Commit b436c0b

Browse files
Sergey-Vlasovgovert
authored andcommitted
Applied the extended registration pipeline to standard registrations.
1 parent c994863 commit b436c0b

File tree

2 files changed

+3
-16
lines changed

2 files changed

+3
-16
lines changed

Source/ExcelDna.Integration/DnaLibrary.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -325,12 +325,8 @@ internal void AutoOpen()
325325
RegistrationInfo.Register();
326326
SynchronizationManager.Install(true);
327327
// Register my Methods
328-
if (_excelFunctionExecutionHandlerSelectors.Count == 0)
329-
ExcelIntegration.RegisterMethods(_methods);
330-
else
331-
ExtendedRegistration.Registration.RegisterStandard(_methods.Select(i => new ExcelDna.Registration.ExcelFunctionRegistration(i)), _excelFunctionExecutionHandlerSelectors);
332-
333-
ExtendedRegistration.Registration.RegisterExtended(_excelFunctionsExtendedRegistration, _excelParameterConversions, _excelReturnConversions, _excelFunctionProcessors, _excelFunctionExecutionHandlerSelectors);
328+
var allMethods = _methods.Select(i => new Registration.ExcelFunctionRegistration(i)).Concat(_excelFunctionsExtendedRegistration);
329+
ExtendedRegistration.Registration.RegisterExtended(allMethods, _excelParameterConversions, _excelReturnConversions, _excelFunctionProcessors, _excelFunctionExecutionHandlerSelectors);
334330

335331
// Invoke AutoOpen in all assemblies
336332
foreach (AssemblyLoader.ExcelAddInInfo addIn in _addIns)
@@ -394,7 +390,7 @@ internal void AutoClose()
394390
internal void LoadCustomUI()
395391
{
396392
bool uiLoaded = false;
397-
393+
398394
// Load ComAddIns
399395
foreach (AssemblyLoader.ExcelAddInInfo addIn in _addIns)
400396
{

Source/ExcelDna.Integration/ExtendedRegistration/Registration.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,6 @@ public static void RegisterExtended(IEnumerable<ExcelDna.Registration.ExcelFunct
2929
);
3030
}
3131

32-
public static void RegisterStandard(IEnumerable<ExcelDna.Registration.ExcelFunctionRegistration> functions, IEnumerable<FunctionExecutionHandlerSelector> excelFunctionExecutionHandlerSelectors)
33-
{
34-
var functionHandlerConfig = GetFunctionExecutionHandlerConfig(excelFunctionExecutionHandlerSelectors);
35-
36-
Register(functions
37-
.ProcessFunctionExecutionHandlers(functionHandlerConfig)
38-
);
39-
}
40-
4132
internal static void Register(IEnumerable<ExcelDna.Registration.ExcelFunctionRegistration> functions)
4233
{
4334
functions = functions.ToList();

0 commit comments

Comments
 (0)