- fixed bug in change attached template related to Normal template sc…

…enarios
desjarlais · May 26, 2021 · 56f3b0e · 56f3b0e
1 parent c4ba2bf
commit 56f3b0e
Show file tree

Hide file tree

Showing 24 changed files with 32 additions and 27 deletions.
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -31,5 +31,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("1.0.2.62")]
-[assembly: AssemblyFileVersion("1.0.2.62")]
+[assembly: AssemblyVersion("1.0.2.63")]
+[assembly: AssemblyFileVersion("1.0.2.63")]
diff --git a/WinForms/FrmMain.cs b/WinForms/FrmMain.cs
@@ -5943,16 +5943,20 @@ private void BtnChangeDefaultTemplate_Click(object sender, EventArgs e)
                     else
                     {
                         filePath = fromChangeTemplate;
-                        isFileChanged = true;
 
-                        // delete the old part
-                        dsp.DeleteExternalRelationship(attachedTemplateId);
+                        // delete the old part if it exists
+                        if (dsp.ExternalRelationships.Count() > 0)
+                        {
+                            dsp.DeleteExternalRelationship(attachedTemplateId);
+                            isFileChanged = true;
+                        }
 
+                        // if we aren't Normal, add a new part back in with the new path
                         if (fromChangeTemplate != "Normal")
                         {
-                            // add back the new path
                             Uri newFilePath = new Uri(filePath);
                             dsp.AddExternalRelationship(StringResources.DocumentTemplatePartType, newFilePath, attachedTemplateId);
+                            isFileChanged = true;
                         }
                         else
                         {
@@ -5962,6 +5966,7 @@ private void BtnChangeDefaultTemplate_Click(object sender, EventArgs e)
                                 if (oe.ToString() == "DocumentFormat.OpenXml.Wordprocessing.AttachedTemplate")
                                 {
                                     oe.Remove();
+                                    isFileChanged = true;
                                 }
                             }
                         }

diff --git a/bin/Debug/Office File Explorer.application b/bin/Debug/Office File Explorer.application
@@ -21,7 +21,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>12QMAkyI/2XnCGALa50PsVDK6Ci8WAUedu+sJ59bCDo=</dsig:DigestValue>
+        <dsig:DigestValue>hRjzqREVgkOjV798dMyqjIBErUVQRzJAEMWUF29dBV4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/bin/Debug/Office File Explorer.exe b/bin/Debug/Office File Explorer.exe
diff --git a/bin/Debug/Office File Explorer.exe.manifest b/bin/Debug/Office File Explorer.exe.manifest
@@ -62,7 +62,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>ClLuYv9njnZSG6L7ztBPJH4simwKbw9paUj6lNEcAIo=</dsig:DigestValue>
+        <dsig:DigestValue>T4O5hlruMmjZJbqIkvHvtsTIg8p1ju7nyHAqEEk0mLU=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/bin/Debug/Office File Explorer.pdb b/bin/Debug/Office File Explorer.pdb
diff --git a/bin/Debug/app.publish/Office File Explorer.exe b/bin/Debug/app.publish/Office File Explorer.exe
diff --git a/bin/Release/Office File Explorer.application b/bin/Release/Office File Explorer.application
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="Office File Explorer.application" version="1.0.2.58" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <assemblyIdentity name="Office File Explorer.application" version="1.0.2.62" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <description asmv2:publisher="BrandeSoft" asmv2:product="Office File Explorer" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true">
     <subscription>
@@ -15,13 +15,13 @@
   </compatibleFrameworks>
   <dependency>
     <dependentAssembly dependencyType="install" codebase="Office File Explorer.exe.manifest" size="10267">
-      <assemblyIdentity name="Office File Explorer.exe" version="1.0.2.58" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+      <assemblyIdentity name="Office File Explorer.exe" version="1.0.2.62" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>oAInpriVHP1OHTo1W73dWNVoEnZMuGPR0r8OycKcQZI=</dsig:DigestValue>
+        <dsig:DigestValue>b7aKtFxizVZ6i6GMnuKl8oYRDa94wgC8cqXcP9WsYAI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/bin/Release/Office File Explorer.exe b/bin/Release/Office File Explorer.exe
diff --git a/bin/Release/Office File Explorer.exe.manifest b/bin/Release/Office File Explorer.exe.manifest
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="Office File Explorer.exe" version="1.0.2.58" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+  <asmv1:assemblyIdentity name="Office File Explorer.exe" version="1.0.2.62" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
   <description asmv2:iconFile="1 (47).ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="Office File Explorer" version="1.0.2.58" language="neutral" processorArchitecture="msil" />
+    <assemblyIdentity name="Office File Explorer" version="1.0.2.63" language="neutral" processorArchitecture="msil" />
     <commandLine file="Office File Explorer.exe" parameters="" />
   </entryPoint>
   <trustInfo>
