From 999a1b2425bde68865ec79c05b802ad6af34fa93 Mon Sep 17 00:00:00 2001 From: "Jinho, Lee" Date: Thu, 28 Sep 2017 14:30:46 +0900 Subject: [PATCH] Revert "[4.0] fix LineWrap GET error" This reverts commit fa4e51e0828e69b6f5588a1b090c23d39cbf2299. Change-Id: Ic35f89b854759cac70d4f84bb663b1881aad4a64 --- dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp | 8 +------- dali-toolkit/internal/controls/text-controls/text-label-impl.cpp | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) mode change 100755 => 100644 dali-toolkit/internal/controls/text-controls/text-label-impl.cpp 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 --- 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 new mode 100644 index b670b67..db99cc4 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp @@ -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; } -- 2.7.4