apply localized parser

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

diff --git a/src/ui/controls/FUiCtrl_ButtonImpl.cpp b/src/ui/controls/FUiCtrl_ButtonImpl.cpp
index 4c34840..6c881ff 100644 (file)
--- a/src/ui/controls/FUiCtrl_ButtonImpl.cpp
+++ b/src/ui/controls/FUiCtrl_ButtonImpl.cpp
@@ -22,6 +22,7 @@
 #include <FAppApplication.h>
 #include <FBaseInternalTypes.h>
 #include <FBaseSysLog.h>
+#include <FBase_LocalizedNumParser.h>
 #include <FUiAccessibilityContainer.h>
 #include <FUiAccessibilityElement.h>
 #include <FApp_AppInfo.h>
@@ -694,7 +695,7 @@ protected:
 
                        if (pControl->GetElement(L"NormalBitmapX", elementString))
                        {
-                               position.x = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                               position.x = _LocalizedNumParser::ToDouble(elementString, "C");
                                if ((position.x < 0.0f) || (position.x > ((Control*) (GetContainer()))->GetBoundsF().width - ((Control*) (GetContainer()))->GetBoundsF().x))
                                {
                                        position.x = 0.0f;
@@ -703,7 +704,7 @@ protected:
 
                        if (pControl->GetElement(L"NormalBitmapY", elementString))
                        {
-                               position.y = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                               position.y = _LocalizedNumParser::ToDouble(elementString, "C");
                                if (position.y < 0.0f || (position.y > ((Control*) (GetContainer()))->GetBoundsF().height - ((Control*) (GetContainer()))->GetBoundsF().y))
                                {
                                        position.y = 0.0f;
@@ -725,7 +726,7 @@ protected:
                        pPressedBitmap = LoadBitmapN(elementString);
                        if (pControl->GetElement(L"PressedBitmapX", elementString))
                        {
-                               position.x = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                               position.x = _LocalizedNumParser::ToDouble(elementString, "C");
                                if ((position.x < 0.0f) || (position.x > ((Control*) (GetContainer()))->GetBoundsF().width - ((Control*) (GetContainer()))->GetBoundsF().x))
                                {
                                        position.x = 0.0f;
@@ -734,7 +735,7 @@ protected:
 
                        if (pControl->GetElement(L"PressedBitmapY", elementString))
                        {
-                               position.y = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                               position.y =_LocalizedNumParser::ToDouble(elementString, "C");
                                if (position.y < 0.0f || (position.y > ((Control*) (GetContainer()))->GetBoundsF().height - ((Control*) (GetContainer()))->GetBoundsF().y))
                                {
                                        position.y = 0.0f;
@@ -755,7 +756,7 @@ protected:
                        pDisabledBitmap = LoadBitmapN(elementString);
                        if (pControl->GetElement(L"DisabledBitmapX", elementString))
                        {
-                               position.x = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                               position.x = _LocalizedNumParser::ToDouble(elementString, "C");
                                if ((position.x < 0.0f) || (position.x > ((Control*) (GetContainer()))->GetBoundsF().width - ((Control*) (GetContainer()))->GetBoundsF().x))
                                {
                                        position.x = 0.0f;
@@ -764,7 +765,7 @@ protected:
 
                        if (pControl->GetElement(L"DisabledBitmapY", elementString))
                        {
-                               position.y = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                               position.y = _LocalizedNumParser::ToDouble(elementString, "C");
                                if (position.y < 0.0f || (position.y > ((Control*) (GetContainer()))->GetBoundsF().height - ((Control*) (GetContainer()))->GetBoundsF().y))
                                {
                                        position.y = 0.0f;
@@ -785,7 +786,7 @@ protected:
                        pHighlightedBitmap = LoadBitmapN(elementString);
                        if (pControl->GetElement(L"HighlightedBitmapX", elementString))
                        {
-                               position.x = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                               position.x = _LocalizedNumParser::ToDouble(elementString, "C");
                                if ((position.x < 0.0f) || (position.x > ((Control*) (GetContainer()))->GetBoundsF().width - ((Control*) (GetContainer()))->GetBoundsF().x))
                                {
                                        position.x = 0.0f;
@@ -794,7 +795,7 @@ protected:
 
                        if (pControl->GetElement(L"HighlightedBitmapY", elementString))
                        {
-                               position.y = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                               position.y = _LocalizedNumParser::ToDouble(elementString, "C");
                                if (position.y < 0.0f || (position.y > ((Control*) (GetContainer()))->GetBoundsF().height - ((Control*) (GetContainer()))->GetBoundsF().y))
                                {
                                        position.y = 0.0f;
@@ -906,7 +907,7 @@ protected:
                {
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
 
-                       size = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       size = _LocalizedNumParser::ToDouble(elementString, "C");
 
                        if (pTransform)
                        {

diff --git a/src/ui/controls/FUiCtrl_EditAreaImpl.cpp b/src/ui/controls/FUiCtrl_EditAreaImpl.cpp
index 0f401f4..67f410b 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditAreaImpl.cpp
+++ b/src/ui/controls/FUiCtrl_EditAreaImpl.cpp
@@ -23,6 +23,7 @@
 #include <FApp_AppInfo.h>
 #include <FBaseInternalTypes.h>
 #include <FBaseSysLog.h>
+#include <FBase_LocalizedNumParser.h>
 #include <FUiAccessibilityContainer.h>
 #include <FUiAccessibilityElement.h>
 #include <FUiCtrlInputTypes.h>
@@ -1758,7 +1759,7 @@ protected:
 
                if (pControl->GetElement(L"textSize", elementString))
                {
-                       fontSize = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       fontSize = _LocalizedNumParser::ToDouble(elementString, "C");
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {
@@ -1894,13 +1895,13 @@ protected:
 
                if (pControl->GetElement(L"horizontalMargin", elementString))
                {
-                       horizontalMargin= _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       horizontalMargin= _LocalizedNumParser::ToDouble(elementString, "C");
                        r = pEditArea->SetMargin(EDIT_MARGIN_TYPE_HORIZONTAL, horizontalMargin);
                }
 
                if (pControl->GetElement(L"verticalMargin", elementString))
                {
-                       verticalMargin= _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       verticalMargin= _LocalizedNumParser::ToDouble(elementString, "C");
                        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 448464c..2727df8 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditFieldImpl.cpp
+++ b/src/ui/controls/FUiCtrl_EditFieldImpl.cpp
@@ -23,6 +23,7 @@
 #include <FApp_AppInfo.h>
 #include <FBaseSysLog.h>
 #include <FBaseInternalTypes.h>
+#include <FBase_LocalizedNumParser.h>
 #include <FUiAccessibilityContainer.h>
 #include <FUiAccessibilityElement.h>
 #include <FUiCtrlEditField.h>
@@ -2145,7 +2146,7 @@ protected:
 
                if (pControl->GetElement(L"textSize", elementString))
                {
-                       fontSize = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       fontSize = _LocalizedNumParser::ToDouble(elementString, "C");
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {
@@ -2284,13 +2285,13 @@ protected:
 
                if (pControl->GetElement(L"horizontalMargin", elementString))
                {
-                       horizontalMargin = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       horizontalMargin = _LocalizedNumParser::ToDouble(elementString, "C");
                        r = pEditField->SetMargin(EDIT_MARGIN_TYPE_HORIZONTAL, horizontalMargin);
                }
 
                if (pControl->GetElement(L"verticalMargin", elementString))
                {
-                       verticalMargin = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       verticalMargin = _LocalizedNumParser::ToDouble(elementString, "C");
                        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 93f8777..0ae6713 100644 (file)
--- a/src/ui/controls/FUiCtrl_ExpandableEditAreaImpl.cpp
+++ b/src/ui/controls/FUiCtrl_ExpandableEditAreaImpl.cpp
@@ -22,6 +22,7 @@
 
 #include <FBaseSysLog.h>
 #include <FBaseInternalTypes.h>
+#include <FBase_LocalizedNumParser.h>
 #include <FUiAccessibilityContainer.h>
 #include <FUiAccessibilityElement.h>
 #include <FUiCtrlInputTypes.h>
@@ -1802,7 +1803,7 @@ protected:
 
                if (pControl->GetElement(L"textSize", elementString))
                {
-                       textSize = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       textSize = _LocalizedNumParser::ToDouble(elementString, "C");
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {
@@ -1813,13 +1814,13 @@ protected:
 
                if (pControl->GetElement(L"verticalMargin", elementString))
                {
-                       verticalMarin = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       verticalMarin = _LocalizedNumParser::ToDouble(elementString, "C");
                        r = pExpandableEditArea->SetMargin(EDIT_MARGIN_TYPE_VERTICAL, verticalMarin);
                }
 
                if (pControl->GetElement(L"horizontalMargin", elementString))
                {
-                       horizontalMargin = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       horizontalMargin = _LocalizedNumParser::ToDouble(elementString, "C");
                        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 6baf80a..186928f 100644 (file)
--- a/src/ui/controls/FUiCtrl_GroupContainerImpl.cpp
+++ b/src/ui/controls/FUiCtrl_GroupContainerImpl.cpp
@@ -23,6 +23,7 @@
 
 #include <FBaseErrors.h>
 #include <FBaseSysLog.h>
+#include <FBase_LocalizedNumParser.h>
 #include "FUiCtrl_GroupContainerImpl.h"
 #include "FUi_CoordinateSystemUtils.h"
 #include "FUi_UiBuilder.h"
@@ -373,7 +374,7 @@ protected:
 
                if (pControl->GetElement("lineWidth", elementString))
                {
-                       lineWidth = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       lineWidth = _LocalizedNumParser::ToDouble(elementString, "C");
                }
 
                rect = pControlProperty->GetRectF();

diff --git a/src/ui/controls/FUiCtrl_IconListViewImpl.cpp b/src/ui/controls/FUiCtrl_IconListViewImpl.cpp
index fece91a..f1c7ea7 100644 (file)
--- a/src/ui/controls/FUiCtrl_IconListViewImpl.cpp
+++ b/src/ui/controls/FUiCtrl_IconListViewImpl.cpp
@@ -22,6 +22,7 @@
 
 //Includes
 #include <FBaseSysLog.h>
+#include <FBase_LocalizedNumParser.h>
 #include "FUi_UiBuilder.h"
 #include "FUiCtrl_IconListView.h"
 #include "FUiCtrl_IconListViewImpl.h"
@@ -704,13 +705,13 @@ protected:
                // Get ItemBitmapSize(width)
                if (pControl->GetElement("itemBitmapWidth", elementString))
                {
-                       itemBitmapSize.width = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       itemBitmapSize.width = _LocalizedNumParser::ToDouble(elementString, "C");
                }
 
                // Get ItemBitmapSize(height)
                if (pControl->GetElement("itemBitmapHeight", elementString))
                {
-                       itemBitmapSize.height = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       itemBitmapSize.height = _LocalizedNumParser::ToDouble(elementString, "C");
                }
 
                // Get style
@@ -940,7 +941,7 @@ protected:
                if (pControl->GetElement("itemHorizontalSpacing", elementString))
                {
                        float spacing = 0.0f;
-                       spacing = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       spacing = _LocalizedNumParser::ToDouble(elementString, "C");
                        pIconListView->SetItemSpacing(spacing, pIconListView->GetItemVerticalSpacingF());
                }
 
@@ -948,7 +949,7 @@ protected:
                if (pControl->GetElement("itemVerticalSpacing", elementString))
                {
                        float spacing = 0.0f;
-                       spacing = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       spacing = _LocalizedNumParser::ToDouble(elementString, "C");
                        pIconListView->SetItemSpacing(pIconListView->GetItemHorizontalSpacingF(), spacing);
                }
 
@@ -956,7 +957,7 @@ protected:
                if (pControl->GetElement("itemTextSize", elementString))
                {
                        float size = 0.0f;
-                       size = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       size = _LocalizedNumParser::ToDouble(elementString, "C");
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {

diff --git a/src/ui/controls/FUiCtrl_LabelImpl.cpp b/src/ui/controls/FUiCtrl_LabelImpl.cpp
index cec36fb..1ae2f58 100644 (file)
--- a/src/ui/controls/FUiCtrl_LabelImpl.cpp
+++ b/src/ui/controls/FUiCtrl_LabelImpl.cpp
@@ -21,6 +21,7 @@
 
 #include <FAppApplication.h>
 #include <FBaseSysLog.h>
+#include <FBase_LocalizedNumParser.h>
 #include <FUiAccessibilityContainer.h>
 #include <FUiAccessibilityElement.h>
 #include "FUi_ResourceSizeInfo.h"
@@ -474,7 +475,7 @@ protected:
 
                if (pControl->GetElement(L"textSize", elementString))
                {
-                       size = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       size = _LocalizedNumParser::ToDouble(elementString, "C");
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {

diff --git a/src/ui/controls/FUiCtrl_ScrollPanelImpl.cpp b/src/ui/controls/FUiCtrl_ScrollPanelImpl.cpp
index 39fca9b..750f26d 100644 (file)
--- a/src/ui/controls/FUiCtrl_ScrollPanelImpl.cpp
+++ b/src/ui/controls/FUiCtrl_ScrollPanelImpl.cpp
@@ -24,6 +24,7 @@
 #include <FBaseSysLog.h>
 #include <FGrpRectangle.h>
 #include <FUiCtrlScrollPanel.h>
+#include <FBase_LocalizedNumParser.h>
 #include <FUiLayout.h>
 #include "FApp_AppInfo.h"
 #include "FUi_LayoutImpl.h"
@@ -544,7 +545,7 @@ protected:
                                if (pControl->GetElement(L"clientAreaWidth", elementString) || pControl->GetElement(L"ClientAreaWidth", elementString))
                                {
                                        float width = 0.0f;
-                                       width = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                                       width = _LocalizedNumParser::ToDouble(elementString, "C");
                                        pScrollPanel->SetClientAreaWidth(width);
                                }
                        }
@@ -554,7 +555,7 @@ protected:
                                if (pControl->GetElement(L"clientAreaHeight", elementString) || pControl->GetElement(L"ClientAreaHeight", elementString))
                                {
                                        float height = 0.0f;
-                                       height = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                                       height = _LocalizedNumParser::ToDouble(elementString, "C");
                                        pScrollPanel->SetClientAreaWidth(height);
                                }
                        }

diff --git a/src/ui/controls/FUiCtrl_SearchBarImpl.cpp b/src/ui/controls/FUiCtrl_SearchBarImpl.cpp
index 415925f..baeee13 100644 (file)
--- a/src/ui/controls/FUiCtrl_SearchBarImpl.cpp
+++ b/src/ui/controls/FUiCtrl_SearchBarImpl.cpp
@@ -22,6 +22,7 @@
 
 #include <FApp_AppInfo.h>
 #include <FBaseSysLog.h>
+#include <FBase_LocalizedNumParser.h>
 #include <FLclLocale.h>
 #include <FUiAccessibilityContainer.h>
 #include <FUiAccessibilityElement.h>
@@ -1812,7 +1813,7 @@ protected:
 
                if (pControl->GetElement("searchFieldTextSize", elementString))
                {
-                       searchFieldTextSize = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       searchFieldTextSize = _LocalizedNumParser::ToDouble(elementString, "C");
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {

diff --git a/src/ui/controls/FUiCtrl_SplitPanelImpl.cpp b/src/ui/controls/FUiCtrl_SplitPanelImpl.cpp
index 5698eb5..4d634f8 100644 (file)
--- a/src/ui/controls/FUiCtrl_SplitPanelImpl.cpp
+++ b/src/ui/controls/FUiCtrl_SplitPanelImpl.cpp
@@ -23,6 +23,7 @@
 #include <FBaseInternalTypes.h>
 #include <FApp_AppInfo.h>
 #include <FBaseSysLog.h>
+#include <FBase_LocalizedNumParser.h>
 #include <FUiCtrlPanel.h>
 #include <FUiCtrlScrollPanel.h>
 #include <FUiCtrlForm.h>
@@ -452,7 +453,7 @@ protected:
 
                if (pControl->GetElement("minDividerPosition", elementString))
                {
-                       minDividerPosition = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       minDividerPosition = _LocalizedNumParser::ToDouble(elementString, "C");
 
                        if (__pTransform != null)
                        {
@@ -465,7 +466,7 @@ protected:
 
                if (pControl->GetElement("maxDividerPosition", elementString))
                {
-                       maxDividerPosition = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       maxDividerPosition = _LocalizedNumParser::ToDouble(elementString, "C");
 
                        if (__pTransform != null)
                        {
@@ -478,7 +479,7 @@ protected:
 
                if (pControl->GetElement("dividerPosition", elementString))
                {
-                       dividerPosition = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       dividerPosition = _LocalizedNumParser::ToDouble(elementString, "C");
 
                        if (__pTransform != null)
                        {

diff --git a/src/ui/controls/FUiCtrl_TextBoxImpl.cpp b/src/ui/controls/FUiCtrl_TextBoxImpl.cpp
index 986a961..ab93c02 100644 (file)
--- a/src/ui/controls/FUiCtrl_TextBoxImpl.cpp
+++ b/src/ui/controls/FUiCtrl_TextBoxImpl.cpp
@@ -22,6 +22,7 @@
 
 #include <new>
 #include <FBaseSysLog.h>
+#include <FBase_LocalizedNumParser.h>
 #include <FUiAccessibilityContainer.h>
 #include <FUiAccessibilityElement.h>
 #include "FUi_CoordinateSystemUtils.h"
@@ -709,7 +710,7 @@ protected:
 
                if (pControl->GetElement("textSize", elementString))
                {
-                       textSize = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       textSize = _LocalizedNumParser::ToDouble(elementString, "C");
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {
@@ -720,7 +721,7 @@ protected:
 
                if (pControl->GetElement("lineSpacingExtra", elementString))
                {
-                       lineSpacingExtra = _CoordinateSystemUtils::ConvertToFloat(elementString);
+                       lineSpacingExtra =_LocalizedNumParser::ToDouble(elementString, "C");
                        if (pControl->GetElement("lineSpacingMultiplier", elementString))
                        {
                                Base::Integer::Parse(elementString, lineSpacingMultiplier);

diff --git a/src/ui/layout/FUi_LayoutLayoutMaker.cpp b/src/ui/layout/FUi_LayoutLayoutMaker.cpp
index 7e6c45a..c1116b1 100644 (file)
--- a/src/ui/layout/FUi_LayoutLayoutMaker.cpp
+++ b/src/ui/layout/FUi_LayoutLayoutMaker.cpp
@@ -29,6 +29,7 @@
 #include <FBaseSysLog.h>
 #include <FBaseInteger.h>
 #include <FBase_StringConverter.h>
+#include <FBase_LocalizedNumParser.h>
 #include <FGrp_NonScale.h>
 #include <FGrp_BitmapImpl.h>
 #include "FUi_UiBuilderControlMaker.h"
@@ -521,7 +522,7 @@ _LayoutMaker::SetGridLayoutContainerProperty(GridLayout* pLayout, _UiBuilderCont
 
                if (pControlProperty->GetLayoutElement(tempString, gridLayoutContainerPropertyValue))
                {
-                       layoutParam.columnSpacing = _CoordinateSystemUtils::ConvertToFloat(gridLayoutContainerPropertyValue);
+                       layoutParam.columnSpacing = _LocalizedNumParser::ToDouble(gridLayoutContainerPropertyValue, "C");
                        r = layout.SetColumnSpacing(i - 1, layoutParam.columnSpacing);
                        if (IsFailed(r))
                        {
@@ -602,7 +603,7 @@ _LayoutMaker::SetGridLayoutContainerProperty(GridLayout* pLayout, _UiBuilderCont
 
                if (pControlProperty->GetLayoutElement(tempString, gridLayoutContainerPropertyValue))
                {
-                       layoutParam.rowSpacing = _CoordinateSystemUtils::ConvertToFloat(gridLayoutContainerPropertyValue);
+                       layoutParam.rowSpacing = _LocalizedNumParser::ToDouble(gridLayoutContainerPropertyValue, "C");
                        r = layout.SetRowSpacing(i - 1, layoutParam.rowSpacing);
                        if (IsFailed(r))
                        {
@@ -685,7 +686,8 @@ _LayoutMaker::SetGridLayoutControlProperty(GridLayout* pLayout, _UiBuilderContro
        if (pControlProperty->GetLayoutElement(L"marginLeft", gridLayoutValue))
        {
                marginSet = true;
-               layoutParam.marginLeft = _CoordinateSystemUtils::ConvertToFloat(gridLayoutValue);
+               layoutParam.marginLeft = _LocalizedNumParser::ToDouble(gridLayoutValue, "C");
+               
                if (pTransform)
                {
 
@@ -695,7 +697,7 @@ _LayoutMaker::SetGridLayoutControlProperty(GridLayout* pLayout, _UiBuilderContro
        if (pControlProperty->GetLayoutElement(L"marginRight", gridLayoutValue))
        {
                marginSet = true;
-               layoutParam.marginRight = _CoordinateSystemUtils::ConvertToFloat(gridLayoutValue);
+               layoutParam.marginRight = _LocalizedNumParser::ToDouble(gridLayoutValue, "C");
                if (pTransform)
                {
 
@@ -705,7 +707,7 @@ _LayoutMaker::SetGridLayoutControlProperty(GridLayout* pLayout, _UiBuilderContro
        if (pControlProperty->GetLayoutElement(L"marginTop", gridLayoutValue))
        {
                marginSet = true;
-               layoutParam.marginTop = _CoordinateSystemUtils::ConvertToFloat(gridLayoutValue);
+               layoutParam.marginTop = _LocalizedNumParser::ToDouble(gridLayoutValue, "C");
                if (pTransform)
                {
 
@@ -715,7 +717,7 @@ _LayoutMaker::SetGridLayoutControlProperty(GridLayout* pLayout, _UiBuilderContro
        if (pControlProperty->GetLayoutElement(L"marginBottom", gridLayoutValue))
        {
                marginSet = true;
-               layoutParam.marginBottom = _CoordinateSystemUtils::ConvertToFloat(gridLayoutValue);
+               layoutParam.marginBottom = _LocalizedNumParser::ToDouble(gridLayoutValue, "C");
                if (pTransform)
                {
 
@@ -774,7 +776,7 @@ _LayoutMaker::SetHorizontalBoxLayoutProperty(HorizontalBoxLayout* pLayout, _UiBu
 
        if (pControlProperty->GetLayoutElement(L"height", horizontalBoxLayoutValue))
        {
-               layoutParam.height = _CoordinateSystemUtils::ConvertToFloat(horizontalBoxLayoutValue);
+               layoutParam.height = _LocalizedNumParser::ToDouble(horizontalBoxLayoutValue, "C");
                if (pTransform)
                {
 
@@ -836,7 +838,7 @@ _LayoutMaker::SetHorizontalBoxLayoutProperty(HorizontalBoxLayout* pLayout, _UiBu
        if (pControlProperty->GetLayoutElement(L"verticalTopMargin", horizontalBoxLayoutValue))
        {
                marginSet = true;
-               layoutParam.verticalTopMargin = _CoordinateSystemUtils::ConvertToFloat(horizontalBoxLayoutValue);
+               layoutParam.verticalTopMargin = _LocalizedNumParser::ToDouble(horizontalBoxLayoutValue, "C");
                if (pTransform)
                {
 
@@ -846,7 +848,7 @@ _LayoutMaker::SetHorizontalBoxLayoutProperty(HorizontalBoxLayout* pLayout, _UiBu
        if (pControlProperty->GetLayoutElement(L"verticalBottomMargin", horizontalBoxLayoutValue))
        {
                marginSet = true;
-               layoutParam.verticalBottomMargin = _CoordinateSystemUtils::ConvertToFloat(horizontalBoxLayoutValue);
+               layoutParam.verticalBottomMargin = _LocalizedNumParser::ToDouble(horizontalBoxLayoutValue, "C");
                if (pTransform)
                {
 
@@ -860,7 +862,7 @@ _LayoutMaker::SetHorizontalBoxLayoutProperty(HorizontalBoxLayout* pLayout, _UiBu
 
        if (pControlProperty->GetLayoutElement(L"spacing", horizontalBoxLayoutValue))
        {
-               layoutParam.spacing = _CoordinateSystemUtils::ConvertToFloat(horizontalBoxLayoutValue);
+               layoutParam.spacing = _LocalizedNumParser::ToDouble(horizontalBoxLayoutValue, "C");
                if (pTransform)
                {
 
@@ -875,7 +877,7 @@ _LayoutMaker::SetHorizontalBoxLayoutProperty(HorizontalBoxLayout* pLayout, _UiBu
 
        if (pControlProperty->GetLayoutElement(L"weight", horizontalBoxLayoutValue))
        {
-               layoutParam.weight = _CoordinateSystemUtils::ConvertToFloat(horizontalBoxLayoutValue);
+               layoutParam.weight = _LocalizedNumParser::ToDouble(horizontalBoxLayoutValue, "C");
                layout.SetWeight(control, layoutParam.weight);
        }
        else
@@ -885,7 +887,7 @@ _LayoutMaker::SetHorizontalBoxLayoutProperty(HorizontalBoxLayout* pLayout, _UiBu
 
        if (pControlProperty->GetLayoutElement(L"width", horizontalBoxLayoutValue))
        {
-               layoutParam.width = _CoordinateSystemUtils::ConvertToFloat(horizontalBoxLayoutValue);
+               layoutParam.width = _LocalizedNumParser::ToDouble(horizontalBoxLayoutValue, "C");
                if (pTransform)
                {
 
@@ -936,7 +938,7 @@ _LayoutMaker::SetVerticalBoxLayoutProperty(VerticalBoxLayout* pLayout, _UiBuilde
 
        if (pControlProperty->GetLayoutElement(L"height", verticalBoxLayoutValue))
        {
-               layoutParam.height = _CoordinateSystemUtils::ConvertToFloat(verticalBoxLayoutValue);
+               layoutParam.height = _LocalizedNumParser::ToDouble(verticalBoxLayoutValue, "C");
                if (pTransform)
                {
 
@@ -998,7 +1000,7 @@ _LayoutMaker::SetVerticalBoxLayoutProperty(VerticalBoxLayout* pLayout, _UiBuilde
        if (pControlProperty->GetLayoutElement(L"horizontalLeftMargin", verticalBoxLayoutValue))
        {
                marginSet = true;
-               layoutParam.horizontalLeftMargin = _CoordinateSystemUtils::ConvertToFloat(verticalBoxLayoutValue);
+               layoutParam.horizontalLeftMargin = _LocalizedNumParser::ToDouble(verticalBoxLayoutValue, "C");
                if (pTransform)
                {
                        layoutParam.horizontalLeftMargin = pTransform->Transform(layoutParam.horizontalLeftMargin);
@@ -1007,7 +1009,7 @@ _LayoutMaker::SetVerticalBoxLayoutProperty(VerticalBoxLayout* pLayout, _UiBuilde
        if (pControlProperty->GetLayoutElement(L"horizontalRightMargin", verticalBoxLayoutValue))
        {
                marginSet = true;
-               layoutParam.horizontalRightMargin = _CoordinateSystemUtils::ConvertToFloat(verticalBoxLayoutValue);
+               layoutParam.horizontalRightMargin = _LocalizedNumParser::ToDouble(verticalBoxLayoutValue, "C");
                if (pTransform)
                {
                        layoutParam.horizontalRightMargin = pTransform->Transform(layoutParam.horizontalRightMargin);
@@ -1020,7 +1022,7 @@ _LayoutMaker::SetVerticalBoxLayoutProperty(VerticalBoxLayout* pLayout, _UiBuilde
 
        if (pControlProperty->GetLayoutElement(L"spacing", verticalBoxLayoutValue))
        {
-               layoutParam.spacing = _CoordinateSystemUtils::ConvertToFloat(verticalBoxLayoutValue);
+               layoutParam.spacing = _LocalizedNumParser::ToDouble(verticalBoxLayoutValue, "C");
                if (pTransform)
                {
                        layoutParam.spacing = pTransform->Transform(layoutParam.spacing);
@@ -1035,7 +1037,7 @@ _LayoutMaker::SetVerticalBoxLayoutProperty(VerticalBoxLayout* pLayout, _UiBuilde
 
        if (pControlProperty->GetLayoutElement(L"weight", verticalBoxLayoutValue))
        {
-               layoutParam.weight = _CoordinateSystemUtils::ConvertToFloat(verticalBoxLayoutValue);
+               layoutParam.weight = _LocalizedNumParser::ToDouble(verticalBoxLayoutValue, "C");
                layout.SetWeight(control, layoutParam.weight);
        }
        else
@@ -1045,7 +1047,7 @@ _LayoutMaker::SetVerticalBoxLayoutProperty(VerticalBoxLayout* pLayout, _UiBuilde
 
        if (pControlProperty->GetLayoutElement(L"width", verticalBoxLayoutValue))
        {
-               layoutParam.width = _CoordinateSystemUtils::ConvertToFloat(verticalBoxLayoutValue);
+               layoutParam.width = _LocalizedNumParser::ToDouble(verticalBoxLayoutValue, "C");
                if (pTransform)
                {
                        layoutParam.width = pTransform->Transform(layoutParam.width);
@@ -1347,7 +1349,7 @@ _LayoutMaker::SetRelativeLayoutProperty(RelativeLayout* pLayout, _UiBuilderContr
        if (pControlProperty->GetLayoutElement(L"marginLeft", relativeLayoutValue))
        {
                marginSet = true;
-               layoutParam.marginLeft = _CoordinateSystemUtils::ConvertToFloat(relativeLayoutValue);
+               layoutParam.marginLeft = _LocalizedNumParser::ToDouble(relativeLayoutValue, "C"); 
                if (pTransform)
                {
 
@@ -1357,7 +1359,7 @@ _LayoutMaker::SetRelativeLayoutProperty(RelativeLayout* pLayout, _UiBuilderContr
        if (pControlProperty->GetLayoutElement(L"marginRight", relativeLayoutValue))
        {
                marginSet = true;
-               layoutParam.marginRight = _CoordinateSystemUtils::ConvertToFloat(relativeLayoutValue);
+               layoutParam.marginRight = _LocalizedNumParser::ToDouble(relativeLayoutValue, "C"); 
                if (pTransform)
                {
 
@@ -1367,7 +1369,7 @@ _LayoutMaker::SetRelativeLayoutProperty(RelativeLayout* pLayout, _UiBuilderContr
        if (pControlProperty->GetLayoutElement(L"marginTop", relativeLayoutValue))
        {
                marginSet = true;
-               layoutParam.marginTop = _CoordinateSystemUtils::ConvertToFloat(relativeLayoutValue);
+               layoutParam.marginTop = _LocalizedNumParser::ToDouble(relativeLayoutValue, "C"); 
                if (pTransform)
                {
 
@@ -1377,7 +1379,7 @@ _LayoutMaker::SetRelativeLayoutProperty(RelativeLayout* pLayout, _UiBuilderContr
        if (pControlProperty->GetLayoutElement(L"marginBottom", relativeLayoutValue))
        {
                marginSet = true;
-               layoutParam.marginBottom = _CoordinateSystemUtils::ConvertToFloat(relativeLayoutValue);
+               layoutParam.marginBottom = _LocalizedNumParser::ToDouble(relativeLayoutValue, "C"); 
                if (pTransform)
                {