Merge "Fix for font validation." into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / builder / replacement.cpp

diff --git a/dali-toolkit/internal/builder/replacement.cpp b/dali-toolkit/internal/builder/replacement.cpp
index 7dc7818..446a014 100644 (file)
--- a/dali-toolkit/internal/builder/replacement.cpp
+++ b/dali-toolkit/internal/builder/replacement.cpp
@@ -292,10 +292,7 @@ OptionalString Replacement::IsString( const TreeNode& node ) const
       }
       else
       {
-        if( Property::STRING == value.GetType() )
-        {
-          ret = v; // sets the unexpanded. Expansion may occur later in processing with include files
-        }
+        ret = v; // sets the unexpanded. Expansion may occur later in processing with include files
       }
     }
   }
@@ -324,27 +321,6 @@ OptionalInteger Replacement::IsInteger( const TreeNode & node ) const
   return ret;
 }
 
-OptionalUnsignedInt Replacement::IsUnsignedInteger( const TreeNode & node ) const
-{
-  OptionalUnsignedInt ret;
-  if( OptionalString replace = HasFullReplacement( node ) )
-  {
-    Property::Value value = GetFullReplacement( *replace );
-    if( Property::UNSIGNED_INTEGER == value.GetType() )
-    {
-      ret = value.Get<unsigned int>();
-    }
-  }
-  else
-  {
-    if ( OptionalInteger i = ::IsInteger( node ) )
-    {
-      ret = OptionalUnsignedInt(static_cast<unsigned int>(*i) );
-    }
-  }
-  return ret;
-}
-
 OptionalVector2 Replacement::IsVector2( const TreeNode & node ) const
 {
   OptionalVector2 ret;