[commit] r2772 - trunk/GME/Parser

[GMESRC Repository Notifications]

Author: ksmyth
Date: Mon Jul  8 13:30:40 2019
New Revision: 2772

Log:
XME serialization: sort by GUID and role name

Modified:
   trunk/GME/Parser/MgaDumper.cpp

Modified: trunk/GME/Parser/MgaDumper.cpp
==============================================================================
--- trunk/GME/Parser/MgaDumper.cpp	Mon Jul  8 13:30:35 2019	(r2771)
+++ trunk/GME/Parser/MgaDumper.cpp	Mon Jul  8 13:30:40 2019	(r2772)
@@ -175,7 +175,7 @@
 		DoneDump(true);
 		if (m_progress != NULL )
 		{
-			COMTHROW(m_progress->StopProgressDialog());
+			m_progress->StopProgressDialog();
 			m_progress = NULL;
 		}
 	)
@@ -1508,16 +1508,10 @@
 	std::vector<std::tstring> vPrime;
 	for (int i=0; i<n; i++)
 	{
-		CComBSTR bstr;
-		CComPtr<IMgaFCO> fco;
-		COMTHROW((*v)[i]->get_Target(&fco));
-		COMTHROW(fco->get_ID(&bstr));
 		std::tstring s;
-		CopyTo(bstr,s);
-		// Tie-break sort on role, for self-connections
 		CComBSTR role;
 		COMTHROW((*v)[i]->get_ConnRole(&role));
-		s += role;
+		CopyTo(role, s);
 		vPrime.push_back(s);
 	}
 	
@@ -1554,7 +1548,7 @@
 	for (int i=0; i<n; i++)
 	{
 		CComBSTR bstr;
-		COMTHROW((*v)[i]->get_ID(&bstr));
+		COMTHROW((*v)[i]->GetGuidDisp(&bstr));
 		std::tstring s;
 		CopyTo(bstr,s);
 		vPrime.push_back(s);
@@ -1594,7 +1588,7 @@
 	for (int i=0; i<n; i++)
 	{
 		CComBSTR bstr;
-		COMTHROW((*v)[i]->get_ID(&bstr));
+		COMTHROW((*v)[i]->GetGuidDisp(&bstr));
 		std::tstring s;
 		CopyTo(bstr,s);
 		vPrime.push_back(s);