From 141cd5029a74d5a2136a9e238a9ec22017a69c0e Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Tue, 29 May 2012 11:40:51 +0200
Subject: [PATCH] 0000714: Merge project does not include DiffuseColor

---
 src/Gui/Document.cpp       | 2 +-
 src/Gui/MergeDocuments.cpp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp
index 4a0880ffa..0192d3e86 100644
--- a/src/Gui/Document.cpp
+++ b/src/Gui/Document.cpp
@@ -748,7 +748,7 @@ void Document::exportObjects(const std::vector<App::DocumentObject*>& obj, Base:
                     << views.size() <<"\">" << std::endl;
 
     bool xml = writer.isForceXML();
-    writer.setForceXML(true);
+    //writer.setForceXML(true);
     writer.incInd(); // indention for 'ViewProvider name'
     std::map<const App::DocumentObject*,ViewProvider*>::const_iterator jt;
     for (jt = views.begin(); jt != views.end(); ++jt) {
diff --git a/src/Gui/MergeDocuments.cpp b/src/Gui/MergeDocuments.cpp
index a1fc7172a..7addd29be 100644
--- a/src/Gui/MergeDocuments.cpp
+++ b/src/Gui/MergeDocuments.cpp
@@ -235,4 +235,8 @@ void MergeDocuments::RestoreDocFile(Base::Reader & reader)
     }
 
     xmlReader.readEndElement("Document");
+
+    // In the file GuiDocument.xml new data files might be added
+    if (!xmlReader.getFilenames().empty())
+        xmlReader.readFiles(static_cast<zipios::ZipInputStream&>(reader));
 }