Merge branch 'release-7.2.6'

bovender · Dec 22, 2016 · fda7f40 · fda7f40
2 parents 7527299 + 3556c57
commit fda7f40
Show file tree

Hide file tree

Showing 24 changed files with 459 additions and 385 deletions.
diff --git a/Tests/Properties/AssemblyInfo.cs b/Tests/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.2.5.0")]
-[assembly: AssemblyFileVersion("7.2.5.0")]
+[assembly: AssemblyVersion("7.2.6.0")]
+[assembly: AssemblyFileVersion("7.2.6.0")]
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -57,15 +57,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Debug %28Bovender via NuGet%29'">
-    <Reference Include="Bovender, Version=0.15.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+    <Reference Include="Bovender, Version=0.16.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.15.1.0\lib\net40\Bovender.dll</HintPath>
+      <HintPath>..\packages\Bovender.0.16.0.0\lib\net40\Bovender.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Release'">
-    <Reference Include="Bovender, Version=0.15.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+    <Reference Include="Bovender, Version=0.16.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.15.1.0\lib\net40\Bovender.dll</HintPath>
+      <HintPath>..\packages\Bovender.0.16.0.0\lib\net40\Bovender.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Tests/packages.config b/Tests/packages.config
@@ -19,7 +19,7 @@
 	limitations under the License.
 -->
 <packages>
-  <package id="Bovender" version="0.15.1.0" targetFramework="net40" />
+  <package id="Bovender" version="0.16.0.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
   <package id="NLog" version="4.3.7" targetFramework="net40" />
   <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net40" />

diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-7.2.5
-7.2.5.0
+7.2.6
+7.2.6.0
diff --git a/XLToolbox/Csv/CsvExportViewModel.cs b/XLToolbox/Csv/CsvExportViewModel.cs
@@ -190,13 +190,15 @@ private CsvExporter CsvExporter
         private void DoChooseFileName()
         {
             Logger.Info("DoChooseFileName: Retrieving previous settings");
-            WorkbookStorage.Store store = new WorkbookStorage.Store();
-            string defaultPath = UserSettings.UserSettings.Default.CsvPath;
-            Logger.Info("DoChooseFileName: Sending ChooseExportFileNameMessage");
-            ChooseExportFileNameMessage.Send(
-                new FileNameMessageContent(store.Get("csv_path", defaultPath),
-                    "CSV files|*.csv;*.txt;*.dat|All files|*.*"),
-                ConfirmChooseFileName);
+            using (WorkbookStorage.Store store = new WorkbookStorage.Store())
+            {
+                string defaultPath = UserSettings.UserSettings.Default.CsvPath;
+                Logger.Info("DoChooseFileName: Sending ChooseExportFileNameMessage");
+                ChooseExportFileNameMessage.Send(
+                    new FileNameMessageContent(store.Get("csv_path", defaultPath),
+                        "CSV files|*.csv;*.txt;*.dat|All files|*.*"),
+                    ConfirmChooseFileName);
+            }
         }
 
         private void ConfirmChooseFileName(FileNameMessageContent messageContent)

diff --git a/XLToolbox/Dispatcher.cs b/XLToolbox/Dispatcher.cs
@@ -414,7 +414,7 @@ static void Properties()
         static void JumpToTarget()
         {
             Xl.Range r = Instance.Default.Application.Selection as Xl.Range;
-            string value = Convert.ToString(r.Value2);
+            string value = (r == null) ? String.Empty : Convert.ToString(r.Value2);
             Jumper j = new Jumper(value);
             if (!j.Jump())
             {

diff --git a/XLToolbox/Excel/ViewModels/Instance.cs b/XLToolbox/Excel/ViewModels/Instance.cs
@@ -810,7 +810,9 @@ private void ConfirmQuitSavingChanges()
                         i, Workbooks.Count);
                     w.Save();
                 }
-                if (!w.Saved)
+                bool saved = w.Saved;
+                Bovender.ComHelpers.ReleaseComObject(w);
+                if (!saved)
                 {
                     Logger.Warn("ConfirmQuitSavingChanges: Workbook #{0} of {1} not saved: not quitting",
                         i, Workbooks.Count);
@@ -823,7 +825,6 @@ private void ConfirmQuitSavingChanges()
                 Logger.Info("ConfirmQuitSavingChanges: Proceeding to shutdown");
                 CloseAllWorkbooksThenShutdown();
             }
-            Bovender.ComHelpers.ReleaseComObject(w);
         }
 
         private bool CanQuitSavingChanges()

diff --git a/XLToolbox/Export/Models/BatchExportSettings.cs b/XLToolbox/Export/Models/BatchExportSettings.cs
@@ -57,21 +57,23 @@ public static BatchExportSettings FromLastUsed()
         /// if no such object exists.</returns>
         public static BatchExportSettings FromLastUsed(Workbook workbookContext)
         {
-            Store store = new Store(workbookContext);
-            BatchExportSettings settings = store.Get<BatchExportSettings>(
-                typeof(BatchExportSettings).ToString()
-                );
-            if (settings != null && settings.Preset != null)
-            {
-                // Replace the Preset object in the settings with the equivalent
-                // one from the PresetsRepository, or add
-                // it to the repository if no Preset with the same checksum hash exists.
-                settings.Preset = PresetsRepository.Default.FindOrAdd(settings.Preset);
-                return settings;
-            }
-            else
+            using (Store store = new Store(workbookContext))
             {
-                return BatchExportSettings.FromLastUsed();
+                BatchExportSettings settings = store.Get<BatchExportSettings>(
+                    typeof(BatchExportSettings).ToString()
+                    );
+                if (settings != null && settings.Preset != null)
+                {
+                    // Replace the Preset object in the settings with the equivalent
+                    // one from the PresetsRepository, or add
+                    // it to the repository if no Preset with the same checksum hash exists.
+                    settings.Preset = PresetsRepository.Default.FindOrAdd(settings.Preset);
+                    return settings;
+                }
+                else
+                {
+                    return BatchExportSettings.FromLastUsed();
+                }
             }
         }
 

