Revert "[4.0] fix LineWrap GET error" 50/153350/1
authorJinho, Lee <jeano.lee@samsung.com>
Thu, 28 Sep 2017 05:30:46 +0000 (14:30 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Thu, 28 Sep 2017 05:30:47 +0000 (14:30 +0900)
This reverts commit fa4e51e0828e69b6f5588a1b090c23d39cbf2299.

Change-Id: Ic35f89b854759cac70d4f84bb663b1881aad4a64

dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp [changed mode: 0755->0644]

index e8fa0ab..61aaba6 100755 (executable)
@@ -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
old mode 100755 (executable)
new mode 100644 (file)
index b670b67..db99cc4
@@ -760,13 +760,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;
       }