Fix N_SE-35983 issue

Change-Id: Ib0fb29c1140ec9b3255dae21aef4b38c1d48b609
Signed-off-by: TaeHo Choi <thanks.choi@samsung.com>

diff --git a/src/StAppSettingManager.cpp b/src/StAppSettingManager.cpp
index f0076cf..cc58ef0 100644 (file)
--- a/src/StAppSettingManager.cpp
+++ b/src/StAppSettingManager.cpp
@@ -1279,7 +1279,7 @@ AppSettingManager::XmlAppSettingFileRead(Tizen::Base::String filePath, ElementNo
 ElementNode*
 AppSettingManager::AddAppSettingRootNode(Tizen::Base::String rootId)
 {
-       ElementNode* pRoot = new ElementNode(rootId, L"Root");
+       ElementNode* pRoot = new (std::nothrow) ElementNode(rootId, L"Root");
        if (pRoot == null)
        {
                AppLogDebug("Root Create failed");

diff --git a/src/StDateTimeForm.cpp b/src/StDateTimeForm.cpp
index c4a29ee..59f5e01 100644 (file)
--- a/src/StDateTimeForm.cpp
+++ b/src/StDateTimeForm.cpp
@@ -567,7 +567,14 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
                pItem->AddControl(*pLabel);
-               relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               if (groupIndex == ID_GROUP_DATE_AND_TIME_FORMAT)
+               {
+                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON, 0, 0);
+               }
+               else
+               {
+                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               }
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 

diff --git a/src/StDownloadedApplicationForm.cpp b/src/StDownloadedApplicationForm.cpp
index 5184b79..7ce7268 100644 (file)
--- a/src/StDownloadedApplicationForm.cpp
+++ b/src/StDownloadedApplicationForm.cpp
@@ -465,8 +465,8 @@ DownloadedApplicationForm::SetAppIdListFromPackageManager(void)
                AppLogDebug("pPackageFilter Construct fail");
        }
 
-       String* pKey = new String("http://tizen.org/package/appsetting");
-       Boolean* pValue = new Boolean(true);
+       String* pKey = new (std::nothrow) String("http://tizen.org/package/appsetting");
+       Boolean* pValue = new (std::nothrow) Boolean(true);
 
        r = packageFilterMap.Add(pKey, pValue);
        if (IsFailed(r))
@@ -523,7 +523,7 @@ DownloadedApplicationForm::SetAppIdListFromPackageManager(void)
                                        for (int i=0; i<pCategoryList->GetCount(); ++i)
                                        {
                                                String* pCategory = static_cast<String*>(pCategoryList->GetAt(i));
-                                               if(pCategory->Equals(L"http://tizen.org/category/ime", false))
+                                               if (pCategory->Equals(L"http://tizen.org/category/ime", false))
                                                {
                                                        isIME = true;
                                                        break;

diff --git a/src/StScreenTypeForm.cpp b/src/StScreenTypeForm.cpp
index 7fbba0d..c4073ec 100644 (file)
--- a/src/StScreenTypeForm.cpp
+++ b/src/StScreenTypeForm.cpp
@@ -398,14 +398,14 @@ ScreenTypeForm::InitPackageInfoList(void)
        String* pKey = null;
        if (GetWallpaperIndex() == ID_INDEX_HOME_SCREEN_WALLPAPER)
        {
-               pKey = new String(L"http://tizen.org/category/homeapp");
+               pKey = new (std::nothrow) String(L"http://tizen.org/category/homeapp");
        }
        else
        {
-               pKey = new String(L"http://tizen.org/category/lockapp");
+               pKey = new (std::nothrow) String(L"http://tizen.org/category/lockapp");
        }
 
-       Boolean* pValue = new Boolean(true);
+       Boolean* pValue = new (std::nothrow) Boolean(true);
        r = packageAppFilterMap.Add(pKey, pValue);
 
        __pPackageAppInfoList = pPackageManager->GetPackageAppInfoListN(packageAppFilterMap);

diff --git a/src/StTimeZoneForm.cpp b/src/StTimeZoneForm.cpp
index 221af6d..f0e0916 100644 (file)
--- a/src/StTimeZoneForm.cpp
+++ b/src/StTimeZoneForm.cpp
@@ -517,11 +517,11 @@ TimeZoneForm::SortTimeZoneData(void)
 
        if (__sortTabSelect == IDA_FOOTER_ITEM_NAME)
        {
-               pTimeZoneSort = new TiemZoneComparer(DATA_TYPE_COUNTRY);
+               pTimeZoneSort = new (std::nothrow) TiemZoneComparer(DATA_TYPE_COUNTRY);
        }
        else
        {
-               pTimeZoneSort = new TiemZoneComparer(DATA_TYPE_GMT);
+               pTimeZoneSort = new (std::nothrow) TiemZoneComparer(DATA_TYPE_GMT);
        }
        __timeZoneSearchList->Sort(*pTimeZoneSort);
        delete pTimeZoneSort;
@@ -570,7 +570,7 @@ TimeZoneForm::OnTextValueChanged(const Tizen::Ui::Control& source)
                        String country(pData->GetCountryData());
                        Integer gmt = pData->GetGMTData();
 
-                       SetTimeZoneLocaleSearchList(new (std::nothrow)TimeZoneData(*pData));
+                       SetTimeZoneLocaleSearchList(new (std::nothrow) TimeZoneData(*pData));
                }
        }
 
@@ -578,7 +578,7 @@ TimeZoneForm::OnTextValueChanged(const Tizen::Ui::Control& source)
        {
                Integer noData;
                String noSearchData(ResourceManager::GetString(L"IDS_COM_BODY_NO_SEARCH_RESULTS"));
-               SetTimeZoneLocaleSearchList(new (std::nothrow)TimeZoneData(noSearchData, noSearchData, noData));
+               SetTimeZoneLocaleSearchList(new (std::nothrow) TimeZoneData(noSearchData, noSearchData, noData));
        }
        else
        {