Skip to content

Commit f9a9bd9

Browse files
Sébastien GeiserSébastien Geiser
Sébastien Geiser
authored and
Sébastien Geiser
committed
Refactors Excel cell opening logic
Consolidates the logic for opening a specific cell in Excel into a dedicated method. This improves code readability and reduces duplication in the event handlers.
1 parent 825baa3 commit f9a9bd9

File tree

1 file changed

+21
-31
lines changed

1 file changed

+21
-31
lines changed

RegexDialog/RegExToolDialog.xaml.cs

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
using System.Collections.Generic;
1313
using System.Collections.ObjectModel;
1414
using System.Diagnostics;
15-
using System.Globalization;
1615
using System.IO;
1716
using System.Linq;
1817
using System.Reflection;
@@ -1389,21 +1388,7 @@ private void TreeViewItem_MouseDoubleClick(object sender, MouseButtonEventArgs e
13891388
}
13901389
else if(Config.Instance.TextSourceOn == RegexTextSource.Excel)
13911390
{
1392-
var searchResult = regexResult;
1393-
RegexExcelSheetResult excelSheetResult = null;
1394-
1395-
while (searchResult != null)
1396-
{
1397-
if(searchResult is RegexExcelSheetResult)
1398-
excelSheetResult = (RegexExcelSheetResult)searchResult;
1399-
searchResult = searchResult.Parent;
1400-
}
1401-
1402-
if (excelSheetResult != null)
1403-
{
1404-
string launchExcelVbsScriptPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "LaunchExcelVbsScript.vbs");
1405-
Process.Start(launchExcelVbsScriptPath, $"\"{Config.Instance.TextSourceExcelPath}\" \"{excelSheetResult.SheetName}\" \"{regexResult.InfoSup}\"");
1406-
}
1391+
OpenCellInExcel(regexResult);
14071392
}
14081393

14091394
e.Handled = true;
@@ -1430,28 +1415,33 @@ private void TreeViewItem_KeyDown(object sender, KeyEventArgs e)
14301415
}
14311416
else if (Config.Instance.TextSourceOn == RegexTextSource.Excel)
14321417
{
1433-
var searchResult = regexResult;
1434-
RegexExcelSheetResult excelSheetResult = null;
1435-
1436-
while (searchResult != null)
1437-
{
1438-
if (searchResult is RegexExcelSheetResult)
1439-
excelSheetResult = (RegexExcelSheetResult)searchResult;
1440-
searchResult = searchResult.Parent;
1441-
}
1442-
1443-
if (excelSheetResult != null)
1444-
{
1445-
string launchExcelVbsScriptPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "LaunchExcelVbsScript.vbs");
1446-
Process.Start(launchExcelVbsScriptPath, $"\"{Config.Instance.TextSourceExcelPath}\" \"{excelSheetResult.SheetName}\" \"{regexResult.InfoSup}\"");
1447-
}
1418+
OpenCellInExcel(regexResult);
14481419
}
14491420

14501421
e.Handled = true;
14511422
}
14521423
}
14531424
catch { }
14541425
}
1426+
1427+
private void OpenCellInExcel(RegexResult regexResult)
1428+
{
1429+
var searchResult = regexResult;
1430+
RegexExcelSheetResult excelSheetResult = null;
1431+
1432+
while (searchResult != null)
1433+
{
1434+
if (searchResult is RegexExcelSheetResult result)
1435+
excelSheetResult = result;
1436+
searchResult = searchResult.Parent;
1437+
}
1438+
1439+
if (excelSheetResult != null)
1440+
{
1441+
string launchExcelVbsScriptPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "LaunchExcelVbsScript.vbs");
1442+
Process.Start(launchExcelVbsScriptPath, $"\"{Config.Instance.TextSourceExcelPath}\" \"{excelSheetResult.SheetName}\" \"{regexResult.InfoSup}\"");
1443+
}
1444+
}
14551445

14561446
private void RegexLanguageElement_StackPanel_MouseDown(object sender, MouseButtonEventArgs e)
14571447
{

0 commit comments

Comments
 (0)