Change parsing function in ControlMaker

Change-Id: Ic72ebaf205df735b0dc3c3b08c128907c9569e4b
Signed-off-by: keonpyo.kong <keonpyo.kong@samsung.com>
apply code review

Change-Id: Ib8753b62b0dcb7adb9a57dbf9b3cbf3197418f43
Signed-off-by: keonpyo.kong <keonpyo.kong@samsung.com>
apply code review2

Change-Id: I167ae6e0b928c0f99aa4b97fa016ccb2702be549
Signed-off-by: keonpyo.kong <keonpyo.kong@samsung.com>

diff --git a/src/ui/FUi_UiBuilderControlLayout.cpp b/src/ui/FUi_UiBuilderControlLayout.cpp
index abbaa0b..0a2b5ee 100644 (file)
--- a/src/ui/FUi_UiBuilderControlLayout.cpp
+++ b/src/ui/FUi_UiBuilderControlLayout.cpp
@@ -21,7 +21,6 @@
 
 #include <stdlib.h>
 #include <FBaseSysLog.h>
-#include <FBaseFloat.h>
 #include "FUi_UiBuilder.h"
 #include "FUi_UiBuilderControlLayout.h"
 #include "FUi_CoordinateSystemUtils.h"
@@ -54,19 +53,19 @@ _UiBuilderControlLayout::SetRect(const Tizen::Base::String& x, const Tizen::Base
 
        if (x.IsEmpty() == false)
        {
-        Base::Float::Parse(x, floatX);
+            floatX = _CoordinateSystemUtils::ConvertToFloat(x);
        }
        if (y.IsEmpty() == false)
        {
-        Base::Float::Parse(y, floatY);
+            floatY = _CoordinateSystemUtils::ConvertToFloat(y);
        }
        if (width.IsEmpty() == false)
        {
-        Base::Float::Parse(width, floatWidth);
+            floatWidth = _CoordinateSystemUtils::ConvertToFloat(width);
        }
        if (height.IsEmpty() == false)
        {
-        Base::Float::Parse(height, floatHeight);
+            floatHeight = _CoordinateSystemUtils::ConvertToFloat(height);
        }
 
     __floatRect.x = floatX;

diff --git a/src/ui/controls/FUiCtrl_ButtonImpl.cpp b/src/ui/controls/FUiCtrl_ButtonImpl.cpp
index f43141c..0db9071 100644 (file)
--- a/src/ui/controls/FUiCtrl_ButtonImpl.cpp
+++ b/src/ui/controls/FUiCtrl_ButtonImpl.cpp
@@ -30,6 +30,7 @@
 #include "FUi_UiBuilder.h"
 #include "FUiCtrl_ButtonImpl.h"
 #include "FUiCtrl_Button.h"
+#include "FUi_CoordinateSystemUtils.h"
 
 using namespace Tizen::App;
 using namespace Tizen::Base;
@@ -699,7 +700,7 @@ protected:
 
                        if (pControl->GetElement(L"NormalBitmapX", elementString))
                        {
-                               Base::Float::Parse(elementString, position.x);
+                               position.x = _CoordinateSystemUtils::ConvertToFloat(elementString);
                                if ((position.x < 0.0f) || (position.x > ((Control*) (GetContainer()))->GetBoundsF().width - ((Control*) (GetContainer()))->GetBoundsF().x))
                                {
                                        position.x = 0.0f;
@@ -708,7 +709,7 @@ protected:
 
                        if (pControl->GetElement(L"NormalBitmapY", elementString))
                        {
-                               Base::Float::Parse(elementString, position.y);
+                               position.y = _CoordinateSystemUtils::ConvertToFloat(elementString);
                                if (position.y < 0.0f || (position.y > ((Control*) (GetContainer()))->GetBoundsF().width - ((Control*) (GetContainer()))->GetBoundsF().x))
                                {
                                        position.y = 0.0f;
@@ -730,7 +731,7 @@ protected:
                        pPressedBitmap = LoadBitmapN(elementString);
                        if (pControl->GetElement(L"PressedBitmapX", elementString))
                        {
-                               Base::Float::Parse(elementString, position.x);
+                               position.x = _CoordinateSystemUtils::ConvertToFloat(elementString);
                                if ((position.x < 0.0f) || (position.x > ((Control*) (GetContainer()))->GetBoundsF().width - ((Control*) (GetContainer()))->GetBoundsF().x))
                                {
                                        position.x = 0.0f;
@@ -739,7 +740,7 @@ protected:
 
                        if (pControl->GetElement(L"PressedBitmapY", elementString))
                        {
-                               Base::Float::Parse(elementString, position.y);
+                               position.y = _CoordinateSystemUtils::ConvertToFloat(elementString);
                                if (position.y < 0.0f || (position.y > ((Control*) (GetContainer()))->GetBoundsF().width - ((Control*) (GetContainer()))->GetBoundsF().x))
                                {
                                        position.y = 0.0f;
@@ -760,7 +761,7 @@ protected:
                        pDisabledBitmap = LoadBitmapN(elementString);
                        if (pControl->GetElement(L"DisabledBitmapX", elementString))
                        {
-                               Base::Float::Parse(elementString, position.x);
+                               position.x = _CoordinateSystemUtils::ConvertToFloat(elementString);
                                if ((position.x < 0.0f) || (position.x > ((Control*) (GetContainer()))->GetBoundsF().width - ((Control*) (GetContainer()))->GetBoundsF().x))
                                {
                                        position.x = 0.0f;
@@ -769,7 +770,7 @@ protected:
 
                        if (pControl->GetElement(L"DisabledBitmapY", elementString))
                        {
-                               Base::Float::Parse(elementString, position.y);
+                               position.y = _CoordinateSystemUtils::ConvertToFloat(elementString);
                                if (position.y < 0.0f || (position.y > ((Control*) (GetContainer()))->GetBoundsF().width - ((Control*) (GetContainer()))->GetBoundsF().x))
                                {
                                        position.y = 0.0f;
@@ -870,7 +871,7 @@ protected:
                {
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        
-                       Base::Float::Parse(elementString, size);
+                       size = _CoordinateSystemUtils::ConvertToFloat(elementString);
                        
                        if (pTransform)
                        {

diff --git a/src/ui/controls/FUiCtrl_EditAreaImpl.cpp b/src/ui/controls/FUiCtrl_EditAreaImpl.cpp
index 391501e..2d92dc6 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditAreaImpl.cpp
+++ b/src/ui/controls/FUiCtrl_EditAreaImpl.cpp
@@ -1758,7 +1758,7 @@ protected:
 
                if (pControl->GetElement(L"textSize", elementString))
                {
-                       Base::Float::Parse(elementString, fontSize);
+                       fontSize = _CoordinateSystemUtils::ConvertToFloat(elementString);                       
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {
@@ -1894,13 +1894,13 @@ protected:
 
                if (pControl->GetElement(L"horizontalMargin", elementString))
                {
-                       Base::Float::Parse(elementString, horizontalMargin);
+                       horizontalMargin= _CoordinateSystemUtils::ConvertToFloat(elementString);
                        r = pEditArea->SetMargin(EDIT_MARGIN_TYPE_HORIZONTAL, horizontalMargin);
                }
 
                if (pControl->GetElement(L"verticalMargin", elementString))
                {
-                       Base::Float::Parse(elementString, verticalMargin);
+                       verticalMargin= _CoordinateSystemUtils::ConvertToFloat(elementString);
                        r = pEditArea->SetMargin(EDIT_MARGIN_TYPE_VERTICAL, verticalMargin);
                }
                

diff --git a/src/ui/controls/FUiCtrl_EditFieldImpl.cpp b/src/ui/controls/FUiCtrl_EditFieldImpl.cpp
index 81ee48d..7da0e3e 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditFieldImpl.cpp
+++ b/src/ui/controls/FUiCtrl_EditFieldImpl.cpp
@@ -42,6 +42,7 @@
 #include "FUiCtrl_PublicScrollPanelEvent.h"
 #include "FUiCtrl_PublicTextBlockEvent.h"
 #include "FUiCtrl_PublicTextEvent.h"
+#include "FUi_CoordinateSystemUtils.h"
 
 using namespace Tizen::App;
 using namespace Tizen::Base;
@@ -2121,7 +2122,7 @@ protected:
 
                if (pControl->GetElement(L"textSize", elementString))
                {
-                       Base::Float::Parse(elementString, fontSize);
+                       fontSize = _CoordinateSystemUtils::ConvertToFloat(elementString);
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {
@@ -2260,13 +2261,13 @@ protected:
 
                if (pControl->GetElement(L"horizontalMargin", elementString))
                {
-                       Base::Float::Parse(elementString, horizontalMargin);
+                       horizontalMargin = _CoordinateSystemUtils::ConvertToFloat(elementString);
                        r = pEditField->SetMargin(EDIT_MARGIN_TYPE_HORIZONTAL, horizontalMargin);
                }
 
                if (pControl->GetElement(L"verticalMargin", elementString))
                {
-                       Base::Float::Parse(elementString, verticalMargin);
+                       verticalMargin = _CoordinateSystemUtils::ConvertToFloat(elementString);
                        r = pEditField->SetMargin(EDIT_MARGIN_TYPE_VERTICAL, verticalMargin);
                }
 

diff --git a/src/ui/controls/FUiCtrl_ExpandableEditAreaImpl.cpp b/src/ui/controls/FUiCtrl_ExpandableEditAreaImpl.cpp
index ff35d96..c1d0780 100644 (file)
--- a/src/ui/controls/FUiCtrl_ExpandableEditAreaImpl.cpp
+++ b/src/ui/controls/FUiCtrl_ExpandableEditAreaImpl.cpp
@@ -1802,7 +1802,7 @@ protected:
 
                if (pControl->GetElement(L"textSize", elementString))
                {
-                       Base::Float::Parse(elementString, textSize);
+                       textSize = _CoordinateSystemUtils::ConvertToFloat(elementString);
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {
@@ -1813,13 +1813,13 @@ protected:
 
                if (pControl->GetElement(L"verticalMargin", elementString))
                {
-                       Base::Float::Parse(elementString, verticalMarin);
+                       verticalMarin = _CoordinateSystemUtils::ConvertToFloat(elementString);
                        r = pExpandableEditArea->SetMargin(EDIT_MARGIN_TYPE_VERTICAL, verticalMarin);
                }
 
                if (pControl->GetElement(L"horizontalMargin", elementString))
                {
-                       Base::Float::Parse(elementString, horizontalMargin);
+                       horizontalMargin = _CoordinateSystemUtils::ConvertToFloat(elementString);
                        r = pExpandableEditArea->SetMargin(EDIT_MARGIN_TYPE_HORIZONTAL, horizontalMargin);
                }
 

diff --git a/src/ui/controls/FUiCtrl_GroupContainerImpl.cpp b/src/ui/controls/FUiCtrl_GroupContainerImpl.cpp
index 44d40f8..e3ec481 100644 (file)
--- a/src/ui/controls/FUiCtrl_GroupContainerImpl.cpp
+++ b/src/ui/controls/FUiCtrl_GroupContainerImpl.cpp
@@ -335,7 +335,7 @@ protected:
 
                if (pControl->GetElement("lineWidth", elementString))
                {
-                       Float::Parse(elementString, lineWidth);
+                       lineWidth = _CoordinateSystemUtils::ConvertToFloat(elementString);
                }
 
                rect = pControlProperty->GetRectF();

diff --git a/src/ui/controls/FUiCtrl_IconListViewImpl.cpp b/src/ui/controls/FUiCtrl_IconListViewImpl.cpp
index 5205089..86221cb 100755 (executable)
--- a/src/ui/controls/FUiCtrl_IconListViewImpl.cpp
+++ b/src/ui/controls/FUiCtrl_IconListViewImpl.cpp
@@ -29,6 +29,7 @@
 #include "FUiCtrl_IconListViewItemEventArg.h"
 #include "FUiCtrl_ScrollEvent.h"
 #include "FUiCtrl_ScrollEventArg.h"
+#include "FUi_CoordinateSystemUtils.h"
 
 using namespace Tizen::Base;
 using namespace Tizen::Graphics;
@@ -703,13 +704,13 @@ protected:
                // Get ItemBitmapSize(width)
                if (pControl->GetElement("itemBitmapWidth", elementString))
                {
-                       Base::Float::Parse(elementString, itemBitmapSize.width);
+                       itemBitmapSize.width = _CoordinateSystemUtils::ConvertToFloat(elementString);
                }
 
                // Get ItemBitmapSize(height)
                if (pControl->GetElement("itemBitmapHeight", elementString))
                {
-                       Base::Float::Parse(elementString, itemBitmapSize.height);
+                       itemBitmapSize.height = _CoordinateSystemUtils::ConvertToFloat(elementString);
                }
 
                // Get style
@@ -939,7 +940,7 @@ protected:
                if (pControl->GetElement("itemHorizontalSpacing", elementString))
                {
                        float spacing = 0.0f;
-                       Base::Float::Parse(elementString, spacing);
+                       spacing = _CoordinateSystemUtils::ConvertToFloat(elementString);
                        pIconListView->SetItemSpacing(spacing, pIconListView->GetItemVerticalSpacingF());
                }
 
@@ -947,7 +948,7 @@ protected:
                if (pControl->GetElement("itemVerticalSpacing", elementString))
                {
                        float spacing = 0.0f;
-                       Base::Float::Parse(elementString, spacing);
+                       spacing = _CoordinateSystemUtils::ConvertToFloat(elementString);
                        pIconListView->SetItemSpacing(pIconListView->GetItemHorizontalSpacingF(), spacing);
                }
 
@@ -955,7 +956,7 @@ protected:
                if (pControl->GetElement("itemTextSize", elementString))
                {
                        float size = 0.0f;
-                       Base::Float::Parse(elementString, size);
+                       size = _CoordinateSystemUtils::ConvertToFloat(elementString);
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {

diff --git a/src/ui/controls/FUiCtrl_LabelImpl.cpp b/src/ui/controls/FUiCtrl_LabelImpl.cpp
index e2abc2e..fdec721 100644 (file)
--- a/src/ui/controls/FUiCtrl_LabelImpl.cpp
+++ b/src/ui/controls/FUiCtrl_LabelImpl.cpp
@@ -28,6 +28,7 @@
 #include "FUi_UiBuilder.h"
 #include "FUiCtrl_LabelImpl.h"
 #include "FUiCtrl_Label.h"
+#include "FUi_CoordinateSystemUtils.h"
 
 
 using namespace Tizen::App;
@@ -481,7 +482,7 @@ protected:
 
                if (pControl->GetElement(L"textSize", elementString))
                {
-                       Base::Float::Parse(elementString, size);
+                       size = _CoordinateSystemUtils::ConvertToFloat(elementString);
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {

diff --git a/src/ui/controls/FUiCtrl_ScrollPanelImpl.cpp b/src/ui/controls/FUiCtrl_ScrollPanelImpl.cpp
index 924d70d..5321a10 100644 (file)
--- a/src/ui/controls/FUiCtrl_ScrollPanelImpl.cpp
+++ b/src/ui/controls/FUiCtrl_ScrollPanelImpl.cpp
@@ -33,6 +33,7 @@
 #include "FUiCtrl_ScrollEvent.h"
 #include "FUiCtrl_ScrollEventArg.h"
 #include "FUiCtrl_ScrollPanelImpl.h"
+#include "FUi_CoordinateSystemUtils.h"
 
 using namespace Tizen::App;
 using namespace Tizen::Graphics;
@@ -528,7 +529,7 @@ protected:
                                if (pControl->GetElement(L"clientAreaWidth", elementString) || pControl->GetElement(L"ClientAreaWidth", elementString))
                                {
                                        float width = 0.0f;
-                                       Base::Float::Parse(elementString, width);
+                                       width = _CoordinateSystemUtils::ConvertToFloat(elementString);
                                        pScrollPanel->SetClientAreaWidth(width);
                                }
                        }
@@ -538,7 +539,7 @@ protected:
                                if (pControl->GetElement(L"clientAreaHeight", elementString) || pControl->GetElement(L"ClientAreaHeight", elementString))
                                {
                                        float height = 0.0f;
-                                       Base::Float::Parse(elementString, height);
+                                       height = _CoordinateSystemUtils::ConvertToFloat(elementString);
                                        pScrollPanel->SetClientAreaWidth(height);
                                }
                        }

diff --git a/src/ui/controls/FUiCtrl_SearchBarImpl.cpp b/src/ui/controls/FUiCtrl_SearchBarImpl.cpp
index c6ea90b..b7acc4d 100755 (executable)
--- a/src/ui/controls/FUiCtrl_SearchBarImpl.cpp
+++ b/src/ui/controls/FUiCtrl_SearchBarImpl.cpp
@@ -1579,7 +1579,7 @@ protected:
 
                if (pControl->GetElement("searchFieldTextSize", elementString))
                {
-                       Base::Float::Parse(elementString, searchFieldTextSize);
+                       searchFieldTextSize = _CoordinateSystemUtils::ConvertToFloat(elementString);
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {

diff --git a/src/ui/controls/FUiCtrl_SplitPanelImpl.cpp b/src/ui/controls/FUiCtrl_SplitPanelImpl.cpp
index 7eecff0..962896b 100644 (file)
--- a/src/ui/controls/FUiCtrl_SplitPanelImpl.cpp
+++ b/src/ui/controls/FUiCtrl_SplitPanelImpl.cpp
@@ -448,19 +448,19 @@ protected:
 
                if (pControl->GetElement("minDividerPosition", elementString))
                {
-                       Base::Float::Parse(elementString, minDividerPosition);
+                       minDividerPosition = _CoordinateSystemUtils::ConvertToFloat(elementString);
                        pSplitPanel->SetMinimumDividerPosition(minDividerPosition);
                }
 
                if (pControl->GetElement("maxDividerPosition", elementString))
                {
-                       Base::Float::Parse(elementString, maxDividerPosition);
+                       maxDividerPosition = _CoordinateSystemUtils::ConvertToFloat(elementString);
                        pSplitPanel->SetMaximumDividerPosition(maxDividerPosition);
                }
 
                if (pControl->GetElement("dividerPosition", elementString))
                {
-                       Base::Float::Parse(elementString, dividerPosition);
+                       dividerPosition = _CoordinateSystemUtils::ConvertToFloat(elementString);
                        pSplitPanel->SetDividerPosition(dividerPosition);
                }
 

diff --git a/src/ui/controls/FUiCtrl_TextBoxImpl.cpp b/src/ui/controls/FUiCtrl_TextBoxImpl.cpp
index 33f65f9..bdec263 100644 (file)
--- a/src/ui/controls/FUiCtrl_TextBoxImpl.cpp
+++ b/src/ui/controls/FUiCtrl_TextBoxImpl.cpp
@@ -29,6 +29,7 @@
 #include "FUiCtrl_TextBoxImpl.h"
 #include "FUiCtrl_PublicTextBlockEvent.h"
 #include "FUiCtrl_PublicLinkEvent.h"
+#include "FUi_CoordinateSystemUtils.h"
 
 using namespace Tizen::Base;
 using namespace Tizen::Base::Runtime;
@@ -709,7 +710,7 @@ protected:
 
                if (pControl->GetElement("textSize", elementString))
                {
-                       Base::Float::Parse(elementString, textSize);
+                       textSize = _CoordinateSystemUtils::ConvertToFloat(elementString);
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {
@@ -720,8 +721,7 @@ protected:
 
                if (pControl->GetElement("lineSpacingExtra", elementString))
                {
-                       Base::Float::Parse(elementString, lineSpacingExtra);
-
+                       lineSpacingExtra = _CoordinateSystemUtils::ConvertToFloat(elementString);
                        if (pControl->GetElement("lineSpacingMultiplier", elementString))
                        {
                                Base::Integer::Parse(elementString, lineSpacingMultiplier);

diff --git a/src/ui/inc/FUi_CoordinateSystemUtils.h b/src/ui/inc/FUi_CoordinateSystemUtils.h
index 42d2b14..dd59241 100644 (file)
--- a/src/ui/inc/FUi_CoordinateSystemUtils.h
+++ b/src/ui/inc/FUi_CoordinateSystemUtils.h
@@ -26,8 +26,10 @@
 #define _FUI_INTERNAL_COORDINATE_SYSTEM_UTILS_H_
 
 #include <math.h>
+#include <unique_ptr.h>
 #include <FBaseSysLog.h>
 #include <FBaseErrors.h>
+#include <FBase_StringConverter.h>
 #include <FGrpFloatRectangle.h>
 #include <FGrpFloatPoint.h>
 #include <FGrpFloatDimension.h>
@@ -65,6 +67,18 @@ public:
        }
 
        static float
+       ConvertToFloat(const Tizen::Base::String& floatString)
+       {
+               if (floatString.IsEmpty() == true)
+               {
+                       return 0.0f;
+               }
+               std::unique_ptr<char[]> pFloatChar(Tizen::Base::_StringConverter::CopyToCharArrayN(floatString.GetPointer()));
+               float convertFolat = atof(pFloatChar.get());
+               return  convertFolat;
+       }
+
+       static float
        ConvertToFloat(int scalar)
        {
                return scalar;

diff --git a/src/ui/layout/FUi_LayoutLayoutMaker.cpp b/src/ui/layout/FUi_LayoutLayoutMaker.cpp
index 62ae7d7..0623fe4 100644 (file)
--- a/src/ui/layout/FUi_LayoutLayoutMaker.cpp
+++ b/src/ui/layout/FUi_LayoutLayoutMaker.cpp
@@ -33,6 +33,7 @@
 #include <FGrp_BitmapImpl.h>
 #include "FUi_UiBuilderControlMaker.h"
 #include "FUi_UiBuilder.h"
+#include "FUi_CoordinateSystemUtils.h"
 
 using namespace Tizen::Base;
 using namespace Tizen::Ui;
@@ -520,7 +521,7 @@ _LayoutMaker::SetGridLayoutContainerProperty(GridLayout* pLayout, _UiBuilderCont
 
                if (pControlProperty->GetLayoutElement(tempString, gridLayoutContainerPropertyValue))
                {
-                       Float::Parse(gridLayoutContainerPropertyValue, layoutParam.columnSpacing);
+                       layoutParam.columnSpacing = _CoordinateSystemUtils::ConvertToFloat(gridLayoutContainerPropertyValue);
                        r = layout.SetColumnSpacing(i - 1, layoutParam.columnSpacing);
                        if (IsFailed(r))
                        {
@@ -601,7 +602,7 @@ _LayoutMaker::SetGridLayoutContainerProperty(GridLayout* pLayout, _UiBuilderCont
 
                if (pControlProperty->GetLayoutElement(tempString, gridLayoutContainerPropertyValue))
                {
-                       Float::Parse(gridLayoutContainerPropertyValue, layoutParam.rowSpacing);
+                       layoutParam.rowSpacing = _CoordinateSystemUtils::ConvertToFloat(gridLayoutContainerPropertyValue);
                        r = layout.SetRowSpacing(i - 1, layoutParam.rowSpacing);
                        if (IsFailed(r))
                        {
@@ -684,7 +685,7 @@ _LayoutMaker::SetGridLayoutControlProperty(GridLayout* pLayout, _UiBuilderContro
        if (pControlProperty->GetLayoutElement(L"marginLeft", gridLayoutValue))
        {
                marginSet = true;
-               Float::Parse(gridLayoutValue, layoutParam.marginLeft);
+               layoutParam.marginLeft = _CoordinateSystemUtils::ConvertToFloat(gridLayoutValue);
                if (pTransform)
                {
 
@@ -694,7 +695,7 @@ _LayoutMaker::SetGridLayoutControlProperty(GridLayout* pLayout, _UiBuilderContro
        if (pControlProperty->GetLayoutElement(L"marginRight", gridLayoutValue))
        {
                marginSet = true;
-               Float::Parse(gridLayoutValue, layoutParam.marginRight);
+               layoutParam.marginRight = _CoordinateSystemUtils::ConvertToFloat(gridLayoutValue);
                if (pTransform)
                {
 
@@ -704,7 +705,7 @@ _LayoutMaker::SetGridLayoutControlProperty(GridLayout* pLayout, _UiBuilderContro
        if (pControlProperty->GetLayoutElement(L"marginTop", gridLayoutValue))
        {
                marginSet = true;
-               Float::Parse(gridLayoutValue, layoutParam.marginTop);
+               layoutParam.marginTop = _CoordinateSystemUtils::ConvertToFloat(gridLayoutValue);
                if (pTransform)
                {
 
@@ -714,7 +715,7 @@ _LayoutMaker::SetGridLayoutControlProperty(GridLayout* pLayout, _UiBuilderContro
        if (pControlProperty->GetLayoutElement(L"marginBottom", gridLayoutValue))
        {
                marginSet = true;
-               Float::Parse(gridLayoutValue, layoutParam.marginBottom);
+               layoutParam.marginBottom = _CoordinateSystemUtils::ConvertToFloat(gridLayoutValue);
                if (pTransform)
                {
 
@@ -773,7 +774,7 @@ _LayoutMaker::SetHorizontalBoxLayoutProperty(HorizontalBoxLayout* pLayout, _UiBu
 
        if (pControlProperty->GetLayoutElement(L"height", horizontalBoxLayoutValue))
        {
-               Float::Parse(horizontalBoxLayoutValue, layoutParam.height);
+               layoutParam.height = _CoordinateSystemUtils::ConvertToFloat(horizontalBoxLayoutValue);
                if (pTransform)
                {
 
@@ -835,7 +836,7 @@ _LayoutMaker::SetHorizontalBoxLayoutProperty(HorizontalBoxLayout* pLayout, _UiBu
        if (pControlProperty->GetLayoutElement(L"verticalTopMargin", horizontalBoxLayoutValue))
        {
                marginSet = true;
-               Float::Parse(horizontalBoxLayoutValue, layoutParam.verticalTopMargin);
+               layoutParam.verticalTopMargin = _CoordinateSystemUtils::ConvertToFloat(horizontalBoxLayoutValue);
                if (pTransform)
                {
 
@@ -845,7 +846,7 @@ _LayoutMaker::SetHorizontalBoxLayoutProperty(HorizontalBoxLayout* pLayout, _UiBu
        if (pControlProperty->GetLayoutElement(L"verticalBottomMargin", horizontalBoxLayoutValue))
        {
                marginSet = true;
-               Float::Parse(horizontalBoxLayoutValue, layoutParam.verticalBottomMargin);
+               layoutParam.verticalBottomMargin = _CoordinateSystemUtils::ConvertToFloat(horizontalBoxLayoutValue);
                if (pTransform)
                {
 
@@ -859,7 +860,7 @@ _LayoutMaker::SetHorizontalBoxLayoutProperty(HorizontalBoxLayout* pLayout, _UiBu
 
        if (pControlProperty->GetLayoutElement(L"spacing", horizontalBoxLayoutValue))
        {
-               Float::Parse(horizontalBoxLayoutValue, layoutParam.spacing);
+               layoutParam.spacing = _CoordinateSystemUtils::ConvertToFloat(horizontalBoxLayoutValue);
                if (pTransform)
                {
 
@@ -874,7 +875,7 @@ _LayoutMaker::SetHorizontalBoxLayoutProperty(HorizontalBoxLayout* pLayout, _UiBu
 
        if (pControlProperty->GetLayoutElement(L"weight", horizontalBoxLayoutValue))
        {
-               Float::Parse(horizontalBoxLayoutValue, layoutParam.weight);
+               layoutParam.weight = _CoordinateSystemUtils::ConvertToFloat(horizontalBoxLayoutValue);
                layout.SetWeight(control, layoutParam.weight);
        }
        else
@@ -884,7 +885,7 @@ _LayoutMaker::SetHorizontalBoxLayoutProperty(HorizontalBoxLayout* pLayout, _UiBu
 
        if (pControlProperty->GetLayoutElement(L"width", horizontalBoxLayoutValue))
        {
-               Float::Parse(horizontalBoxLayoutValue, layoutParam.width);
+               layoutParam.width = _CoordinateSystemUtils::ConvertToFloat(horizontalBoxLayoutValue);
                if (pTransform)
                {
 
@@ -935,7 +936,7 @@ _LayoutMaker::SetVerticalBoxLayoutProperty(VerticalBoxLayout* pLayout, _UiBuilde
 
        if (pControlProperty->GetLayoutElement(L"height", verticalBoxLayoutValue))
        {
-               Float::Parse(verticalBoxLayoutValue, layoutParam.height);
+               layoutParam.height = _CoordinateSystemUtils::ConvertToFloat(verticalBoxLayoutValue);
                if (pTransform)
                {
 
@@ -997,7 +998,7 @@ _LayoutMaker::SetVerticalBoxLayoutProperty(VerticalBoxLayout* pLayout, _UiBuilde
        if (pControlProperty->GetLayoutElement(L"horizontalLeftMargin", verticalBoxLayoutValue))
        {
                marginSet = true;
-               Float::Parse(verticalBoxLayoutValue, layoutParam.horizontalLeftMargin);
+               layoutParam.horizontalLeftMargin = _CoordinateSystemUtils::ConvertToFloat(verticalBoxLayoutValue);
                if (pTransform)
                {
                        layoutParam.horizontalLeftMargin = pTransform->Transform(layoutParam.horizontalLeftMargin);
@@ -1006,7 +1007,7 @@ _LayoutMaker::SetVerticalBoxLayoutProperty(VerticalBoxLayout* pLayout, _UiBuilde
        if (pControlProperty->GetLayoutElement(L"horizontalRightMargin", verticalBoxLayoutValue))
        {
                marginSet = true;
-               Float::Parse(verticalBoxLayoutValue, layoutParam.horizontalRightMargin);
+               layoutParam.horizontalRightMargin = _CoordinateSystemUtils::ConvertToFloat(verticalBoxLayoutValue);
                if (pTransform)
                {
                        layoutParam.horizontalRightMargin = pTransform->Transform(layoutParam.horizontalRightMargin);
@@ -1019,7 +1020,7 @@ _LayoutMaker::SetVerticalBoxLayoutProperty(VerticalBoxLayout* pLayout, _UiBuilde
 
        if (pControlProperty->GetLayoutElement(L"spacing", verticalBoxLayoutValue))
        {
-               Float::Parse(verticalBoxLayoutValue, layoutParam.spacing);
+               layoutParam.spacing = _CoordinateSystemUtils::ConvertToFloat(verticalBoxLayoutValue);
                if (pTransform)
                {
                        layoutParam.spacing = pTransform->Transform(layoutParam.spacing);
@@ -1034,7 +1035,7 @@ _LayoutMaker::SetVerticalBoxLayoutProperty(VerticalBoxLayout* pLayout, _UiBuilde
 
        if (pControlProperty->GetLayoutElement(L"weight", verticalBoxLayoutValue))
        {
-               Float::Parse(verticalBoxLayoutValue, layoutParam.weight);
+               layoutParam.weight = _CoordinateSystemUtils::ConvertToFloat(verticalBoxLayoutValue);
                layout.SetWeight(control, layoutParam.weight);
        }
        else
@@ -1044,7 +1045,7 @@ _LayoutMaker::SetVerticalBoxLayoutProperty(VerticalBoxLayout* pLayout, _UiBuilde
 
        if (pControlProperty->GetLayoutElement(L"width", verticalBoxLayoutValue))
        {
-               Float::Parse(verticalBoxLayoutValue, layoutParam.width);
+               layoutParam.width = _CoordinateSystemUtils::ConvertToFloat(verticalBoxLayoutValue);
                if (pTransform)
                {
                        layoutParam.width = pTransform->Transform(layoutParam.width);
@@ -1346,7 +1347,7 @@ _LayoutMaker::SetRelativeLayoutProperty(RelativeLayout* pLayout, _UiBuilderContr
        if (pControlProperty->GetLayoutElement(L"marginLeft", relativeLayoutValue))
        {
                marginSet = true;
-               Float::Parse(relativeLayoutValue, layoutParam.marginLeft);
+               layoutParam.marginLeft = _CoordinateSystemUtils::ConvertToFloat(relativeLayoutValue);
                if (pTransform)
                {
 
@@ -1356,7 +1357,7 @@ _LayoutMaker::SetRelativeLayoutProperty(RelativeLayout* pLayout, _UiBuilderContr
        if (pControlProperty->GetLayoutElement(L"marginRight", relativeLayoutValue))
        {
                marginSet = true;
-               Float::Parse(relativeLayoutValue, layoutParam.marginRight);
+               layoutParam.marginRight = _CoordinateSystemUtils::ConvertToFloat(relativeLayoutValue);
                if (pTransform)
                {
 
@@ -1366,7 +1367,7 @@ _LayoutMaker::SetRelativeLayoutProperty(RelativeLayout* pLayout, _UiBuilderContr
        if (pControlProperty->GetLayoutElement(L"marginTop", relativeLayoutValue))
        {
                marginSet = true;
-               Float::Parse(relativeLayoutValue, layoutParam.marginTop);
+               layoutParam.marginTop = _CoordinateSystemUtils::ConvertToFloat(relativeLayoutValue);
                if (pTransform)
                {
 
@@ -1376,7 +1377,7 @@ _LayoutMaker::SetRelativeLayoutProperty(RelativeLayout* pLayout, _UiBuilderContr
        if (pControlProperty->GetLayoutElement(L"marginBottom", relativeLayoutValue))
        {
                marginSet = true;
-               Float::Parse(relativeLayoutValue, layoutParam.marginBottom);
+               layoutParam.marginBottom = _CoordinateSystemUtils::ConvertToFloat(relativeLayoutValue);         
                if (pTransform)
                {