github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-22 14:24:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modified the office application detection to fix https://greenshot.atlassian.net/browse/BUG-2440

Browse source
This commit is contained in:
Robin 2019-05-07 13:38:14 +02:00
commit 1fee3bd785
No known key found for this signature in database
GPG key ID: CBBB6557491B1140
1 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/Greenshot.Addon.Office/OfficeAddonModule.cs
View file

@ -17,6 +17,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using Autofac;
using Dapplo.Addons;
using Dapplo.CaliburnMicro.Configuration;
@ -28,13 +29,33 @@ using Greenshot.Addon.Office.Destinations;
using Greenshot.Addon.Office.OfficeExport;
using Greenshot.Addon.Office.ViewModels;
using Greenshot.Addons.Components;
using Greenshot.Addons.Core;
using Microsoft.Win32;
namespace Greenshot.Addon.Office
{
/// <inheritdoc />
public class OfficeAddonModule : AddonModule
{
private const string Word = "Word.Application";
private const string Excel = "Exceldd.Application";
private const string PowerPoint = "PowerPoint.Application";
private const string OneNote = "OneNote.Application";
private const string Outlook = @"Outlook.Application";
/// <summary>
/// Helper method to test the registry for the existence of an application
/// </summary>
/// <param name="applicationName">string with the application name</param>
/// <returns></returns>
private bool HasApplication(string applicationName)
{
string registryPath = $@"{applicationName}\CLSID";
using (var registryKey = Registry.ClassesRoot.OpenSubKey(registryPath, false))
{
return registryKey != null && Guid.TryParse(registryKey.GetValue(null) as string, out _);
}
}
/// <summary>
/// Define the dependencies of this project
/// </summary>
@ -43,7 +64,7 @@ namespace Greenshot.Addon.Office
{
var hasDestination = false;
if (PluginUtils.GetExePath("EXCEL.EXE") != null)
if (HasApplication(Excel))
{
hasDestination = true;
builder
@ -52,7 +73,7 @@ namespace Greenshot.Addon.Office
.SingleInstance();
}
if (PluginUtils.GetExePath("WINWORD.EXE") != null)
if (HasApplication(Word))
{
hasDestination = true;
builder
@ -61,7 +82,7 @@ namespace Greenshot.Addon.Office
.SingleInstance();
}
if (PluginUtils.GetExePath("POWERPNT.EXE") != null)
if (HasApplication(PowerPoint))
{
hasDestination = true;
builder
@ -70,7 +91,7 @@ namespace Greenshot.Addon.Office
.SingleInstance();
}
if (PluginUtils.GetExePath("ONENOTE.EXE") != null)
if (HasApplication(OneNote))
{
hasDestination = true;
builder
@ -84,7 +105,7 @@ namespace Greenshot.Addon.Office
.SingleInstance();
}
if (PluginUtils.GetExePath("OUTLOOK.EXE") != null)
if (HasApplication(Outlook))
{
hasDestination = true;
builder