[dali_1.0.8] Merge branch 'tizen'

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

diff --git a/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp b/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp
index 50c81d5..7e9020a 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp
@@ -16,16 +16,12 @@
  */
 
 // FILE HEADER
-
-#include "split-by-new-line-char-policies.h"
-
-// EXTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/text-view/split-by-new-line-char-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
 {
@@ -237,7 +233,8 @@ void CalculateSizeAndPosition( const TextView::LayoutParameters& layoutParameter
               break;
             }
             case TextView::SplitOriginal:
-            case TextView::SplitFade: // Fall Through
+            case TextView::SplitFade:
+            case TextView::SplitEllipsizeEnd: // Fall Through
             {
               characterLayoutInfo.mPosition = SplitPosition( relayoutParameters,
                                                              layoutParameters,