diff --git a/XLToolbox/Export/Models/Preset.cs b/XLToolbox/Export/Models/Preset.cs
@@ -51,20 +51,22 @@ public static Preset FromLastUsed()
         /// <returns>Preset object or null.</returns>
         public static Preset FromLastUsed(Workbook workbookContext)
         {
-            Store store = new Store(workbookContext);
-            Preset preset = store.Get<Preset>(Properties.StoreNames.Default.ExportPreset);
-
-            if (preset != null)
-            {
-                // Return the equivalent Preset object from the current collection, or
-                // add the preset retrieved from the workbook to the current collection.
-                return PresetsRepository.Default.FindOrAdd(preset);
-            }
-            else
+            using (Store store = new Store(workbookContext))
             {
-                // Did not get a Preset from the workbook's Store, so let's try
-                // and offer the last used Preset from the UserSettings.
-                return FromLastUsed();
+                Preset preset = store.Get<Preset>(Properties.StoreNames.Default.ExportPreset);
+
+                if (preset != null)
+                {
+                    // Return the equivalent Preset object from the current collection, or
+                    // add the preset retrieved from the workbook to the current collection.
+                    return PresetsRepository.Default.FindOrAdd(preset);
+                }
+                else
+                {
+                    // Did not get a Preset from the workbook's Store, so let's try
+                    // and offer the last used Preset from the UserSettings.
+                    return FromLastUsed();
+                }
             }
         }
 

diff --git a/XLToolbox/Export/ViewModels/ScreenshotExporterViewModel.cs b/XLToolbox/Export/ViewModels/ScreenshotExporterViewModel.cs
@@ -76,14 +76,16 @@ private void DoChooseFileName()
             if (CanExportSelection())
             {
                 string defaultPath = UserSettings.UserSettings.Default.ExportPath;
-                WorkbookStorage.Store store = new WorkbookStorage.Store();
-                string path = store.Get(
-                    Properties.StoreNames.Default.ExportPath, defaultPath);
-                ChooseFileNameMessage.Send(
-                    new FileNameMessageContent(
-                        path,
-                        FileType.Png.ToFileFilter()),
-                    DoExportSelection);
+                using (WorkbookStorage.Store store = new WorkbookStorage.Store())
+                {
+                    string path = store.Get(
+                        Properties.StoreNames.Default.ExportPath, defaultPath);
+                    ChooseFileNameMessage.Send(
+                        new FileNameMessageContent(
+                            path,
+                            FileType.Png.ToFileFilter()),
+                        DoExportSelection);
+                }
             }
         }
 

diff --git a/XLToolbox/Export/ViewModels/SettingsViewModelBase.cs b/XLToolbox/Export/ViewModels/SettingsViewModelBase.cs
@@ -171,20 +171,22 @@ protected string LoadExportPath()
         {
             Logger.Info("LoadExportPath");
             Workbook wb = Excel.ViewModels.Instance.Default.ActiveWorkbook;
-            Store store = new Store(wb);
-            string defaultPath = UserSettings.UserSettings.Default.ExportPath;
-            if (String.IsNullOrEmpty(defaultPath))
+            using (Store store = new Store(wb))
             {
-                if (wb != null && !String.IsNullOrEmpty(wb.Path))
-                {
-                    defaultPath = System.IO.Path.GetDirectoryName(wb.Path);
-                }
-                else
+                string defaultPath = UserSettings.UserSettings.Default.ExportPath;
+                if (String.IsNullOrEmpty(defaultPath))
                 {
-                    defaultPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+                    if (wb != null && !String.IsNullOrEmpty(wb.Path))
+                    {
+                        defaultPath = System.IO.Path.GetDirectoryName(wb.Path);
+                    }
+                    else
+                    {
+                        defaultPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+                    }
                 }
+                return store.Get(Properties.StoreNames.Default.ExportPath, defaultPath);
             }
-            return store.Get(Properties.StoreNames.Default.ExportPath, defaultPath);
         }
 
         /// <summary>

diff --git a/XLToolbox/Properties/AssemblyInfo.cs b/XLToolbox/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.2.5.0")]
-[assembly: AssemblyFileVersion("7.2.5.0")]
+[assembly: AssemblyVersion("7.2.6.0")]
+[assembly: AssemblyFileVersion("7.2.6.0")]
diff --git a/XLToolbox/SheetManager/TaskPaneManager.cs b/XLToolbox/SheetManager/TaskPaneManager.cs
@@ -1,5 +1,4 @@
-using Microsoft.Office.Tools;
-/* SheetManagerPane.cs
+/* SheetManagerPane.cs
  * part of Daniel's XL Toolbox NG
  * 
  * Copyright 2014-2016 Daniel Kraus
@@ -20,6 +19,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Microsoft.Office.Tools;
 using XLToolbox.Excel.ViewModels;
 
 namespace XLToolbox.SheetManager

diff --git a/XLToolbox/Strings.Designer.cs b/XLToolbox/Strings.Designer.cs