[dali_1.0.8] Merge branch 'tizen'

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / controls / text-view / split-by-word-policies.cpp

diff --git a/base/dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp b/base/dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp
index 3f90a25..0cfcfa1 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp
@@ -16,16 +16,12 @@
  */
 
 // FILE HEADER
-
-#include "split-by-word-policies.h"
-
-// EXTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/text-view/split-by-word-policies.h>
 
 // INTERNAL INCLUDES
-
-#include "relayout-utilities.h"
-#include "text-view-processor.h"
 #include <dali/integration-api/debug.h>
+#include <dali-toolkit/internal/controls/text-view/relayout-utilities.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-processor.h>
 
 namespace Dali
 {
@@ -563,15 +559,8 @@ void CalculateSizeAndPosition( const TextView::LayoutParameters& layoutParameter
               break;
             }
             case TextView::SplitOriginal:
-            {
-              characterLayoutInfo.mPosition = SplitWhenExceedPosition( relayoutParameters,
-                                                                       layoutParameters,
-                                                                       relayoutData );
-
-              relayoutParameters.mPositionOffset = characterLayoutInfo.mPosition + Vector3( characterLayoutInfo.mSize.width, 0.f, 0.f );
-              break;
-            }
             case TextView::SplitFade:
+            case TextView::SplitEllipsizeEnd:
             {
               characterLayoutInfo.mPosition = SplitWhenExceedPosition( relayoutParameters,
                                                                        layoutParameters,