[commit] r1428 - in trunk/GME: Gme MgaUtil

[GMESRC Repository Notifications]

Author: ksmyth
Date: Mon Jul 25 12:55:31 2011
New Revision: 1428

Log:
Dont show an error dialog after user cancels paste->as reference

Modified:
   trunk/GME/Gme/GMEView.cpp
   trunk/GME/MgaUtil/MgaResolver.cpp

Modified: trunk/GME/Gme/GMEView.cpp
==============================================================================
--- trunk/GME/Gme/GMEView.cpp	Mon Jul 25 12:25:07 2011	(r1427)
+++ trunk/GME/Gme/GMEView.cpp	Mon Jul 25 12:55:31 2011	(r1428)
@@ -3634,7 +3634,12 @@
 #pragma warning(disable: 4310) // cast truncates constant value
 								COMTHROW(doc->resolver->put_IsStickyEnabled(::GetKeyState(VK_SHIFT) < 0 ? VARIANT_FALSE :VARIANT_TRUE));
 #pragma warning(default: 4310) // cast truncates constant value
-								COMTHROW(doc->resolver->get_RefRoleByMeta(currentModel,aspect,fco,&role));
+								HRESULT hr = doc->resolver->get_RefRoleByMeta(currentModel,aspect,fco,&role);
+								if (hr == E_ABORT) {
+									return false;
+								} else {
+									COMTHROW(hr);
+								}
 								if(role == 0)
 								{
 									AfxMessageBox(_T("Cannot create reference"));

Modified: trunk/GME/MgaUtil/MgaResolver.cpp
==============================================================================
--- trunk/GME/MgaUtil/MgaResolver.cpp	Mon Jul 25 12:25:07 2011	(r1427)
+++ trunk/GME/MgaUtil/MgaResolver.cpp	Mon Jul 25 12:55:31 2011	(r1428)
@@ -1498,7 +1498,7 @@
 		if (valid_role_count > 0) {
 
 			if ((cdl.DoModal() != IDOK) || (cdl.mn_selection_index == LB_ERR)) {
-				return RESOLV_ERR_get_ConnRoleByMeta;
+				return E_ABORT;
 
 			} else {
 
@@ -1796,7 +1796,7 @@
 		if (valid_role_count > 0) {
 
 			if (cdl.DoModal() != IDOK) {
-				return RESOLV_ERR_get_ConnRoleByMeta;
+				return E_ABORT;
 
 			} else {