chebser/RhSolutions-AddIn
0
0
Fork 0
Code Packages Releases 16 Wiki Activity

Application Singleton fix

Browse Source
This commit is contained in:
Sergey Chebotar 2023-03-28 07:55:45 +03:00
parent 6555d6343f
commit 7bb6ce6c5a
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs
View File

@ -21,7 +21,7 @@ namespace RhSolutions.AddIn
Services.AddHttpClient() Services.AddHttpClient()
.AddSingleton<IDatabaseClient, RhDatabaseClient>() .AddSingleton<IDatabaseClient, RhDatabaseClient>()
.AddSingleton<IAddInConfiguration, AddInConfiguration>() .AddSingleton<IAddInConfiguration, AddInConfiguration>()
.AddSingleton(ExcelDnaUtil.Application); .AddSingleton((Application)ExcelDnaUtil.Application);
ServiceProvider = Services.BuildServiceProvider(); ServiceProvider = Services.BuildServiceProvider();
Configuration = ServiceProvider.GetService<IAddInConfiguration>(); Configuration = ServiceProvider.GetService<IAddInConfiguration>();

14
RhSolutions.AddIn/Services/EventsUtil.cs
View File

@ -7,21 +7,19 @@ namespace RhSolutions.Services
{ {
internal static class EventsUtil internal static class EventsUtil
{ {
private static readonly Application Excel = RhSolutionsAddIn.Excel;
public static void Initialize() public static void Initialize()
{ {
Excel.SheetSelectionChange += RefreshExportButton; RhSolutionsAddIn.Excel.SheetSelectionChange += RefreshExportButton;
Excel.SheetActivate += RefreshConvertButton; RhSolutionsAddIn.Excel.SheetActivate += RefreshConvertButton;
Excel.WorkbookActivate += RefreshConvertButton; RhSolutionsAddIn.Excel.WorkbookActivate += RefreshConvertButton;
RhSolutionsAddIn.Configuration.OnSettingsChange += RefreshSettingTitle; RhSolutionsAddIn.Configuration.OnSettingsChange += RefreshSettingTitle;
} }
public static void Uninitialize() public static void Uninitialize()
{ {
Excel.SheetSelectionChange -= RefreshExportButton; RhSolutionsAddIn.Excel.SheetSelectionChange -= RefreshExportButton;
Excel.SheetActivate -= RefreshConvertButton; RhSolutionsAddIn.Excel.SheetActivate -= RefreshConvertButton;
Excel.WorkbookActivate -= RefreshConvertButton; RhSolutionsAddIn.Excel.WorkbookActivate -= RefreshConvertButton;
RhSolutionsAddIn.Configuration.OnSettingsChange -= RefreshSettingTitle; RhSolutionsAddIn.Configuration.OnSettingsChange -= RefreshSettingTitle;
} }