X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fmulti-language-support.cpp;h=11ba9c03b5002f3957978e03d92d6a4f87262466;hp=4416dbae19cebab2f1a4cb5dc7d063d7673bd569;hb=3e844ed708b1cbe03cd5bfe9ad202aad27bbe360;hpb=d04c5bdbb95cc98f90848c7a98b0b2804df6e5b8 diff --git a/dali-toolkit/internal/text/multi-language-support.cpp b/dali-toolkit/internal/text/multi-language-support.cpp index 4416dba..11ba9c0 100644 --- a/dali-toolkit/internal/text/multi-language-support.cpp +++ b/dali-toolkit/internal/text/multi-language-support.cpp @@ -23,13 +23,10 @@ namespace Dali { - namespace Toolkit { - namespace Text { - MultilanguageSupport::MultilanguageSupport() { } @@ -38,8 +35,8 @@ MultilanguageSupport::~MultilanguageSupport() { } -MultilanguageSupport::MultilanguageSupport( Internal::MultilanguageSupport* implementation ) -: BaseHandle( implementation ) +MultilanguageSupport::MultilanguageSupport(Internal::MultilanguageSupport* implementation) +: BaseHandle(implementation) { } @@ -48,44 +45,34 @@ MultilanguageSupport MultilanguageSupport::Get() return Internal::MultilanguageSupport::Get(); } -void MultilanguageSupport::SetScripts( const Vector& text, - const Vector& lineBreakInfo, - Vector& scripts ) -{ - GetImplementation( *this ).SetScripts( text, - lineBreakInfo, - scripts ); -} - -void MultilanguageSupport::ReplaceScripts( LogicalModel& model, - CharacterIndex characterIndex, - Length numberOfCharactersToRemove, - Length numberOfCharactersToInsert ) -{ - GetImplementation( *this ).ReplaceScripts( model, - characterIndex, - numberOfCharactersToRemove, - numberOfCharactersToInsert ); -} - -void MultilanguageSupport::ValidateFonts( const Vector& text, - const Vector& scripts, - Vector& fonts ) +void MultilanguageSupport::SetScripts(const Vector& text, + CharacterIndex startIndex, + Length numberOfCharacters, + Vector& scripts) { - GetImplementation( *this ).ValidateFonts( text, - scripts, - fonts ); + GetImplementation(*this).SetScripts(text, + startIndex, + numberOfCharacters, + scripts); } -void MultilanguageSupport::ValidateFonts( LogicalModel& model, - CharacterIndex characterIndex, - Length numberOfCharactersToRemove, - Length numberOfCharactersToInsert ) +void MultilanguageSupport::ValidateFonts(const Vector& text, + const Vector& scripts, + const Vector& fontDescriptions, + const TextAbstraction::FontDescription& defaultFontDescription, + TextAbstraction::PointSize26Dot6 defaultFontPointSize, + CharacterIndex startIndex, + Length numberOfCharacters, + Vector& fonts) { - GetImplementation( *this ).ValidateFonts( model, - characterIndex, - numberOfCharactersToRemove, - numberOfCharactersToInsert ); + GetImplementation(*this).ValidateFonts(text, + scripts, + fontDescriptions, + defaultFontDescription, + defaultFontPointSize, + startIndex, + numberOfCharacters, + fonts); } } // namespace Text