Sync BaseTool trunk (version r2640) into EDKII BaseTools.

[mirror_edk2.git] / BaseTools / Source / C / VfrCompile / VfrFormPkg.cpp

diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
index 363ca82a241bfb46866f7f24d562f258b882529b..addff24cf6d66bd7e7066ddf2751d2dce671dbb6 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
@@ -855,17 +855,6 @@ CFormPkg::DeclarePendingQuestion (
       // Get VarStoreType\r
       //\r
       ReturnCode = lCVfrDataStorage.GetVarStoreId (FName, &Info.mVarStoreId);\r
-      if (ReturnCode == VFR_RETURN_UNDEFINED) {\r
-        lCVfrDataStorage.DeclareBufferVarStore (\r
-                           FName, \r
-                           LocalFormSetGuid, \r
-                           &lCVfrVarDataTypeDB, \r
-                           FName,\r
-                           EFI_VARSTORE_ID_INVALID,\r
-                           FALSE\r
-                           );\r
-        ReturnCode = lCVfrDataStorage.GetVarStoreId (FName, &Info.mVarStoreId, LocalFormSetGuid); \r
-      }\r
       if (ReturnCode != VFR_RETURN_SUCCESS) {\r
         gCVfrErrorHandle.PrintMsg (pNode->mLineNo, FName, "Error", "Var Store Type is not defined");\r
         return ReturnCode;\r