projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_1.1.15] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
multi-language-support-impl.h
diff --git
a/dali-toolkit/internal/text/multi-language-support-impl.h
b/dali-toolkit/internal/text/multi-language-support-impl.h
index
643dea3
..
4dfc85c
100644
(file)
--- a/
dali-toolkit/internal/text/multi-language-support-impl.h
+++ b/
dali-toolkit/internal/text/multi-language-support-impl.h
@@
-18,12
+18,12
@@
*
*/
*
*/
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/multi-language-support.h>
-
// EXTERNAL INCLUDES
#include <dali/public-api/object/base-object.h>
// EXTERNAL INCLUDES
#include <dali/public-api/object/base-object.h>
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/multi-language-support.h>
+
namespace Dali
{
namespace Dali
{
@@
-94,10
+94,10
@@
public:
* @copydoc Dali::MultilanguageSupport::SetScripts()
*/
void SetScripts( const Vector<Character>& text,
* @copydoc Dali::MultilanguageSupport::SetScripts()
*/
void SetScripts( const Vector<Character>& text,
- const Vector<LineBreakInfo>& lineBreakInfo,
Vector<ScriptRun>& scripts );
Vector<ScriptRun>& scripts );
+
/**
/**
- * @copydoc Dali::MultilanguageSupport::ValidateFonts()
+ * @copydoc Dali::MultilanguageSupport::ValidateFonts(
const Vector<Character>& text, const Vector<ScriptRun>& scripts, Vector<FontRun>& fonts
)
*/
void ValidateFonts( const Vector<Character>& text,
const Vector<ScriptRun>& scripts,
*/
void ValidateFonts( const Vector<Character>& text,
const Vector<ScriptRun>& scripts,