[msvc] Update csproj files

[mono.git] / mcs / class / WindowsBase / System.IO.Packaging / Package.cs

diff --git a/mcs/class/WindowsBase/System.IO.Packaging/Package.cs b/mcs/class/WindowsBase/System.IO.Packaging/Package.cs
old mode 100644 (file)
new mode 100755 (executable)
index d7b71c3..002d592
--- a/mcs/class/WindowsBase/System.IO.Packaging/Package.cs
+++ b/mcs/class/WindowsBase/System.IO.Packaging/Package.cs
@@ -94,15 +94,15 @@ namespace System.IO.Packaging {
                }
                
                
-               protected Package (FileAccess fileOpenAccess)
-                       : this (fileOpenAccess, false)
+               protected Package (FileAccess openFileAccess)
+                       : this (openFileAccess, false)
                {
                        
                }
 
-               protected Package (FileAccess fileOpenAccess, bool streaming)
+               protected Package (FileAccess openFileAccess, bool streaming)
                {
-                       FileOpenAccess = fileOpenAccess;
+                       FileOpenAccess = openFileAccess;
                        Streaming = streaming;
                }
 
@@ -138,7 +138,7 @@ namespace System.IO.Packaging {
                        return part;
                }
                
-               protected abstract PackagePart CreatePartCore (Uri parentUri, string contentType, CompressionOption compressionOption);
+               protected abstract PackagePart CreatePartCore (Uri partUri, string contentType, CompressionOption compressionOption);
 
                public PackageRelationship CreateRelationship (Uri targetUri, TargetMode targetMode, string relationshipType)
                {
@@ -404,7 +404,12 @@ namespace System.IO.Packaging {
                                throw new FileFormatException ("Stream length cannot be zero with FileMode.Open");
 
                        Stream s = File.Open (path, packageMode, packageAccess, packageShare);
-                       return Open (s, packageMode, packageAccess, true);
+                       try {
+                               return Open (s, packageMode, packageAccess, true);
+                       } catch {
+                               s.Close  ();
+                               throw;
+                       }
                }
 
                static Package OpenCore (Stream stream, FileMode packageMode, FileAccess packageAccess, bool ownsStream)
@@ -457,6 +462,8 @@ namespace System.IO.Packaging {
 
                internal static void WriteRelationships (Dictionary <string, PackageRelationship> relationships, Stream stream)
                {
+                       stream.SetLength(0);
+
                        XmlDocument doc = new XmlDocument ();
                        XmlNamespaceManager manager = new XmlNamespaceManager (doc.NameTable);
                        manager.AddNamespace ("rel", RelationshipNamespace);