fix bug in variant -> sexp

empty value should be NA (int), not NULL

Author: duncanwerner

BERT/BERTAPI.cpp

@@ -84,7 +84,7 @@ SEXP __stdcall BERTAPI_CreateDispatch(const char *progid) {
 
 	}	
 	else {
-		std::cout << "cocreateinstance failed" << std::endl;
+		// std::cout << "cocreateinstance failed" << std::endl;
 		// FIXME: error
 	}
 
@@ -104,7 +104,8 @@ SEXP __stdcall BERTAPI_CreateExcelInstance() {
 
 		pdisp->AddRef();
 		int rc = pdisp->Release();
-		std::cout << "cocreateinstance succeeded (rc " << rc << ")" << std::endl;
+		
+		//std::cout << "cocreateinstance succeeded (rc " << rc << ")" << std::endl;
 
 		// create an outside env to hold the application and enums
 		SEXP e = PROTECT(R_tryEval(Rf_lang1(Rf_install("new.env")), R_GlobalEnv, &err));

BERT/RCOM.cpp

@@ -689,7 +689,7 @@ SEXP Variant2SEXP(CComVariant &cv) {
 
 		SEXP s = Rf_allocMatrix(VECSXP, rows, cols);
 		int index = 0;
-
+		
 		switch (vt) {
 		case VT_BSTR:
 		{
@@ -770,7 +770,9 @@ SEXP Variant2SEXP(CComVariant &cv) {
 
 	switch (vt) {
 	case VT_EMPTY:
-		return R_NilValue;
+		//return R_NilValue;
+		return ScalarInteger(R_NaInt);
+		//return R_NaString;
 	case VT_NULL:
 		return R_NilValue;
 	case VT_R4: