X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Ftext%2Flogical-model.cpp;h=6d22f3ad35ce2c4a492b6f535c291d507e5179a1;hp=db30d050a641378dbc6b3972b6d04882b03b8082;hb=2dd044328238768ae8b27a223cb7d0f5cda53513;hpb=30ead727af1371695a21bccc5be36f58912090ca

diff --git a/dali-toolkit/public-api/text/logical-model.cpp b/dali-toolkit/public-api/text/logical-model.cpp
index db30d05..6d22f3a 100644
--- a/dali-toolkit/public-api/text/logical-model.cpp
+++ b/dali-toolkit/public-api/text/logical-model.cpp
@@ -19,12 +19,13 @@
 #include <dali-toolkit/public-api/text/logical-model.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/public-api/text/bidirectional-line-info-run.h>
+#include <dali-toolkit/public-api/text/bidirectional-paragraph-info-run.h>
 #include <dali-toolkit/public-api/text/font-run.h>
 #include <dali-toolkit/public-api/text/script-run.h>
 
 // EXTERNAL INCLUDES
 #include <memory.h>
-#include <stdlib.h>
 
 namespace Dali
 {
@@ -47,11 +48,12 @@ LogicalModelPtr LogicalModel::New()
   return LogicalModelPtr( new LogicalModel() );
 }
 
-void LogicalModel::SetText( const Character* text, Length length )
+void LogicalModel::SetText( const Character* const text,
+                            Length numberOfCharacters )
 {
   Vector<Character>& modelText = mImpl->mText;
-  modelText.Resize( length );
-  memcpy( &modelText[0], text, length*sizeof(Character) );
+  modelText.Resize( numberOfCharacters );
+  memcpy( modelText.Begin(), text, numberOfCharacters * sizeof( Character ) );
 }
 
 Length LogicalModel::GetNumberOfCharacters() const
@@ -59,10 +61,17 @@ Length LogicalModel::GetNumberOfCharacters() const
   return mImpl->mText.Count();
 }
 
-void LogicalModel::GetText( CharacterIndex characterIndex, Character* text, Length numberOfCharacters ) const
+void LogicalModel::GetText( CharacterIndex characterIndex,
+                            Character* text,
+                            Length numberOfCharacters ) const
 {
   Vector<Character>& modelText = mImpl->mText;
-  memcpy( text, &modelText[characterIndex], numberOfCharacters*sizeof(Character) );
+  memcpy( text, modelText.Begin() + characterIndex, numberOfCharacters * sizeof( Character ) );
+}
+
+Character LogicalModel::GetCharacter( CharacterIndex characterIndex ) const
+{
+  return mImpl->mText[characterIndex];
 }
 
 void LogicalModel::SetScripts( const ScriptRun* const scripts,