From: Heeyong Song Date: Tue, 12 Sep 2017 06:44:02 +0000 (+0900) Subject: Revert "[Tizen] fix LineWrap GET error" X-Git-Tag: accepted/tizen/unified/20170920.081052~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F149371%2F1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git Revert "[Tizen] fix LineWrap GET error" This reverts commit 0af42dace23175f1fd60acafd110b8df92faef37. Change-Id: Icfc2854b14ce1e27dfba43d2d6620e91f83952e4 --- 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; }