[4.0] fix LineWrap GET error

This reverts commit 999a1b2425bde68865ec79c05b802ad6af34fa93.

Change-Id: Iec859f2300a98b0b61120a67b79268ff94120e95

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 61aaba6..e8fa0ab 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,7 +1116,13 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind
       {
         if( impl.mController )
         {
-          value = impl.mController->GetLineWrapMode();
+          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 );
+          }
         }
       }
     } //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 100644 (file)
new mode 100755 (executable)
index e871db3..84e648f
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@ -769,7 +769,13 @@ Property::Value TextLabel::GetProperty( BaseObject* object, Property::Index inde
       {
         if( impl.mController )
         {
-          value = impl.mController->GetLineWrapMode();
+          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 );
+          }
         }
         break;
       }