Revert "[4.0] fix LineWrap GET error"

This reverts commit 85978f019f7f4b4bf4a49db7ccd926fec2486696.

Change-Id: I5253686ccedaff8ed180890c19e28643f8046edf

diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
index e8fa0ab..61aaba6 100755 (executable)
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
@@ -1116,13 +1116,7 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind
       {
         if( impl.mController )
         {
-          const char* name = Scripting::GetEnumerationName< Layout::LineWrap::Mode >( impl.mController->GetLineWrapMode(),
-                                                                                                              LINE_WRAP_MODE_STRING_TABLE,
-                                                                                                              LINE_WRAP_MODE_STRING_TABLE_COUNT );
-          if( name )
-          {
-            value = std::string( name );
-          }
+          value = impl.mController->GetLineWrapMode();
         }
       }
     } //switch

diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 84e648f..e871db3
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@ -769,13 +769,7 @@ Property::Value TextLabel::GetProperty( BaseObject* object, Property::Index inde
       {
         if( impl.mController )
         {
-          const char* name = Scripting::GetEnumerationName< Layout::LineWrap::Mode >( impl.mController->GetLineWrapMode(),
-                                                                                                                                          LINE_WRAP_MODE_STRING_TABLE,
-                                                                                                                                          LINE_WRAP_MODE_STRING_TABLE_COUNT );
-          if( name )
-          {
-            value = std::string( name );
-          }
+          value = impl.mController->GetLineWrapMode();
         }
         break;
       }