From fcf4b971014abddf939474ad13d629c1183e2a5d Mon Sep 17 00:00:00 2001
From: Nathan Brown <nathanofbrown@gmail.com>
Date: Mon, 31 Oct 2022 21:58:07 -0700
Subject: [PATCH] OfficeUtils fix

(cherry picked from commit bfa75aea0208966f2a93a0e6ddb52270940417cd)
(cherry picked from commit 275d7b4149818db1cda771dfd2641b250dbb5e66)
(cherry picked from commit 0d81a3f26e908c3a65be77503b0e78c35048579d)
---
 src/Greenshot.Plugin.Office/OfficeUtils.cs | 60 +++++++++++-----------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/Greenshot.Plugin.Office/OfficeUtils.cs b/src/Greenshot.Plugin.Office/OfficeUtils.cs
index 52ca8d7cb..305611c5d 100644
--- a/src/Greenshot.Plugin.Office/OfficeUtils.cs
+++ b/src/Greenshot.Plugin.Office/OfficeUtils.cs
@@ -1,43 +1,45 @@
 using System.Linq;
 using Microsoft.Win32;
 
-namespace Greenshot.Plugin.Office;
-
-/// <summary>
-/// A small utility class for helping with office
-/// </summary>
-internal static class OfficeUtils
+namespace Greenshot.Plugin.Office
 {
-    private static readonly string[] OfficeRootKeys = { @"SOFTWARE\Microsoft\Office", @"SOFTWARE\WOW6432Node\Microsoft\Office" };
 
     /// <summary>
-    /// Get the path to the office exe
+    /// A small utility class for helping with office
     /// </summary>
-    /// <param name="exeName">Name of the office executable</param>
-    public static string GetOfficeExePath(string exeName)
+    internal static class OfficeUtils
     {
-        string strKeyName = exeName switch
-        {
-            "WINWORD.EXE" => "Word",
-            "EXCEL.EXE" => "Excel",
-            "POWERPNT.EXE" => "PowerPoint",
-            "OUTLOOK.EXE" => "Outlook",
-            "ONENOTE.EXE" => "OneNote",
-            _ => ""
-        };
+        private static readonly string[] OfficeRootKeys = { @"SOFTWARE\Microsoft\Office", @"SOFTWARE\WOW6432Node\Microsoft\Office" };
 
-        foreach (string strRootKey in OfficeRootKeys)
+        /// <summary>
+        /// Get the path to the office exe
+        /// </summary>
+        /// <param name="exeName">Name of the office executable</param>
+        public static string GetOfficeExePath(string exeName)
         {
-            using RegistryKey rootKey = Registry.LocalMachine.OpenSubKey(strRootKey);
-            if (rootKey is null) continue;
-            
-            foreach (string officeVersion in rootKey.GetSubKeyNames().Where(r => r.Contains(".")).Reverse())
+            string strKeyName = exeName switch
             {
-                using RegistryKey installRootKey = Registry.LocalMachine.OpenSubKey($@"{strRootKey}\{officeVersion}\{strKeyName}\InstallRoot");
-                if (installRootKey == null) continue;
-                return $@"{installRootKey.GetValue("Path")}\{exeName}";
+                "WINWORD.EXE" => "Word",
+                "EXCEL.EXE" => "Excel",
+                "POWERPNT.EXE" => "PowerPoint",
+                "OUTLOOK.EXE" => "Outlook",
+                "ONENOTE.EXE" => "OneNote",
+                _ => ""
+            };
+
+            foreach (string strRootKey in OfficeRootKeys)
+            {
+                using RegistryKey rootKey = Registry.LocalMachine.OpenSubKey(strRootKey);
+                if (rootKey is null) continue;
+
+                foreach (string officeVersion in rootKey.GetSubKeyNames().Where(r => r.Contains(".")).Reverse())
+                {
+                    using RegistryKey installRootKey = Registry.LocalMachine.OpenSubKey($@"{strRootKey}\{officeVersion}\{strKeyName}\InstallRoot");
+                    if (installRootKey == null) continue;
+                    return $@"{installRootKey.GetValue("Path")}\{exeName}";
+                }
             }
+            return null;
         }
-        return null;
     }
-}
+}
\ No newline at end of file