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
Fix incorrect calc of GetHeightForWidth in TextLabel
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
markup-processor-anchor.cpp
diff --git
a/dali-toolkit/internal/text/markup-processor-anchor.cpp
b/dali-toolkit/internal/text/markup-processor-anchor.cpp
index
4c4bb29
..
771ff4e
100644
(file)
--- a/
dali-toolkit/internal/text/markup-processor-anchor.cpp
+++ b/
dali-toolkit/internal/text/markup-processor-anchor.cpp
@@
-25,6
+25,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/anchor.h>
#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/anchor.h>
#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
namespace Dali
{
namespace Dali
{
@@
-32,18
+33,13
@@
namespace Toolkit
{
namespace Text
{
{
namespace Text
{
-namespace
-{
-const std::string XHTML_HREF_ATTRIBUTE("href");
-} // namespace
-
void ProcessAnchor(const Tag& tag, Anchor& anchor)
{
anchor.href = nullptr;
for(auto&& attribute : tag.attributes)
{
void ProcessAnchor(const Tag& tag, Anchor& anchor)
{
anchor.href = nullptr;
for(auto&& attribute : tag.attributes)
{
- if(TokenComparison(
XHTML_HREF_ATTRIBUTE
, attribute.nameBuffer, attribute.nameLength))
+ if(TokenComparison(
MARKUP::ANCHOR_ATTRIBUTES::HREF
, attribute.nameBuffer, attribute.nameLength))
{
Length hrefLength = attribute.valueLength + 1;
anchor.href = new char[hrefLength];
{
Length hrefLength = attribute.valueLength + 1;
anchor.href = new char[hrefLength];