[commit] r2368 - in trunk/GME: Interfaces Mga

[GMESRC Repository Notifications]

Author: ksmyth
Date: Tue Oct  1 14:12:58 2013
New Revision: 2368

Log:
Project::OpenEx: how does it work

Modified:
   trunk/GME/Interfaces/Mga.idl
   trunk/GME/Mga/MgaProject.cpp

Modified: trunk/GME/Interfaces/Mga.idl
==============================================================================
--- trunk/GME/Interfaces/Mga.idl	Fri Sep 27 13:49:15 2013	(r2367)
+++ trunk/GME/Interfaces/Mga.idl	Tue Oct  1 14:12:58 2013	(r2368)
@@ -414,6 +414,7 @@
 
 	[ helpstring("method Open (call when nothing is open)")] HRESULT Open([in] BSTR projectname,[out, defaultvalue(0)] VARIANT_BOOL *ro_mode);
 	[ helpstring("method OpenEx (call when nothing is open)")] 
+	// paradigmGUID==true means open with the currently-registered paradigm
 		HRESULT OpenEx([in] BSTR projectname, [in] BSTR paradigmname, [in] VARIANT paradigmGUID);
 	[ helpstring("method Close (call outside transaction)")] HRESULT Close([in, defaultvalue(0)] VARIANT_BOOL abort);
 	[ helpstring("method Save (call when outside transaction)")] HRESULT Save([in, defaultvalue("")] BSTR save_as_conn, [in, defaultvalue(0)] VARIANT_BOOL keepoldname);

Modified: trunk/GME/Mga/MgaProject.cpp
==============================================================================
--- trunk/GME/Mga/MgaProject.cpp	Fri Sep 27 13:49:15 2013	(r2367)
+++ trunk/GME/Mga/MgaProject.cpp	Tue Oct  1 14:12:58 2013	(r2368)
@@ -308,12 +308,14 @@
 			ver.Empty();
 			s = paradigmname;
 		}
-		if(paradigmGUID.vt != VT_EMPTY) {
+		if (paradigmGUID.vt != VT_EMPTY) {
 			ver.Empty();
-			if(CComVariant(true) == paradigmGUID) pGUID = NULLVARIANT;
-			else pGUID = paradigmGUID;
+			if (CComVariant(true) == paradigmGUID)
+				pGUID = NULLVARIANT; // use current version
+			else
+				pGUID = paradigmGUID;
 		}
-		if(s.Length()) {
+		if (s.Length()) {
 			if (ver.Length()) {
 				// Version string has precedence
 				COMTHROW(OpenParadigm(s,ver));