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
Merge "Add TOUCH_FOCUSABLE property" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
utc-Dali-Text-Markup.cpp
diff --git
a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp
b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp
index
6e2d632
..
f46c401
100755
(executable)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp
@@
-185,7
+185,8
@@
namespace
Vector<FontDescriptionRun> fontRuns;
Vector<EmbeddedItem> items;
Vector<Anchor> anchors;
Vector<FontDescriptionRun> fontRuns;
Vector<EmbeddedItem> items;
Vector<Anchor> anchors;
- MarkupProcessData markupProcessData( colorRuns, fontRuns, items, anchors );
+ Vector<UnderlinedCharacterRun> underlinedCharacterRuns;
+ MarkupProcessData markupProcessData( colorRuns, fontRuns, items, anchors, underlinedCharacterRuns );
ProcessMarkupString( data.xHTMLEntityString, markupProcessData );
for( Vector<EmbeddedItem>::Iterator it = items.Begin(),
ProcessMarkupString( data.xHTMLEntityString, markupProcessData );
for( Vector<EmbeddedItem>::Iterator it = items.Begin(),