@@ -55,14 +55,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Office File Explorer.exe" size="3674624">
-      <assemblyIdentity name="Office File Explorer" version="1.0.2.58" language="neutral" processorArchitecture="msil" />
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Office File Explorer.exe" size="3676672">
+      <assemblyIdentity name="Office File Explorer" version="1.0.2.63" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>oL2GoFwDo5VbFy2qNZC4yjCdYybaIYjmZXc/mLcjLK8=</dsig:DigestValue>
+        <dsig:DigestValue>7o4vp1/tfAb/O9S76ShLd1FvlVRG+fOx1TkD9TSICFI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/bin/Release/Office File Explorer.pdb b/bin/Release/Office File Explorer.pdb
diff --git a/bin/Release/Office File Explorer.zip b/bin/Release/Office File Explorer.zip
diff --git a/bin/Release/app.publish/Office File Explorer.exe b/bin/Release/app.publish/Office File Explorer.exe
diff --git a/obj/Debug/Office File Explorer.application b/obj/Debug/Office File Explorer.application
@@ -21,7 +21,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>12QMAkyI/2XnCGALa50PsVDK6Ci8WAUedu+sJ59bCDo=</dsig:DigestValue>
+        <dsig:DigestValue>hRjzqREVgkOjV798dMyqjIBErUVQRzJAEMWUF29dBV4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/obj/Debug/Office File Explorer.exe b/obj/Debug/Office File Explorer.exe
diff --git a/obj/Debug/Office File Explorer.exe.manifest b/obj/Debug/Office File Explorer.exe.manifest
@@ -62,7 +62,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>ClLuYv9njnZSG6L7ztBPJH4simwKbw9paUj6lNEcAIo=</dsig:DigestValue>
+        <dsig:DigestValue>T4O5hlruMmjZJbqIkvHvtsTIg8p1ju7nyHAqEEk0mLU=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/obj/Debug/Office File Explorer.pdb b/obj/Debug/Office File Explorer.pdb
diff --git a/obj/Release/Office File Explorer.application b/obj/Release/Office File Explorer.application
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="Office File Explorer.application" version="1.0.2.58" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <assemblyIdentity name="Office File Explorer.application" version="1.0.2.62" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <description asmv2:publisher="BrandeSoft" asmv2:product="Office File Explorer" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true">
     <subscription>
@@ -15,13 +15,13 @@
   </compatibleFrameworks>
   <dependency>
     <dependentAssembly dependencyType="install" codebase="Office File Explorer.exe.manifest" size="10267">
-      <assemblyIdentity name="Office File Explorer.exe" version="1.0.2.58" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+      <assemblyIdentity name="Office File Explorer.exe" version="1.0.2.62" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>oAInpriVHP1OHTo1W73dWNVoEnZMuGPR0r8OycKcQZI=</dsig:DigestValue>
+        <dsig:DigestValue>b7aKtFxizVZ6i6GMnuKl8oYRDa94wgC8cqXcP9WsYAI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/obj/Release/Office File Explorer.csproj.FileListAbsolute.txt b/obj/Release/Office File Explorer.csproj.FileListAbsolute.txt
@@ -73,7 +73,6 @@ E:\GitHub\Office-File-Explorer\obj\Release\Office File Explorer.application
 E:\GitHub\Office-File-Explorer\obj\Release\Office File Explorer.csproj.CopyComplete
 E:\GitHub\Office-File-Explorer\obj\Release\Office File Explorer.exe
 E:\GitHub\Office-File-Explorer\obj\Release\Office File Explorer.pdb
-E:\GitHub\Office-File-Explorer\obj\Release\Office File Explorer.csprojAssemblyReference.cache
 E:\GitHub\Office-File-Explorer\obj\Release\Office_File_Explorer.Forms.FrmFixDocument.resources
 E:\GitHub\Office-File-Explorer\obj\Release\Office_File_Explorer.Forms.FrmClipboardViewer.resources
 E:\GitHub\Office-File-Explorer\obj\Release\Office_File_Explorer.Forms.FrmFontDetails.resources
@@ -85,3 +84,4 @@ E:\GitHub\Office-File-Explorer\obj\Release\Office_File_Explorer.Forms.FrmMoveSli
 E:\GitHub\Office-File-Explorer\obj\Release\Office_File_Explorer.Forms.FrmCustomXmlViewer.resources
 E:\GitHub\Office-File-Explorer\obj\Release\Office_File_Explorer.Forms.FrmViewImages.resources
 E:\GitHub\Office-File-Explorer\obj\Release\Office_File_Explorer.WinForms.FrmChangeTemplate.resources
+E:\GitHub\Office-File-Explorer\obj\Release\Office File Explorer.csproj.AssemblyReference.cache
diff --git a/obj/Release/Office File Explorer.exe b/obj/Release/Office File Explorer.exe
diff --git a/obj/Release/Office File Explorer.exe.manifest b/obj/Release/Office File Explorer.exe.manifest
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="Office File Explorer.exe" version="1.0.2.58" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+  <asmv1:assemblyIdentity name="Office File Explorer.exe" version="1.0.2.62" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
   <description asmv2:iconFile="1 (47).ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="Office File Explorer" version="1.0.2.58" language="neutral" processorArchitecture="msil" />
+    <assemblyIdentity name="Office File Explorer" version="1.0.2.63" language="neutral" processorArchitecture="msil" />
     <commandLine file="Office File Explorer.exe" parameters="" />
   </entryPoint>
   <trustInfo>
@@ -55,14 +55,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Office File Explorer.exe" size="3674624">
-      <assemblyIdentity name="Office File Explorer" version="1.0.2.58" language="neutral" processorArchitecture="msil" />
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Office File Explorer.exe" size="3676672">
+      <assemblyIdentity name="Office File Explorer" version="1.0.2.63" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>oL2GoFwDo5VbFy2qNZC4yjCdYybaIYjmZXc/mLcjLK8=</dsig:DigestValue>
+        <dsig:DigestValue>7o4vp1/tfAb/O9S76ShLd1FvlVRG+fOx1TkD9TSICFI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/obj/Release/Office File Explorer.pdb b/obj/Release/Office File Explorer.pdb
diff --git a/obj/Release/Office_File_Explorer.Properties.Resources.resources b/obj/Release/Office_File_Explorer.Properties.Resources.resources
diff --git a/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/obj/Release/TempPE/Properties.Resources.Designer.cs.dll