Merged PR 532: V3.2.4 Beta 4

Related work items: #995
Chem4Word · Aug 17, 2022 · 5d95d5a · 5d95d5a
1 parent b603972
commit 5d95d5a
Show file tree

Hide file tree

Showing 32 changed files with 70 additions and 63 deletions.
diff --git a/src/Chem4Word.V3/Chem4WordOptions.cs b/src/Chem4Word.V3/Chem4WordOptions.cs
@@ -184,6 +184,9 @@ public void Load()
                             }
                             else
                             {
+                                // ToDo: Take this out after beta is completed
+                                RegistryHelper.StoreMessage(module, fileContents);
+
                                 var options = JsonConvert.DeserializeObject<Chem4WordOptions>(fileContents);
                                 SetValuesFromCopy(options);
 
@@ -292,7 +295,7 @@ private string ReadOptionsFile(string filename)
                 Errors.Add(exception.StackTrace);
             }
 
-            return result;
+            return result.Trim();
         }
 
         private void PersistOptions(string filename)
@@ -301,10 +304,13 @@ private void PersistOptions(string filename)
 
             try
             {
+                // ToDo: Take this out after beta is completed
                 RegistryHelper.StoreMessage(module, $"Saving Chem4Word Options to {filename}");
                 Debug.WriteLine($"Saving Chem4Word Options to {filename}");
 
                 var contents = JsonConvert.SerializeObject(this, Formatting.Indented);
+                // ToDo: Take this out after beta is completed
+                RegistryHelper.StoreMessage(module, contents);
 
                 using (var outStream = new FileStream(filename,
                                                       FileMode.Create,

diff --git a/src/Chem4Word.V3/Chem4WordV3.cs b/src/Chem4Word.V3/Chem4WordV3.cs
@@ -2743,7 +2743,7 @@ private void OnContentControlAfterAdd(Word.ContentControl NewContentControl, boo
                             var message = $"ContentControl {ccId} added; Looking for structure {ccTag}";
                             Telemetry.Write(module, "Information", message);
 
-                            var document = NewContentControl.Application.ActiveDocument;
+                            var document = Globals.Chem4WordV3.Application.ActiveDocument;
                             var application = Application;
                             var cxml = CustomXmlPartHelper.GetCustomXmlPart(ccTag, application.ActiveDocument);
                             if (cxml != null)
@@ -2752,7 +2752,7 @@ private void OnContentControlAfterAdd(Word.ContentControl NewContentControl, boo
                             }
                             else
                             {
-                                if (document.Application.Documents.Count > 1)
+                                if (Globals.Chem4WordV3.Application.Documents.Count > 1)
                                 {
                                     var app1 = Application;
                                     cxml = CustomXmlPartHelper.FindCustomXmlPart(ccTag, app1.ActiveDocument);

diff --git a/src/Chem4Word.V3/Data/Chem4Word-Versions.xml b/src/Chem4Word.V3/Data/Chem4Word-Versions.xml
@@ -5,13 +5,14 @@
     <Version>
         <Number>3.2.4 Beta 4</Number>
         <IsBeta>true</IsBeta>
-        <Released>01-Apr-2022</Released>
+        <Released>17-Aug-2022</Released>
         <Changes>
             <Change>System Info is not correct for Windows 11</Change>
             <Change>Additional text encountered after finished reading JSON</Change>
-            <Change>Null Pointer Exception in LoadNamesFromLibrary()</Change>
+            <Change>Fix Null Pointer Exception in LoadNamesFromLibrary()</Change>
             <Change>Add Retrosynthetic arrow https://github.com/Chem4Word/Version3-2/issues/26</Change>
-            <Change>Fix Null Poitner Exception in Formula helper</Change>
+            <Change>Fix Null Pointer Exception in FormulaHelper()</Change>
+            <Change>Fix Null Pointer Exception in ChemistryHelper()</Change>
             <Change>If you like our product, please consider buying us a coffee at https://www.buymeacoffee.com/chem4word</Change>
             <Change>Please download Chem4Word-Setup.exe via https://www.chem4word.co.uk/download/ if you encounter any difficulties updating</Change>
         </Changes>

diff --git a/src/Chem4Word.V3/Data/This-Version.xml b/src/Chem4Word.V3/Data/This-Version.xml
@@ -2,5 +2,5 @@
 <Version>
   <Number>3.2.4 Beta 4</Number>
   <IsBeta>true</IsBeta>
-  <Released>01-Apr-2022</Released>
+  <Released>17-Aug-2022</Released>
 </Version>
diff --git a/src/Chem4Word.V3/Helpers/ChemistryHelper.cs b/src/Chem4Word.V3/Helpers/ChemistryHelper.cs
@@ -39,7 +39,7 @@ public static Word.ContentControl Insert2DChemistry(Word.Document doc, string cm
             // Calling routine should check that Globals.Chem4WordV3.ChemistryAllowed = true
 
             Word.ContentControl cc = null;
-            var app = doc.Application;
+            var app = Globals.Chem4WordV3.Application;
 
             var wordSettings = new WordSettings(app);
 

diff --git a/src/Chem4Word.V3/Helpers/Upgrader.cs b/src/Chem4Word.V3/Helpers/Upgrader.cs
@@ -151,7 +151,7 @@ public static void DoUpgrade(Word.Document doc)
         {
             string module = $"{_product}.{_class}.{MethodBase.GetCurrentMethod().Name}()";
 
-            int sel = doc.Application.Selection.Range.Start;
+            int sel = Globals.Chem4WordV3.Application.Selection.Range.Start;
             Globals.Chem4WordV3.DisableContentControlEvents();
 
             try
@@ -212,7 +212,7 @@ public static void DoUpgrade(Word.Document doc)
                                     start = cc.Range.Start;
                                     cc.Delete();
 
-                                    doc.Application.Selection.SetRange(start - 1, start - 1);
+                                    Globals.Chem4WordV3.Application.Selection.SetRange(start - 1, start - 1);
                                     var model = new Model();
                                     var molecule = new Molecule();
                                     molecule.Names.Add(new TextualProperty { Id = "m1.n1", Value = cci.Text, FullType = CMLConstants.ValueChem4WordSynonym });
@@ -233,7 +233,7 @@ public static void DoUpgrade(Word.Document doc)
                                     start = cc.Range.Start;
                                     cc.Delete();
 
-                                    doc.Application.Selection.SetRange(start - 1, start - 1);
+                                    Globals.Chem4WordV3.Application.Selection.SetRange(start - 1, start - 1);
                                     isFormula = false;
                                     text = ChemistryHelper.GetInlineText(target.Model, cci.Type, ref isFormula, out _);
                                     Word.ContentControl ccr = doc.ContentControls.Add(Word.WdContentControlType.wdContentControlRichText, ref _missing);
@@ -261,7 +261,7 @@ public static void DoUpgrade(Word.Document doc)
             }
 
             Globals.Chem4WordV3.EnableContentControlEvents();
-            doc.Application.Selection.SetRange(sel, sel);
+            Globals.Chem4WordV3.Application.Selection.SetRange(sel, sel);
             if (upgradedCCs + upgradedXml > 0)
             {
                 if (Globals.Chem4WordV3.Telemetry != null)
@@ -329,7 +329,7 @@ private static List<UpgradeTarget> CollectData(Word.Document doc)
 
             List<UpgradeTarget> targets = new List<UpgradeTarget>();
 
-            Word.Selection sel = doc.Application.Selection;
+            Word.Selection sel = Globals.Chem4WordV3.Application.Selection;
 
             // Step 1 find location of all content controls
             // Step 2 extract Cml

diff --git a/src/Chem4Word.V3/Library/LibraryViewControl.xaml.cs b/src/Chem4Word.V3/Library/LibraryViewControl.xaml.cs
@@ -74,7 +74,7 @@ private void OnItemButtonClick(object sender, RoutedEventArgs e)
                                 switch (source.Button)
                                 {
                                     case "Library|InsertCopy":
-                                        TaskPaneHelper.InsertChemistry(true, activeDocument.Application, clicked.Cml, true);
+                                        TaskPaneHelper.InsertChemistry(true, Globals.Chem4WordV3.Application, clicked.Cml, true);
                                         break;
                                 }
                             }

diff --git a/src/Chem4Word.V3/Properties/AssemblyInfo.cs b/src/Chem4Word.V3/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/Chemistry/Chem4Word.ACME/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.ACME/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/Chemistry/Chem4Word.Model2/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.Model2/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs b/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/Common/Chem4Word.Telemetry/Properties/AssemblyInfo.cs b/src/Common/Chem4Word.Telemetry/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs b/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs b/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs b/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/Installer/WiXInstaller/Product.wxs b/src/Installer/WiXInstaller/Product.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <!-- For automatic upgrade to work only first three parts of version number are used -->
-  <Product Id="*" Name="Chemistry Add-In for Microsoft Word 2022 Beta 4" Manufacturer="Chem4Word" Version="3.2.4.8126" UpgradeCode="865226e7-d29d-49aa-a390-dda49979b102" Language="1033">
+  <Product Id="*" Name="Chemistry Add-In for Microsoft Word 2022 Beta 4" Manufacturer="Chem4Word" Version="3.2.4.8264" UpgradeCode="865226e7-d29d-49aa-a390-dda49979b102" Language="1033">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <MajorUpgrade DowngradeErrorMessage="A newer version of Chem4Word is already installed." />
     <Media Id="1" Cabinet="product.cab" EmbedCab="yes" CompressionLevel="high" />

diff --git a/src/PlugIns/Contracts/Properties/AssemblyInfo.cs b/src/PlugIns/Contracts/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/PlugIns/Editors/Chem4Word.Editor.ACME/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/Chem4Word.Editor.ACME/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/PlugIns/Renderers/OoXmlV4/Properties/AssemblyInfo.cs b/src/PlugIns/Renderers/OoXmlV4/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/TestHarness/WPF.ShapeTester/Properties/AssemblyInfo.cs b/src/TestHarness/WPF.ShapeTester/Properties/AssemblyInfo.cs
@@ -44,5 +44,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/TestHarness/WinForms.TestHarness/Properties/AssemblyInfo.cs b/src/TestHarness/WinForms.TestHarness/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/TestHarness/WinForms.TestLibrary/Properties/AssemblyInfo.cs b/src/TestHarness/WinForms.TestLibrary/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/TestHarness/Wpf.FunctionalGroupEditor/Properties/AssemblyInfo.cs b/src/TestHarness/Wpf.FunctionalGroupEditor/Properties/AssemblyInfo.cs
@@ -44,5 +44,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]
diff --git a/src/UnitTests/Properties/AssemblyInfo.cs b/src/UnitTests/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.4.8126")]
-[assembly: AssemblyFileVersion("3.2.4.8126")]
+[assembly: AssemblyVersion("3.2.4.8264")]
+[assembly: AssemblyFileVersion("3.2.4.8264")]