1 files changed, 10 insertions, 13 deletions

diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 544b79d03267..28f4d50e4a81 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -26,17 +26,14 @@
 #include <com/sun/star/sdb/application/CopyTableOperation.hpp>
 
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
 using namespace dbaui;
 
 namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation;
 
 OUString OWizColumnSelect::GetTitle() const { return DBA_RES(STR_WIZ_COLUMN_SELECT_TITLE); }
 
-OWizardPage::OWizardPage(weld::Container* pPage, OCopyTableWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID)
+OWizardPage::OWizardPage(weld::Container* pPage, OCopyTableWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID)
     : ::vcl::OWizardPage(pPage, pWizard, rUIXMLDescription, rID)
     , m_pParent(pWizard)
     , m_bFirstTime(true)
@@ -73,7 +70,7 @@ OWizColumnSelect::~OWizColumnSelect()
 {
     while (m_xNewColumnNames->n_children())
     {
-        delete reinterpret_cast<OFieldDescription*>(m_xNewColumnNames->get_id(0).toInt64());
+        delete weld::fromId<OFieldDescription*>(m_xNewColumnNames->get_id(0));
         m_xNewColumnNames->remove(0);
     }
 }
@@ -90,7 +87,7 @@ void OWizColumnSelect::Reset()
 
     for (auto const& column : rSrcColumns)
     {
-        OUString sId(OUString::number(reinterpret_cast<sal_Int64>(column->second)));
+        OUString sId(weld::toId(column->second));
         m_xOrgColumnNames->append(sId, column->first);
     }
 
@@ -121,7 +118,7 @@ void OWizColumnSelect::Activate( )
     {
         if (rSrcColumns.find(column->first) != rSrcColumns.end())
         {
-            OUString sId(OUString::number(reinterpret_cast<sal_Int64>(new OFieldDescription(*(column->second)))));
+            OUString sId(weld::toId(new OFieldDescription(*(column->second))));
             m_xNewColumnNames->append(sId, column->first);
             int nRemove = m_xOrgColumnNames->find_text(column->first);
             if (nRemove != -1)
@@ -140,7 +137,7 @@ bool OWizColumnSelect::LeavePage()
 
     for(sal_Int32 i=0 ; i< m_xNewColumnNames->n_children();++i)
     {
-        OFieldDescription* pField = reinterpret_cast<OFieldDescription*>(m_xNewColumnNames->get_id(i).toInt64());
+        OFieldDescription* pField = weld::fromId<OFieldDescription*>(m_xNewColumnNames->get_id(i));
         OSL_ENSURE(pField,"The field information can not be null!");
         m_pParent->insertColumn(i,pField);
     }
@@ -275,7 +272,7 @@ void OWizColumnSelect::createNewColumn( weld::TreeView* _pListbox,
                                         OFieldDescription const * _pSrcField,
                                         std::vector< OUString>& _rRightColumns,
                                         const OUString&  _sColumnName,
-                                        const OUString&  _sExtraChars,
+                                        std::u16string_view  _sExtraChars,
                                         sal_Int32               _nMaxNameLen,
                                         const ::comphelper::UStringMixEqual& _aCase)
 {
@@ -290,7 +287,7 @@ void OWizColumnSelect::createNewColumn( weld::TreeView* _pListbox,
     if ( !m_pParent->supportsPrimaryKey() )
         pNewField->SetPrimaryKey(false);
 
-    _pListbox->append(OUString::number(reinterpret_cast<sal_Int64>(pNewField)), sConvertedName);
+    _pListbox->append(weld::toId(pNewField), sConvertedName);
     _rRightColumns.push_back(sConvertedName);
 
     if ( !bNotConvert )
@@ -301,14 +298,14 @@ void OWizColumnSelect::moveColumn(  weld::TreeView* _pRight,
                                     weld::TreeView const * _pLeft,
                                     std::vector< OUString>& _rRightColumns,
                                     const OUString&  _sColumnName,
-                                    const OUString&  _sExtraChars,
+                                    std::u16string_view  _sExtraChars,
                                     sal_Int32               _nMaxNameLen,
                                     const ::comphelper::UStringMixEqual& _aCase)
 {
     if(_pRight == m_xNewColumnNames.get())
     {
         // we copy the column into the new format for the dest
-        OFieldDescription* pSrcField = reinterpret_cast<OFieldDescription*>(_pLeft->get_id(_pLeft->find_text(_sColumnName)).toInt64());
+        OFieldDescription* pSrcField = weld::fromId<OFieldDescription*>(_pLeft->get_id(_pLeft->find_text(_sColumnName)));
         createNewColumn(_pRight,pSrcField,_rRightColumns,_sColumnName,_sExtraChars,_nMaxNameLen,_aCase);
     }
     else
@@ -332,7 +329,7 @@ void OWizColumnSelect::moveColumn(  weld::TreeView* _pRight,
             OSL_ENSURE( aPos != rSrcVector.end(),"Invalid position for the iterator here!");
             ODatabaseExport::TColumnVector::size_type nPos = (aPos - rSrcVector.begin()) - adjustColumnPosition(_pLeft, _sColumnName, (aPos - rSrcVector.begin()), _aCase);
 
-            OUString sId(OUString::number(reinterpret_cast<sal_Int64>(aSrcIter->second)));
+            OUString sId(weld::toId(aSrcIter->second));
             const OUString& rStr = (*aIter).first;
             _pRight->insert(nullptr, nPos, &rStr, &sId, nullptr, nullptr, false, nullptr);
             _rRightColumns.push_back(rStr);