Make createTextAccessObject() utility more universal and remove text domain dependency.

Change-Id: I2a0a8b318245d9abe4e56dfb781b42823e548a83
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>

2 files changed, 7 insertions, 11 deletions

diff --git a/lib-apps-common/inc/Ui/Accessibility.h b/lib-apps-common/inc/Ui/Accessibility.h
index b5dde8e..f37b567 100644
--- a/lib-apps-common/inc/Ui/Accessibility.h
+++ b/lib-apps-common/inc/Ui/Accessibility.h
@@ -56,10 +56,9 @@ namespace Ui
 	 * @brief Create accessible object for text part using text as its name.
 	 * @param[in]   layout  Layout containing the part
 	 * @param[in]   part    Text part to create accessible object for
-	 * @param[in]   domain  Text domain to translate part text
 	 * @return Accessible object.
 	 */
-	EXPORT_API Evas_Object *createTextAccessObject(Evas_Object *layout, const char *part, const char *domain = nullptr);
+	EXPORT_API Evas_Object *createTextAccessObject(Evas_Object *layout, const char *part);
 }
 
 #endif /* UI_ACCESSIBILITY_H */
diff --git a/lib-apps-common/src/Ui/Accessibility.cpp b/lib-apps-common/src/Ui/Accessibility.cpp
index 6db660d..2a1af87 100644
--- a/lib-apps-common/src/Ui/Accessibility.cpp
+++ b/lib-apps-common/src/Ui/Accessibility.cpp
@@ -40,17 +40,14 @@ Evas_Object *Ui::createPartAccessObject(Evas_Object *layout, const char *part)
 	return elm_access_object_register(obj, layout);
 }
 
-Evas_Object *Ui::createTextAccessObject(Evas_Object *layout, const char *part, const char *domain)
+Evas_Object *Ui::createTextAccessObject(Evas_Object *layout, const char *part)
 {
 	Evas_Object *obj = createPartAccessObject(layout, part);
-	if (domain) {
-		elm_atspi_accessible_translation_domain_set(obj, domain);
-		elm_atspi_accessible_name_set(obj, elm_object_translatable_part_text_get(layout, part));
-	} else {
-		char *text = elm_entry_markup_to_utf8(elm_object_part_text_get(layout, part));
-		elm_atspi_accessible_name_set(obj, text);
-		free(text);
-	}
+	elm_atspi_accessible_name_cb_set(obj, [](void *part, Evas_Object *obj) {
+		Evas_Object *layout = elm_object_parent_widget_get(obj);
+		const char *text = elm_object_part_text_get(layout, (const char *) part);
+		return elm_entry_markup_to_utf8(text);
+	}, part);
 	elm_atspi_accessible_reading_info_type_set(obj, ELM_ACCESSIBLE_READING_INFO_TYPE_NAME);
 	return obj;
 }