Merge "Fix svace issue when TJ_SUBSAMP is bigger than 7" into devel/master

[platform/core/uifw/dali-adaptor.git] / dali / internal / accessibility / bridge / bridge-selection.cpp

diff --git a/dali/internal/accessibility/bridge/bridge-selection.cpp b/dali/internal/accessibility/bridge/bridge-selection.cpp
index 949bc55..0713670 100644 (file)
--- a/dali/internal/accessibility/bridge/bridge-selection.cpp
+++ b/dali/internal/accessibility/bridge/bridge-selection.cpp
@@ -22,7 +22,7 @@ using namespace Dali::Accessibility;
 
 void BridgeSelection::RegisterInterfaces()
 {
-  DBus::DBusInterfaceDescription desc{AtspiDbusInterfaceSelection};
+  DBus::DBusInterfaceDescription desc{Accessible::GetInterfaceName(AtspiInterface::SELECTION)};
   AddGetPropertyToInterface(desc, "NSelectedChildren", &BridgeSelection::GetSelectedChildrenCount);
   AddFunctionToInterface(desc, "GetSelectedChild", &BridgeSelection::GetSelectedChild);
   AddFunctionToInterface(desc, "SelectChild", &BridgeSelection::SelectChild);
@@ -31,17 +31,12 @@ void BridgeSelection::RegisterInterfaces()
   AddFunctionToInterface(desc, "SelectAll", &BridgeSelection::SelectAll);
   AddFunctionToInterface(desc, "ClearSelection", &BridgeSelection::ClearSelection);
   AddFunctionToInterface(desc, "DeselectChild", &BridgeSelection::DeselectChild);
-  dbusServer.addInterface("/", desc, true);
+  mDbusServer.addInterface("/", desc, true);
 }
 
 Selection* BridgeSelection::FindSelf() const
 {
-  auto s = BridgeBase::FindSelf();
-  assert(s);
-  auto s2 = dynamic_cast<Selection*>(s);
-  if(!s2)
-    throw std::domain_error{"object " + s->GetAddress().ToString() + " doesn't have Selection interface"};
-  return s2;
+  return FindCurrentObjectWithInterface<Dali::Accessibility::AtspiInterface::SELECTION>();
 }
 
 DBus::ValueOrError<int32_t> BridgeSelection::GetSelectedChildrenCount()