--- a/src/hbcore/utils/hbxmlloaderbaseactions_p.cpp	Fri Sep 17 08:32:10 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderbaseactions_p.cpp	Mon Oct 04 00:38:12 2010 +0300
@@ -337,35 +337,7 @@
 #ifndef HB_BIN_CSS
 bool HbXmlLoaderBaseActions::toPixels(const HbXmlLengthValue &lengthVal, qreal& result) const
 {
-    bool retVal(true);
-    switch (lengthVal.mType) {
-        case HbXmlLengthValue::None:
-            retVal = false;
-            break;
-        case HbXmlLengthValue::PlainNumber:
-        case HbXmlLengthValue::Pixel:
-            result = lengthVal.mValue;
-            break;
-        case HbXmlLengthValue::Unit:
-            result = mCurrentProfile.unitValue() * lengthVal.mValue;
-            break;
-        case HbXmlLengthValue::Millimeter:
-            result = mCurrentProfile.ppmValue() * lengthVal.mValue;
-            break;
-        case HbXmlLengthValue::Variable:
-        case HbXmlLengthValue::VariableNegative:
-            retVal = hbInstance->style()->d_func()->parameterFromHashValue(lengthVal.mHashValue, result, mCurrentProfile);
-            if ( lengthVal.mType == HbXmlLengthValue::VariableNegative ) {
-                result *= -1.0;
-            }
-            break;
-        case HbXmlLengthValue::Expression:
-        case HbXmlLengthValue::ExpressionNegative:
-            // HbStyle::parameter handles the negative case as the minus sign is part of mString.
-            retVal = hbInstance->style()->parameter( lengthVal.mString, result, mCurrentProfile );
-            break;
-    }
-    return retVal;
+    return hbInstance->style()->d_func()->valueFromTokens(lengthVal.mValues, result, mCurrentProfile);
 }
 #endif