Merge 8e163f4434 into cb3f9e1972

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs

@@ -792,15 +792,24 @@ namespace Xceed.Wpf.AvalonDock.Layout
             reader.Read();
           }
 
-          while( true )
+          bool done = false;
+
+          while(!done)
           {
-            var result = ReadElement( reader ) as LayoutFloatingWindow;
+            var element = ReadElement(reader);
-            if( result == null )
+
+            switch (element)
             {
+                case LayoutFloatingWindow w:
+                    resultList.Add(element);
+                    break;
+                case LayoutAnchorable a:
+                    resultList.Add(element);
+                    break;
+                default:
+                    done = true;
                     break;
             }
-
-            resultList.Add( result );
           }
 
           reader.ReadEndElement();
@@ -808,6 +817,7 @@ namespace Xceed.Wpf.AvalonDock.Layout
           return resultList;
         }
         
+
         private object ReadElement( XmlReader reader )
         {
           if( reader.NodeType == XmlNodeType.EndElement )
@@ -925,10 +935,12 @@ namespace Xceed.Wpf.AvalonDock.Layout
           }
           writer.WriteEndElement();
             
-          writer.WriteStartElement( "Hidden" );
+          writer.WriteStartElement("Hiddens");
-          foreach( var layoutAnchorable in Hidden )
+          foreach (var layoutAnchorable in Hidden)
           {
-            layoutAnchorable.WriteXml( writer );
+            writer.WriteStartElement(layoutAnchorable.GetType().Name);
+            layoutAnchorable.WriteXml(writer);
+            writer.WriteEndElement();
           }
           writer.WriteEndElement();
         }