1 files changed, 13 insertions, 19 deletions

diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index a7bd8ae1538f..299ab8454594 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -27,18 +27,16 @@
 #include <vcl/weld.hxx>
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 namespace dbaui
 {
 
     using namespace ::com::sun::star::uno;
-    using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::container;
     using namespace ::com::sun::star::sdbc;
     using namespace ::com::sun::star::util;
-    using namespace ::connectivity;
 
     // OParameterDialog
 
@@ -46,15 +44,16 @@ namespace dbaui
     OParameterDialog::OParameterDialog(
             weld::Window* pParent, const Reference< XIndexAccess > & rParamContainer,
             const Reference< XConnection > & _rxConnection, const Reference< XComponentContext >& rxContext)
-        : GenericDialogController(pParent, "dbaccess/ui/parametersdialog.ui", "Parameters")
+        : GenericDialogController(pParent, u"dbaccess/ui/parametersdialog.ui"_ustr, u"Parameters"_ustr)
         , m_nCurrentlySelected(-1)
         , m_xConnection(_rxConnection)
         , m_aPredicateInput( rxContext, _rxConnection, getParseContext() )
-        , m_xAllParams(m_xBuilder->weld_tree_view("allParamTreeview"))
-        , m_xParam(m_xBuilder->weld_entry("paramEntry"))
-        , m_xTravelNext(m_xBuilder->weld_button("next"))
-        , m_xOKBtn(m_xBuilder->weld_button("ok"))
-        , m_xCancelBtn(m_xBuilder->weld_button("cancel"))
+        , m_aResetVisitFlag("dbaccess OParameterDialog m_aResetVisitFlag")
+        , m_xAllParams(m_xBuilder->weld_tree_view(u"allParamTreeview"_ustr))
+        , m_xParam(m_xBuilder->weld_entry(u"paramEntry"_ustr))
+        , m_xTravelNext(m_xBuilder->weld_button(u"next"_ustr))
+        , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr))
+        , m_xCancelBtn(m_xBuilder->weld_button(u"cancel"_ustr))
     {
         m_xAllParams->set_size_request(-1, m_xAllParams->get_height_rows(10));
 
@@ -110,7 +109,8 @@ namespace dbaui
 
     void OParameterDialog::Construct()
     {
-        m_xAllParams->connect_changed(LINK(this, OParameterDialog, OnEntryListBoxSelected));
+        m_xAllParams->connect_selection_changed(
+            LINK(this, OParameterDialog, OnEntryListBoxSelected));
         m_xParam->connect_focus_out(LINK(this, OParameterDialog, OnValueLoseFocusHdl));
         m_xParam->connect_changed(LINK(this, OParameterDialog, OnValueModified));
         m_xTravelNext->connect_clicked(LINK(this, OParameterDialog, OnButtonClicked));
@@ -123,15 +123,10 @@ namespace dbaui
             OnEntrySelected();
 
             if (m_xAllParams->n_children() == 1)
-            {
                 m_xTravelNext->set_sensitive(false);
-            }
 
             if (m_xAllParams->n_children() > 1)
-            {
-                m_xOKBtn->set_has_default(false);
-                m_xTravelNext->set_has_default(true);
-            }
+                m_xDialog->change_default_widget(m_xOKBtn.get(), m_xTravelNext.get());
         }
 
         m_xParam->grab_focus();
@@ -279,7 +274,7 @@ namespace dbaui
                 return true;
             }
 
-            m_aFinalValues[m_nCurrentlySelected].Value <<= m_xParam->get_text();
+            m_aFinalValues.getArray()[m_nCurrentlySelected].Value <<= m_xParam->get_text();
         }
 
         // initialize the controls with the new values
@@ -321,8 +316,7 @@ namespace dbaui
         if (!bVisited)
         {
             // yes, there isn't another one -> change the "default button"
-            m_xTravelNext->set_has_default(false);
-            m_xOKBtn->set_has_default(true);
+            m_xDialog->change_default_widget(m_xTravelNext.get(), m_xOKBtn.get());
         }
     }