Fixed B/S

Change-Id: I8cb41a43950a16fc2c6979d8b8908e935a3d5e9e
Signed-off-by: HeeJu Kang <mobum.kang@samsung.com>

diff --git a/project/src/ViewForm.cpp b/project/src/ViewForm.cpp
index bc2c3e4..6564853 100644 (file)
--- a/project/src/ViewForm.cpp
+++ b/project/src/ViewForm.cpp
@@ -6,6 +6,7 @@
 #include <FShellLiveboxSizeInfo.h>
 #include "ViewForm.h"
 
+using namespace std;
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Graphics;
@@ -71,17 +72,21 @@ ViewForm::OnTerminating(void)
 void
 ViewForm::CreateLiveboxView(const Tizen::Base::String& appId, const Tizen::Base::String& providerName)
 {
-       __pLiveboxView = new LiveboxView();
-       if (__pLiveboxView)
+       unique_ptr<LiveboxView> pLiveboxView(new LiveboxView());
+       if (pLiveboxView)
        {
-               __pLiveboxView->Construct(appId, providerName, Rectangle(VIEW_X, VIEW_Y, VIEW_WIDTH, VIEW_HEIGHT));
-               AddControl(*__pLiveboxView);
+               result r = pLiveboxView->Construct(appId, providerName, Rectangle(VIEW_X, VIEW_Y, VIEW_WIDTH, VIEW_HEIGHT));
+               TryReturnVoid(r == E_SUCCESS, "[%s] Propagating.", GetErrorMessage(r));
+
+               AddControl(*pLiveboxView);
        }
 
+       __pLiveboxView = pLiveboxView.release();
+
        __pContextMenu = new (std::nothrow) ContextMenu();
        __pContextMenu->Construct(Point(CONTEXT_MENU_X, CONTEXT_MENU_Y), CONTEXT_MENU_STYLE_LIST);
 
-       std::unique_ptr<LiveboxProviderInfo> pProviderInfo(LiveboxManager::GetInstance()->GetLiveboxProviderInfoN(appId, providerName ));
+       unique_ptr<LiveboxProviderInfo> pProviderInfo(LiveboxManager::GetInstance()->GetLiveboxProviderInfoN(appId, providerName ));
        TryReturnVoid(pProviderInfo.get(), "pProviderInfo is null!!");
 
        __pSizeInfoList = pProviderInfo->GetSizeInfoListN();