Revert "[4.0] Fix SVACE issue"

This reverts commit b0ceacb1c9c365046a3129eb1f1d8502b418e461.

Change-Id: If920b2bc58518f557c06ff75a21873954e9347d9

diff --git a/dali-toolkit/internal/visuals/text/text-visual.cpp b/dali-toolkit/internal/visuals/text/text-visual.cpp
index 889b57d..7ce455e 100644 (file)
--- a/dali-toolkit/internal/visuals/text/text-visual.cpp
+++ b/dali-toolkit/internal/visuals/text/text-visual.cpp
@@ -74,11 +74,7 @@ std::string GetHorizontalAlignment( Toolkit::Text::Layout::HorizontalAlignment a
                                                                                                 HORIZONTAL_ALIGNMENT_STRING_TABLE,
                                                                                                 HORIZONTAL_ALIGNMENT_STRING_TABLE_COUNT );
 
-  if( name )
-  {
-    return std::string( name );
-  }
-  return std::string();
+  return std::string( name );
 }
 
 std::string GetVerticalAlignment( Toolkit::Text::Layout::VerticalAlignment alignment )
@@ -87,11 +83,7 @@ std::string GetVerticalAlignment( Toolkit::Text::Layout::VerticalAlignment align
                                                                                                 VERTICAL_ALIGNMENT_STRING_TABLE,
                                                                                                 VERTICAL_ALIGNMENT_STRING_TABLE_COUNT );
 
-  if( name )
-  {
-    return std::string( name );
-  }
-  return std::string();
+  return std::string( name );
 }
 
 const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(