[commit] r2021 - trunk/SDK/BON/Common

[GMESRC Repository Notifications]

Author: ksmyth
Date: Thu Aug 16 11:30:04 2012
New Revision: 2021

Log:
Dont require COCLASS_UUID_EXPLODED*

Modified:
   trunk/SDK/BON/Common/ComponentObj.cpp
   trunk/SDK/BON/Common/ComponentObj.h

Modified: trunk/SDK/BON/Common/ComponentObj.cpp
==============================================================================
--- trunk/SDK/BON/Common/ComponentObj.cpp	Thu Aug 16 11:29:54 2012	(r2020)
+++ trunk/SDK/BON/Common/ComponentObj.cpp	Thu Aug 16 11:30:04 2012	(r2021)
@@ -93,8 +93,6 @@
 
 #include "ComponentLib.h"
 
-#include "ComponentObj.h"
-
 #include "Console.h"
 
 
@@ -354,17 +352,17 @@
 // CLSID_MGAComponentClass
 
 IMPLEMENT_OLECREATE(CComponentObj, COCLASS_PROGID, 
-						   COCLASS_UUID_EXPLODED1,
-						   COCLASS_UUID_EXPLODED2,
-						   COCLASS_UUID_EXPLODED3,
-						   COCLASS_UUID_EXPLODED4,
-						   COCLASS_UUID_EXPLODED5,
-						   COCLASS_UUID_EXPLODED6,
-						   COCLASS_UUID_EXPLODED7,
-						   COCLASS_UUID_EXPLODED8,
-						   COCLASS_UUID_EXPLODED9,
-						   COCLASS_UUID_EXPLODED10,
-						   COCLASS_UUID_EXPLODED11)
+						   __uuidof(CComponentObj).Data1,
+						   __uuidof(CComponentObj).Data2,
+						   __uuidof(CComponentObj).Data3,
+						   __uuidof(CComponentObj).Data4[0],
+						   __uuidof(CComponentObj).Data4[1],
+						   __uuidof(CComponentObj).Data4[2],
+						   __uuidof(CComponentObj).Data4[3],
+						   __uuidof(CComponentObj).Data4[4],
+						   __uuidof(CComponentObj).Data4[5],
+						   __uuidof(CComponentObj).Data4[6],
+						   __uuidof(CComponentObj).Data4[7])
 
 /////////////////////////////////////////////////////////////////////////////
 // CComponentObj::XInterface

Modified: trunk/SDK/BON/Common/ComponentObj.h
==============================================================================
--- trunk/SDK/BON/Common/ComponentObj.h	Thu Aug 16 11:29:54 2012	(r2020)
+++ trunk/SDK/BON/Common/ComponentObj.h	Thu Aug 16 11:30:04 2012	(r2021)
@@ -79,7 +79,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // CComponentObj command target
 
-class CComponentObj : public CCmdTarget
+class __declspec(uuid(COCLASS_UUID)) CComponentObj : public CCmdTarget
 {
 
 	DECLARE_DYNCREATE(CComponentObj)