Added ConvertMarkupToUtf8

Change-Id: I337412e944ceedb83a72f60e6ef61ac29b99c529
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>

diff --git a/src/ui/FUi_Clipboard.cpp b/src/ui/FUi_Clipboard.cpp
index ce76c48..89a1d2f 100644 (file)
--- a/src/ui/FUi_Clipboard.cpp
+++ b/src/ui/FUi_Clipboard.cpp
@@ -452,6 +452,7 @@ _Clipboard::FireEvent(int format, char* pData)
 
                if (type == CLIPBOARD_DATA_TYPE_IMAGE)
                {
+                       SysLog(NID_UI, "[Clipboard] Clip : format = [image], path = [%s] is fired.", pData);
                        const Bitmap* pBitmap = LoadBitmapN(String(pData));
                        r = GetLastResult();
 
@@ -480,6 +481,7 @@ _Clipboard::FireEvent(int format, char* pData)
                }
                else
                {
+                       SysLog(NID_UI, "[Clipboard] Clip : format = [%d], char = [%s] is fired.", format, pData);
                        pItemCore = _ClipboardItem::CreateInstanceN(type, String(pData));
                        if (!pItemCore)
                        {

diff --git a/src/ui/FUi_Clipboard.h b/src/ui/FUi_Clipboard.h
index eaac4c9..f38f092 100644 (file)
--- a/src/ui/FUi_Clipboard.h
+++ b/src/ui/FUi_Clipboard.h
@@ -73,12 +73,12 @@ public:
 
        void FirePopupEvent(_ClipboardPopupState state, int width, int height);
 
+       char* EncodeToCharN(const Tizen::Base::String& string);
+
 private:
        _ClipFormat ConvertToClipFormat(ClipboardDataType type);
        ClipboardDataType ConvertToDataType(int format, const char* pData);
 
-       char* EncodeToCharN(const Tizen::Base::String& string);
-
        char* CreateImageFileN(const Tizen::Graphics::Bitmap& bitmap);
        Tizen::Graphics::Bitmap* LoadBitmapN(const Tizen::Base::String& path);
 

diff --git a/src/ui/FUi_EcoreEvas.cpp b/src/ui/FUi_EcoreEvas.cpp
index 72a5399..84950f8 100644 (file)
--- a/src/ui/FUi_EcoreEvas.cpp
+++ b/src/ui/FUi_EcoreEvas.cpp
@@ -1808,6 +1808,25 @@ _EcoreEvas::IsClipboardOpened(void)
        return __openClipboard;
 }
 
+String
+_EcoreEvas::ConvertMarkupToUtf8(const String& string)
+{
+       char* pChar = _Clipboard::GetInstance()->EncodeToCharN(string);
+       if (!pChar)
+       {
+               return String(L"");
+       }
+
+       char* pTempChar = evas_textblock_text_markup_to_utf8(NULL, pChar);
+       SysLog(NID_UI, "[Clipboard] markup[%s] -> utf8[%s]", pChar, pTempChar);
+       free(pChar);
+
+       String str(pTempChar);
+       free(pTempChar);
+
+       return str;
+}
+
 result
 _EcoreEvas::SetEventPropagation(const _Control& control, bool enable)
 {

diff --git a/src/ui/inc/FUi_EcoreEvas.h b/src/ui/inc/FUi_EcoreEvas.h
index 0b9e7d9..45d193c 100644 (file)
--- a/src/ui/inc/FUi_EcoreEvas.h
+++ b/src/ui/inc/FUi_EcoreEvas.h
@@ -143,6 +143,7 @@ public:
        void OpenClipboard(unsigned long clipFormats);
        void CloseClipboard(void);
        bool IsClipboardOpened(void);
+       Tizen::Base::String ConvertMarkupToUtf8(const Tizen::Base::String& string);
 
        bool IsAccessibilityScreenReaderActivated(void);