Merge "Fixed an incorrect ellipsis" into devel/master

diff --combined dali-toolkit/internal/text/rendering/view-model.cpp
index 9be8215,70b642f..0a977f3
--- 1/dali-toolkit/internal/text/rendering/view-model.cpp
--- 2/dali-toolkit/internal/text/rendering/view-model.cpp
+++ b/dali-toolkit/internal/text/rendering/view-model.cpp
@@@ -1,5 -1,5 +1,5 @@@
  /*
 - * Copyright (c) 2018 Samsung Electronics Co., Ltd.
 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@@ -203,7 -203,7 +203,7 @@@ const Vector4& ViewModel::GetOutlineCol
    return mModel->GetOutlineColor();
  }
  
 -float ViewModel::GetOutlineWidth() const
 +uint16_t ViewModel::GetOutlineWidth() const
  {
    return mModel->GetOutlineWidth();
  }
@@@ -332,12 -332,6 +332,6 @@@ void ViewModel::ElideGlyphs(
                glyphInfo = ellipsisGlyph;
  
                // Change the 'x' and 'y' position of the ellipsis glyph.
- 
-               if( position.x > firstPenX )
-               {
-                 position.x = firstPenX + removedGlypsWidth - ellipsisGlyphWidth;
-               }
- 
                position.x += ellipsisGlyph.xBearing;
                position.y = penY - ellipsisGlyph.yBearing;