1 files changed, 17 insertions, 17 deletions

diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 75ff6e3372f1..5eba2844b625 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -30,17 +30,17 @@ using namespace ::dbaui;
 
 // OWizColumnSelect
 OWizNameMatching::OWizNameMatching(weld::Container* pPage, OCopyTableWizard* pWizard)
-    : OWizardPage(pPage, pWizard, "dbaccess/ui/namematchingpage.ui", "NameMatching")
-    , m_xTABLE_LEFT(m_xBuilder->weld_label("leftlabel"))
-    , m_xTABLE_RIGHT(m_xBuilder->weld_label("rightlabel"))
-    , m_xCTRL_LEFT(m_xBuilder->weld_tree_view("left"))
-    , m_xCTRL_RIGHT(m_xBuilder->weld_tree_view("right"))
-    , m_xColumn_up(m_xBuilder->weld_button("up"))
-    , m_xColumn_down(m_xBuilder->weld_button("down"))
-    , m_xColumn_up_right(m_xBuilder->weld_button("up_right"))
-    , m_xColumn_down_right(m_xBuilder->weld_button("down_right"))
-    , m_xAll(m_xBuilder->weld_button("all"))
-    , m_xNone(m_xBuilder->weld_button("none"))
+    : OWizardPage(pPage, pWizard, u"dbaccess/ui/namematchingpage.ui"_ustr, u"NameMatching"_ustr)
+    , m_xTABLE_LEFT(m_xBuilder->weld_label(u"leftlabel"_ustr))
+    , m_xTABLE_RIGHT(m_xBuilder->weld_label(u"rightlabel"_ustr))
+    , m_xCTRL_LEFT(m_xBuilder->weld_tree_view(u"left"_ustr))
+    , m_xCTRL_RIGHT(m_xBuilder->weld_tree_view(u"right"_ustr))
+    , m_xColumn_up(m_xBuilder->weld_button(u"up"_ustr))
+    , m_xColumn_down(m_xBuilder->weld_button(u"down"_ustr))
+    , m_xColumn_up_right(m_xBuilder->weld_button(u"up_right"_ustr))
+    , m_xColumn_down_right(m_xBuilder->weld_button(u"down_right"_ustr))
+    , m_xAll(m_xBuilder->weld_button(u"all"_ustr))
+    , m_xNone(m_xBuilder->weld_button(u"none"_ustr))
 {
     OUString aImgUp(BMP_UP);
     OUString aImgDown(BMP_DOWN);
@@ -60,8 +60,8 @@ OWizNameMatching::OWizNameMatching(weld::Container* pPage, OCopyTableWizard* pWi
 
     m_xCTRL_LEFT->enable_toggle_buttons(weld::ColumnToggleType::Check);
 
-    m_xCTRL_LEFT->connect_changed(LINK(this,OWizNameMatching,TableListClickHdl));
-    m_xCTRL_RIGHT->connect_changed(LINK(this,OWizNameMatching,TableListRightSelectHdl));
+    m_xCTRL_LEFT->connect_selection_changed(LINK(this, OWizNameMatching, TableListClickHdl));
+    m_xCTRL_RIGHT->connect_selection_changed(LINK(this, OWizNameMatching, TableListRightSelectHdl));
 
     m_sSourceText = m_xTABLE_LEFT->get_label() + "\n";
     m_sDestText   = m_xTABLE_RIGHT->get_label() + "\n";
@@ -119,7 +119,7 @@ bool OWizNameMatching::LeavePage()
     bool bRightEntry = m_xCTRL_RIGHT->get_iter_first(*xRightEntry);
     while (bLeftEntry && bRightEntry)
     {
-        OFieldDescription* pSrcField = reinterpret_cast<OFieldDescription*>(m_xCTRL_LEFT->get_id(*xLeftEntry).toInt64());
+        OFieldDescription* pSrcField = weld::fromId<OFieldDescription*>(m_xCTRL_LEFT->get_id(*xLeftEntry));
         OSL_ENSURE(pSrcField,"OWizNameMatching: OColumn can not be null!");
 
         sal_Int32 nPos = 0;
@@ -132,7 +132,7 @@ bool OWizNameMatching::LeavePage()
 
         if (m_xCTRL_LEFT->get_toggle(*xLeftEntry) == TRISTATE_TRUE)
         {
-            OFieldDescription* pDestField = reinterpret_cast<OFieldDescription*>(m_xCTRL_RIGHT->get_id(*xRightEntry).toInt64());
+            OFieldDescription* pDestField = weld::fromId<OFieldDescription*>(m_xCTRL_RIGHT->get_id(*xRightEntry));
             OSL_ENSURE(pDestField,"OWizNameMatching: OColumn can not be null!");
             const ODatabaseExport::TColumnVector& rDestColumns          = m_pParent->getDestVector();
             sal_Int32 nPosDest = 1;
@@ -268,7 +268,7 @@ IMPL_LINK_NOARG( OWizNameMatching, TableListRightSelectHdl, weld::TreeView&, voi
     if (nPos == -1)
         return;
 
-    OFieldDescription* pColumn = reinterpret_cast<OFieldDescription*>(m_xCTRL_RIGHT->get_id(nPos).toInt64());
+    OFieldDescription* pColumn = weld::fromId<OFieldDescription*>(m_xCTRL_RIGHT->get_id(nPos));
     if (pColumn->IsAutoIncrement())
     {
         m_xCTRL_RIGHT->unselect(nPos);
@@ -319,7 +319,7 @@ void OWizNameMatching::FillListBox(weld::TreeView& rTreeView, const ODatabaseExp
             rTreeView.set_toggle(nRow, bChecked ? TRISTATE_TRUE : TRISTATE_FALSE);
         }
         rTreeView.set_text(nRow, elem->first, 0);
-        rTreeView.set_id(nRow, OUString::number(reinterpret_cast<sal_Int64>(elem->second)));
+        rTreeView.set_id(nRow, weld::toId(elem->second));
         ++nRow;
     }