use container_focus_changed instead of toplevel_focus_changed

seeing as its the same thing, but available one level of
inheritance down

Change-Id: Ieedbf2bc8cea09cdafff1514eac5c35b85c2fdd0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112023
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

4 files changed, 6 insertions, 7 deletions

diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index e7e8e1b38c18..80c868eb5fd9 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -77,7 +77,7 @@ OAddFieldWindow::OAddFieldWindow(weld::Window* pParent, const uno::Reference< be
     m_xListBox->enable_drag_source(xHelper, DND_ACTION_COPYMOVE | DND_ACTION_LINK);
     m_xListBox->connect_drag_begin(LINK(this, OAddFieldWindow, DragBeginHdl));
 
-    m_xDialog->connect_toplevel_focus_changed(LINK(this, OAddFieldWindow, FocusChangeHdl));
+    m_xDialog->connect_container_focus_changed(LINK(this, OAddFieldWindow, FocusChangeHdl));
 
     m_xDialog->set_help_id(HID_RPT_FIELD_SEL_WIN);
 
@@ -117,7 +117,7 @@ OAddFieldWindow::~OAddFieldWindow()
         m_pContainerListener->dispose();
 }
 
-IMPL_LINK_NOARG(OAddFieldWindow, FocusChangeHdl, weld::Widget&, void)
+IMPL_LINK_NOARG(OAddFieldWindow, FocusChangeHdl, weld::Container&, void)
 {
     if (m_xDialog->has_toplevel_focus())
         m_xListBox->grab_focus();
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index ccda43cd6e6b..74b06b080cf3 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -818,14 +818,14 @@ ONavigator::ONavigator(weld::Window* pParent, OReportController& rController)
     m_pImpl.reset(new ONavigatorImpl(rController, *m_xBuilder));
     m_pImpl->m_xNavigatorTree->grab_focus();
 
-    m_xDialog->connect_toplevel_focus_changed(LINK(this, ONavigator, FocusChangeHdl));
+    m_xDialog->connect_container_focus_changed(LINK(this, ONavigator, FocusChangeHdl));
 }
 
 ONavigator::~ONavigator()
 {
 }
 
-IMPL_LINK_NOARG(ONavigator, FocusChangeHdl, weld::Widget&, void)
+IMPL_LINK_NOARG(ONavigator, FocusChangeHdl, weld::Container&, void)
 {
     if (m_xDialog->has_toplevel_focus())
         m_pImpl->m_xNavigatorTree->grab_focus();
@@ -833,5 +833,4 @@ IMPL_LINK_NOARG(ONavigator, FocusChangeHdl, weld::Widget&, void)
 
 } // rptui
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index db255fd4fd54..5a388d49ab29 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -69,7 +69,7 @@ class  OAddFieldWindow : public weld::GenericDialogController
     DECL_LINK( OnSelectHdl, weld::TreeView&, void );
     DECL_LINK( DragBeginHdl, bool&, bool );
     DECL_LINK( OnSortAction, const OString&, void );
-    DECL_LINK( FocusChangeHdl, weld::Widget&, void );
+    DECL_LINK( FocusChangeHdl, weld::Container&, void );
 
     void addToList(const css::uno::Sequence<OUString>& rEntries);
     void addToList(const css::uno::Reference<css::container::XNameAccess>& i_xColumns);
diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx
index 5c28d240138c..eed3e529c00d 100644
--- a/reportdesign/source/ui/inc/Navigator.hxx
+++ b/reportdesign/source/ui/inc/Navigator.hxx
@@ -31,7 +31,7 @@ namespace rptui
         ONavigator(const ONavigator&) = delete;
         void operator =(const ONavigator&) = delete;
 
-        DECL_LINK(FocusChangeHdl, weld::Widget&, void);
+        DECL_LINK(FocusChangeHdl, weld::Container&, void);
 
     public:
         ONavigator(weld::Window* pParent, OReportController& rController);