From: Seoyeon Kim Date: Mon, 14 Aug 2017 06:14:52 +0000 (+0900) Subject: Revert "[Tizen] fix LineWrap GET error" X-Git-Tag: submit/tizen/20170814.093340~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F57%2F143957%2F1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git Revert "[Tizen] fix LineWrap GET error" This reverts commit bb14cb598d6747484683159b3980a7684c981bf7. Change-Id: Ic923695441fdd58957332514584481779427d4a9 --- 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 ca6f5ab..97cdb82 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 f8265f6..a6fa7ea --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp @@ -757,13 +757,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; }