X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fmarkup-processor-paragraph.cpp;h=e470bec7a4966cba2c084d018a8c40e0bfaa30d9;hp=859547ebf5acb3de407bde07516893d6eb04f898;hb=8e129c82c96ccd93fa92d64cc1deddfe6eb3cfbb;hpb=11ac31ab089b6b0d6cb8b06381724ac8c0ce126e diff --git a/dali-toolkit/internal/text/markup-processor-paragraph.cpp b/dali-toolkit/internal/text/markup-processor-paragraph.cpp index 859547e..e470bec 100644 --- a/dali-toolkit/internal/text/markup-processor-paragraph.cpp +++ b/dali-toolkit/internal/text/markup-processor-paragraph.cpp @@ -24,6 +24,7 @@ // INTERNAL INCLUDES #include #include +#include namespace Dali { @@ -31,12 +32,6 @@ namespace Toolkit { namespace Text { -namespace -{ -const std::string XHTML_ALIGN_ATTRIBUTE("align"); -const std::string XHTML_RELATIVE_LINE_HEIGHT_ATTRIBUTE("rel-line-height"); -} // namespace - void ProcessHorizontalAlignment(const Attribute& attribute, BoundedParagraphRun& boundedParagraphRun) { boundedParagraphRun.horizontalAlignmentDefined = HorizontalAlignmentTypeStringToTypeValue(attribute.valueBuffer, @@ -61,11 +56,11 @@ void ProcessAttributesOfParagraphTag(const Tag& tag, BoundedParagraphRun& bounde ++it) { const Attribute& attribute(*it); - if(TokenComparison(XHTML_ALIGN_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength)) + if(TokenComparison(MARKUP::PARAGRAPH_ATTRIBUTES::ALIGN, attribute.nameBuffer, attribute.nameLength)) { ProcessHorizontalAlignment(attribute, boundedParagraphRun); } - else if(TokenComparison(XHTML_RELATIVE_LINE_HEIGHT_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength)) + else if(TokenComparison(MARKUP::PARAGRAPH_ATTRIBUTES::RELATIVE_LINE_HEIGHT, attribute.nameBuffer, attribute.nameLength)) { ProcessRelativeLineHeight(attribute, boundedParagraphRun); }