Fixed N_SE-38563, N_SE-38552

[apps/osp/Settings.git] / src / StTimeZoneForm.cpp

diff --git a/src/StTimeZoneForm.cpp b/src/StTimeZoneForm.cpp
index 90336b3..0daca3f 100644 (file)
--- a/src/StTimeZoneForm.cpp
+++ b/src/StTimeZoneForm.cpp
@@ -157,8 +157,8 @@ TimeZoneForm::CreateTableView(void)
                pRelativeLayout->SetHorizontalFitPolicy(*__pSearchBar, FIT_POLICY_PARENT);
                pRelativeLayout->SetVerticalFitPolicy(*__pSearchBar, FIT_POLICY_FIXED);
                pRelativeLayout->SetHorizontalFitPolicy(*__pTableView, FIT_POLICY_PARENT);
-               pRelativeLayout->SetRelation(*__pTableView, *__pSearchBar, RECT_EDGE_RELATION_TOP_TO_BOTTOM);
-               pRelativeLayout->SetRelation(*__pTableView, *this, RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM);
+               pRelativeLayout->SetRelation(*__pTableView, __pSearchBar, RECT_EDGE_RELATION_TOP_TO_BOTTOM);
+               pRelativeLayout->SetRelation(*__pTableView, this, RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM);
                delete pRelativeLayout;
        }
 }
@@ -338,8 +338,8 @@ TimeZoneForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pItem->AddControl(pLabel);
 
                relativeLayout.SetMargin(*pLabel, itemMainRectangle.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);
+               relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+               relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
        }
        else
        {
@@ -399,9 +399,9 @@ TimeZoneForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pItem->AddControl(pSecLabel);
 
                relativeLayout.SetHorizontalFitPolicy(*pSecLabel, FIT_POLICY_FIXED);
-               relativeLayout.SetRelation(*pSecLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
-               relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
-               relativeLayout.SetRelation(*pLabel, *pSecLabel, RECT_EDGE_RELATION_RIGHT_TO_LEFT);
+               relativeLayout.SetRelation(*pSecLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+               relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+               relativeLayout.SetRelation(*pLabel, pSecLabel, RECT_EDGE_RELATION_RIGHT_TO_LEFT);
 
                pLabel = new (std::nothrow) Label();
                pLabel->Construct(itemSubRectangle, itemSubText);
@@ -412,8 +412,8 @@ TimeZoneForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                pItem->AddControl(pLabel);
                relativeLayout.SetMargin(*pLabel, itemSubRectangle.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);
+               relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+               relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
        }
 
        return pItem;
@@ -750,4 +750,4 @@ Tizen::Base::Integer
 TimeZoneData::GetGMTData(void) const
 {
        return _timeZoneGMT;
-}
\ No newline at end of file
+}