add toId/fromId to tidy up some ugly casting

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

6 files changed, 64 insertions, 64 deletions

diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 8491ea4a7ef1..63a9f7f39f14 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -63,7 +63,7 @@ void OTasksWindow::updateHelpText()
     TranslateId pHelpTextId;
     int nCurEntry = m_xTreeView->get_selected_index();
     if (nCurEntry != -1)
-        pHelpTextId = reinterpret_cast<TaskEntry*>(m_xTreeView->get_id(nCurEntry).toUInt64())->pHelpID;
+        pHelpTextId = weld::fromId<TaskEntry*>(m_xTreeView->get_id(nCurEntry))->pHelpID;
     setHelpText(pHelpTextId);
 }
 
@@ -73,7 +73,7 @@ IMPL_LINK(OTasksWindow, onSelected, weld::TreeView&, rTreeView, bool)
     if (m_nCursorIndex != -1)
     {
         URL aCommand;
-        aCommand.Complete = reinterpret_cast<TaskEntry*>(rTreeView.get_id(m_nCursorIndex).toUInt64())->sUNOCommand;
+        aCommand.Complete = weld::fromId<TaskEntry*>(rTreeView.get_id(m_nCursorIndex))->sUNOCommand;
         getDetailView()->getBorderWin().getView()->getAppController().executeChecked( aCommand, Sequence< PropertyValue >() );
     }
     return true;
@@ -175,7 +175,7 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList )
         size_t nIndex = 0;
         for (auto const& task : _rList)
         {
-            OUString sId = OUString::number(reinterpret_cast<sal_uInt64>(new TaskEntry(task)));
+            OUString sId = weld::toId(new TaskEntry(task));
             m_xTreeView->append(sId, task.sTitle);
             m_xTreeView->set_image(nIndex++, *pImages++);
         }
@@ -192,7 +192,7 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList )
 void OTasksWindow::Clear()
 {
     m_xTreeView->all_foreach([this](weld::TreeIter& rEntry){
-        TaskEntry* pUserData = reinterpret_cast<TaskEntry*>(m_xTreeView->get_id(rEntry).toUInt64());
+        TaskEntry* pUserData = weld::fromId<TaskEntry*>(m_xTreeView->get_id(rEntry));
         delete pUserData;
         return false;
     });
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 4d6cb342dc44..0ea6c5400fb3 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -469,7 +469,7 @@ bool SbaTableQueryBrowser::InitializeForm( const Reference< XPropertySet > & i_f
     try
     {
         weld::TreeView& rTreeView = m_pTreeView->GetWidget();
-        DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*m_xCurrentlyDisplayed).toUInt64());
+        DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*m_xCurrentlyDisplayed));
         ENSURE_OR_RETURN_FALSE( pData, "SbaTableQueryBrowser::InitializeForm: No user data set at the currently displayed entry!" );
         ENSURE_OR_RETURN_FALSE( pData->xObjectProperties.is(), "SbaTableQueryBrowser::InitializeForm: No table available!" );
 
@@ -549,7 +549,7 @@ void SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm
                 Sequence< Any> aValues(7 + ( m_bPreview ? 5 : 0 ));
 
                 weld::TreeView& rTreeView = m_pTreeView->GetWidget();
-                DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*m_xCurrentlyDisplayed).toUInt64());
+                DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*m_xCurrentlyDisplayed));
                 OSL_ENSURE( pData->xObjectProperties.is(), "SbaTableQueryBrowser::InitializeGridModel: No table available!" );
                 if ( !pData->xObjectProperties.is() )
                     return;
@@ -761,7 +761,7 @@ static Reference<XPropertySet> getColumnHelper(const weld::TreeView& rTreeView,
     Reference<XPropertySet> xRet;
     if (pCurrentlyDisplayed)
     {
-        DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*pCurrentlyDisplayed).toUInt64());
+        DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*pCurrentlyDisplayed));
         Reference<XColumnsSupplier> xColumnsSup(pData->xObjectProperties,UNO_QUERY);
         Reference<XNameAccess> xNames = xColumnsSup->getColumns();
         OUString aName;
@@ -777,7 +777,7 @@ void SbaTableQueryBrowser::transferChangedControlProperty(const OUString& _rProp
     if (m_xCurrentlyDisplayed)
     {
         weld::TreeView& rTreeView = m_pTreeView->GetWidget();
-        DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*m_xCurrentlyDisplayed).toUInt64());
+        DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*m_xCurrentlyDisplayed));
         Reference< XPropertySet > xObjectProps = pData->xObjectProperties;
         OSL_ENSURE(xObjectProps.is(),"SbaTableQueryBrowser::transferChangedControlProperty: no table/query object!");
         if (xObjectProps.is())
@@ -862,7 +862,7 @@ void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt)
         {
             if (m_xCurrentlyDisplayed)
             {
-                DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*m_xCurrentlyDisplayed).toUInt64());
+                DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*m_xCurrentlyDisplayed));
                 OSL_ENSURE( pData->xObjectProperties.is(), "No table available!" );
 
                 bool bDefault = !evt.NewValue.hasValue();
@@ -1054,7 +1054,7 @@ namespace
 OUString SbaTableQueryBrowser::getDataSourceAccessor(const weld::TreeIter& rDataSourceEntry) const
 {
     weld::TreeView& rTreeView = m_pTreeView->GetWidget();
-    DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(rDataSourceEntry).toUInt64());
+    DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(rDataSourceEntry));
     OSL_ENSURE( pData, "SbaTableQueryBrowser::getDataSourceAccessor: invalid entry data!" );
     OSL_ENSURE( pData->eType == etDatasource, "SbaTableQueryBrowser::getDataSourceAccessor: entry does not denote a data source!" );
     return !pData->sAccessor.isEmpty() ? pData->sAccessor : GetEntryText(rDataSourceEntry);
@@ -1167,7 +1167,7 @@ std::unique_ptr<weld::TreeIter> SbaTableQueryBrowser::getObjectEntry(const OUStr
                     {
                         if (ensureEntryObject(*xObject))
                         {
-                            DBTreeListUserData* pParentData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xObject).toUInt64());
+                            DBTreeListUserData* pParentData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xObject));
                             Reference< XNameAccess > xCollection( pParentData->xContainer, UNO_QUERY );
                             sal_Int32 nIndex2 = nIndex;
                             sPath = _rCommand.getToken( 0, '/', nIndex2 );
@@ -1345,7 +1345,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const css::lang::EventObject& _rS
                 {
                     do
                     {
-                        DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xDSLoop).toUInt64());
+                        DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xDSLoop));
                         if ( pData && pData->xConnection == xCon )
                         {
                             // we set the connection to null to avoid a second disposing of the connection
@@ -1645,7 +1645,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
             std::unique_ptr<weld::TreeIter> xDataSourceEntry = m_pTreeView->GetRootLevelParent(xCurrentEntry.get());
             DBTreeListUserData* pDSData
                 =   xDataSourceEntry
-                ?   reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xDataSourceEntry).toUInt64())
+                ?   weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xDataSourceEntry))
                 :   nullptr;
 
             if ( nId == ID_TREE_CLOSE_CONN )
@@ -2034,7 +2034,7 @@ void SbaTableQueryBrowser::implAddDatasource(const OUString& _rDbName, OUString&
     pDSData->eType = etDatasource;
     pDSData->sAccessor = sDataSourceId;
     pDSData->xConnection = _rxConnection;
-    OUString sId(OUString::number(reinterpret_cast<sal_uInt64>(pDSData)));
+    OUString sId(weld::toId(pDSData));
 
     std::unique_ptr<weld::TreeIter> xDatasourceEntry(rTreeView.make_iterator());
     rTreeView.insert(nullptr, -1, &sDSDisplayName, &sId, nullptr, nullptr, false, xDatasourceEntry.get());
@@ -2045,7 +2045,7 @@ void SbaTableQueryBrowser::implAddDatasource(const OUString& _rDbName, OUString&
     {
         DBTreeListUserData* pQueriesData = new DBTreeListUserData;
         pQueriesData->eType = etQueryContainer;
-        sId = OUString::number(reinterpret_cast<sal_uInt64>(pQueriesData));
+        sId = weld::toId(pQueriesData);
 
         std::unique_ptr<weld::TreeIter> xRet(rTreeView.make_iterator());
         rTreeView.insert(xDatasourceEntry.get(), -1, &_rQueryName, &sId,
@@ -2058,7 +2058,7 @@ void SbaTableQueryBrowser::implAddDatasource(const OUString& _rDbName, OUString&
     {
         DBTreeListUserData* pTablesData = new DBTreeListUserData;
         pTablesData->eType = etTableContainer;
-        sId = OUString::number(reinterpret_cast<sal_uInt64>(pTablesData));
+        sId = weld::toId(pTablesData);
 
         std::unique_ptr<weld::TreeIter> xRet(rTreeView.make_iterator());
         rTreeView.insert(xDatasourceEntry.get(), -1, &_rTableName, &sId,
@@ -2089,7 +2089,7 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce
     weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     rTreeView.make_unsorted();
 
-    DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(rParent).toUInt64());
+    DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(rParent));
     if (pData) // don't ask if the nameaccess is already set see OnExpandEntry views and tables
         pData->xContainer = _xNameAccess;
 
@@ -2128,7 +2128,7 @@ std::unique_ptr<weld::TreeIter> SbaTableQueryBrowser::implAppendEntry(const weld
 
     OUString aImage = xImageProvider->getImageId(rName, getDatabaseObjectType(eEntryType));
 
-    OUString sId(OUString::number(reinterpret_cast<sal_uInt64>(pUserData)));
+    OUString sId(weld::toId(pUserData));
     weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     std::unique_ptr<weld::TreeIter> xNewEntry(rTreeView.make_iterator());
     rTreeView.insert(pParent, -1, &rName, &sId, nullptr, nullptr, eEntryType == etQueryContainer, xNewEntry.get());
@@ -2150,7 +2150,7 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, const weld::TreeIter&, rParent, b
     std::unique_ptr<weld::TreeIter> xFirstParent = m_pTreeView->GetRootLevelParent(&rParent);
     OSL_ENSURE(xFirstParent,"SbaTableQueryBrowser::OnExpandEntry: No rootlevelparent!");
 
-    DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(rParent).toUInt64());
+    DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(rParent));
     assert(pData && "SbaTableQueryBrowser::OnExpandEntry: No user data!");
 
     if (etTableContainer == pData->eType)
@@ -2238,7 +2238,7 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, const weld::TreeIter&, rParent, b
         // we have to expand the queries or bookmarks
         if (ensureEntryObject(rParent))
         {
-            DBTreeListUserData* pParentData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(rParent).toUInt64());
+            DBTreeListUserData* pParentData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(rParent));
             Reference< XNameAccess > xCollection( pParentData->xContainer, UNO_QUERY );
             populateTree(xCollection, rParent, etQuery);
         }
@@ -2252,7 +2252,7 @@ bool SbaTableQueryBrowser::ensureEntryObject(const weld::TreeIter& rEntry)
 
     // the user data of the entry
     weld::TreeView& rTreeView = m_pTreeView->GetWidget();
-    DBTreeListUserData* pEntryData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(rEntry).toUInt64());
+    DBTreeListUserData* pEntryData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(rEntry));
     OSL_ENSURE(pEntryData,"ensureEntryObject: user data should already be set!");
 
     std::unique_ptr<weld::TreeIter> xDataSourceEntry = m_pTreeView->GetRootLevelParent(&rEntry);
@@ -2275,7 +2275,7 @@ bool SbaTableQueryBrowser::ensureEntryObject(const weld::TreeIter& rEntry)
                 if (rTreeView.iter_compare(*xParent, *xDataSourceEntry) != 0)
                 {
                     OUString aName(rTreeView.get_text(rEntry));
-                    DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xParent).toUInt64());
+                    DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xParent));
                     try
                     {
                         Reference< XNameAccess > xNameAccess(pData->xContainer,UNO_QUERY);
@@ -2482,11 +2482,11 @@ std::unique_ptr<weld::TreeIter> SbaTableQueryBrowser::implGetConnectionEntry(con
 {
     weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     std::unique_ptr<weld::TreeIter> xCurrentEntry(rTreeView.make_iterator(&rEntry));
-    DBTreeListUserData* pEntryData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xCurrentEntry).toUInt64());
+    DBTreeListUserData* pEntryData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xCurrentEntry));
     while (pEntryData->eType != etDatasource)
     {
         rTreeView.iter_parent(*xCurrentEntry);
-        pEntryData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xCurrentEntry).toUInt64());
+        pEntryData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xCurrentEntry));
     }
     return xCurrentEntry;
 }
@@ -2497,7 +2497,7 @@ bool SbaTableQueryBrowser::implSelect(const weld::TreeIter* pEntry)
         return false;
 
     weld::TreeView& rTreeView = m_pTreeView->GetWidget();
-    DBTreeListUserData* pEntryData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*pEntry).toUInt64());
+    DBTreeListUserData* pEntryData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*pEntry));
     switch (pEntryData->eType)
     {
         case etTableOrView:
@@ -2513,11 +2513,11 @@ bool SbaTableQueryBrowser::implSelect(const weld::TreeIter* pEntry)
     // get the entry for the tables or queries
     std::unique_ptr<weld::TreeIter> xContainer = rTreeView.make_iterator(pEntry);
     rTreeView.iter_parent(*xContainer);
-    DBTreeListUserData* pContainerData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xContainer).toUInt64());
+    DBTreeListUserData* pContainerData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xContainer));
 
     // get the entry for the datasource
     std::unique_ptr<weld::TreeIter> xConnection = implGetConnectionEntry(*xContainer);
-    DBTreeListUserData* pConData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xConnection).toUInt64());
+    DBTreeListUserData* pConData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xConnection));
 
     // reinitialize the rowset
     // but first check if it is necessary
@@ -2624,7 +2624,7 @@ bool SbaTableQueryBrowser::implSelect(const weld::TreeIter* pEntry)
             bool bEscapeProcessing = true;
             if(xNameAccess.is() && xNameAccess->hasByName(sSimpleName))
             {
-                DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*pEntry).toUInt64());
+                DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*pEntry));
                 if ( !pData->xObjectProperties.is() )
                 {
                     Reference<XInterface> xObject;
@@ -2725,14 +2725,14 @@ std::unique_ptr<weld::TreeIter> SbaTableQueryBrowser::getEntryFromContainer(cons
             if (rTreeView.iter_children(*xContainer))
             {
                 // 1st child is queries
-                DBTreeListUserData* pQueriesData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xContainer).toUInt64());
+                DBTreeListUserData* pQueriesData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xContainer));
                 if (pQueriesData && pQueriesData->xContainer == rxNameAccess)
                     break;
 
                 if (rTreeView.iter_next_sibling(*xContainer))
                 {
                     // 2nd child is tables
-                    DBTreeListUserData* pTablesData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xContainer).toUInt64());
+                    DBTreeListUserData* pTablesData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xContainer));
                     if (pTablesData && pTablesData->xContainer == rxNameAccess)
                         break;
                 }
@@ -2759,7 +2759,7 @@ void SAL_CALL SbaTableQueryBrowser::elementInserted(const ContainerEvent& rEvent
         rTreeView.make_unsorted();
 
         // insert the new entry into the tree
-        DBTreeListUserData* pContainerData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xEntry).toUInt64());
+        DBTreeListUserData* pContainerData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xEntry));
         OSL_ENSURE(pContainerData, "elementInserted: There must be user data for this type!");
 
         DBTreeListUserData* pNewData = new DBTreeListUserData;
@@ -2824,7 +2824,7 @@ void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEven
             // unload
             unloadAndCleanup( false ); // don't dispose the connection
 
-            DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xTemp).toUInt64());
+            DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xTemp));
             rTreeView.set_id(*xTemp, OUString());
             delete pData; // the data could be null because we have a table which isn't correct
             rTreeView.remove(*xTemp);
@@ -2839,7 +2839,7 @@ void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEven
                 {
                     if (rTreeView.get_text(*xChild) == aName)
                     {
-                        DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xChild).toUInt64());
+                        DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xChild));
                         rTreeView.set_id(*xChild, OUString());
                         delete pData;
                         rTreeView.remove(*xChild);
@@ -2875,7 +2875,7 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve
             std::unique_ptr<weld::TreeIter> xTemp = rTreeView.make_iterator(m_xCurrentlyDisplayed.get());
             unloadAndCleanup( false ); // don't dispose the connection
 
-            DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xTemp).toUInt64());
+            DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xTemp));
             if (pData)
             {
                 if ( etTableOrView == pData->eType )
@@ -2900,7 +2900,7 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve
                 {
                     if (rTreeView.get_text(*xChild) == aName)
                     {
-                        DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xChild).toUInt64());
+                        DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xChild));
                         if (pData)
                         {
                             if ( etTableOrView == pData->eType )
@@ -2968,7 +2968,7 @@ void SbaTableQueryBrowser::disposeConnection(const weld::TreeIter* pDSEntry)
     if (pDSEntry)
     {
         weld::TreeView& rTreeView = m_pTreeView->GetWidget();
-        DBTreeListUserData* pTreeListData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*pDSEntry).toUInt64());
+        DBTreeListUserData* pTreeListData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*pDSEntry));
         if (pTreeListData)
             impl_releaseConnection(pTreeListData->xConnection);
     }
@@ -3004,7 +3004,7 @@ void SbaTableQueryBrowser::closeConnection(const weld::TreeIter& rDSEntry, bool
                 {
                     std::unique_ptr<weld::TreeIter> xRemove(rTreeView.make_iterator(xElements.get()));
                     bElements = rTreeView.iter_next_sibling(*xElements);
-                    DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xRemove).toUInt64());
+                    DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xRemove));
                     rTreeView.set_id(*xRemove, OUString());
                     delete pData;
                     rTreeView.remove(*xRemove);
@@ -3306,7 +3306,7 @@ bool SbaTableQueryBrowser::ensureConnection(const weld::TreeIter* pAnyEntry, Sha
     weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     DBTreeListUserData* pDSData =
                 xDSEntry
-            ?   reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xDSEntry).toUInt64())
+            ?   weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xDSEntry))
             :   nullptr;
 
     return ensureConnection(xDSEntry.get(), pDSData, rConnection);
@@ -3327,7 +3327,7 @@ bool SbaTableQueryBrowser::getExistentConnectionFor(const weld::TreeIter* pAnyEn
     weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     DBTreeListUserData* pDSData =
                 xDSEntry
-            ?   reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xDSEntry).toUInt64())
+            ?   weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xDSEntry))
             :   nullptr;
     if (pDSData)
         rConnection = pDSData->xConnection;
@@ -3523,7 +3523,7 @@ Any SbaTableQueryBrowser::getCurrentSelection(weld::TreeView& rControl) const
         return Any();
 
     NamedDatabaseObject aSelectedObject;
-    DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xSelected).toUInt64());
+    DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xSelected));
     aSelectedObject.Type = static_cast< sal_Int32 >( pData->eType );
 
     switch ( aSelectedObject.Type )
@@ -3781,14 +3781,14 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry(std::u16string_view rData
         do
         {
             // delete any user data of the child entries of the to-be-removed entry
-            const DBTreeListUserData* pData = reinterpret_cast<const DBTreeListUserData*>(rTreeView.get_id(*xChild).toUInt64());
+            const DBTreeListUserData* pData = weld::fromId<const DBTreeListUserData*>(rTreeView.get_id(*xChild));
             rTreeView.set_id(*xChild, OUString());
             delete pData;
         } while (rTreeView.iter_next_sibling(*xChild));
     }
 
     // remove the entry
-    DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xDataSourceEntry).toUInt64());
+    DBTreeListUserData* pData = weld::fromId<DBTreeListUserData*>(rTreeView.get_id(*xDataSourceEntry));
     rTreeView.set_id(*xDataSourceEntry, OUString());
     delete pData;
     rTreeView.remove(*xDataSourceEntry);
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 544b79d03267..a24c2e25468b 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -73,7 +73,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 +90,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 +121,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 +140,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);
     }
@@ -290,7 +290,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 )
@@ -308,7 +308,7 @@ void OWizColumnSelect::moveColumn(  weld::TreeView* _pRight,
     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 +332,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);
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 75ff6e3372f1..a6bb59da8eea 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -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;
     }
 
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 6f3fbd79d22c..d5462ed3f083 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -86,7 +86,7 @@ void OWizTypeSelectControl::CellModified(sal_Int32 nRow, sal_uInt16 nColId )
     OFieldDescription* pCurFieldDescr = getCurrentFieldDescData();
 
     const sal_Int32 nPos = pListBox->find_text(pCurFieldDescr->GetName());
-    pCurFieldDescr = reinterpret_cast< OFieldDescription* >( pListBox->get_id(nPos).toInt64() );
+    pCurFieldDescr = weld::fromId<OFieldDescription*>(pListBox->get_id(nPos));
     OSL_ENSURE( pCurFieldDescr, "OWizTypeSelectControl::CellModified: Columnname/type not found in the listbox!" );
     if ( !pCurFieldDescr )
         return;
@@ -153,7 +153,7 @@ void OWizTypeSelectControl::CellModified(sal_Int32 nRow, sal_uInt16 nColId )
 
                 pListBox->remove(nPos);
                 pListBox->insert_text(nPos, pCurFieldDescr->GetName());
-                pListBox->set_id(nPos, OUString::number(reinterpret_cast<sal_Int64>(pCurFieldDescr)));
+                pListBox->set_id(nPos, weld::toId(pCurFieldDescr));
 
                 pWiz->replaceColumn(nPos,pCurFieldDescr,sOldName);
             }
@@ -248,7 +248,7 @@ OUString OWizTypeSelect::GetTitle() const
 
 IMPL_LINK_NOARG(OWizTypeSelect, ColumnSelectHdl, weld::TreeView&, void)
 {
-    OFieldDescription* pField = reinterpret_cast<OFieldDescription*>(m_xColumnNames->get_selected_id().toInt64());
+    OFieldDescription* pField = weld::fromId<OFieldDescription*>(m_xColumnNames->get_selected_id());
     if (pField)
         m_xTypeControl->DisplayData(pField);
 
@@ -265,7 +265,7 @@ void OWizTypeSelect::Reset()
     const ODatabaseExport::TColumnVector& rDestColumns = m_pParent->getDestVector();
     for (auto const& column : rDestColumns)
     {
-        OUString sId(OUString::number(reinterpret_cast<sal_Int64>(column->second)));
+        OUString sId(weld::toId(column->second));
         m_xColumnNames->append(sId, column->first);
         if (column->second->IsPrimaryKey())
             m_xColumnNames->set_image(nCount, BMP_PRIMARY_KEY);
@@ -288,7 +288,7 @@ void OWizTypeSelect::Activate( )
 bool OWizTypeSelect::LeavePage()
 {
     bool bDuplicateName = false;
-    OFieldDescription* pField = reinterpret_cast<OFieldDescription*>(m_xColumnNames->get_selected_id().toInt64());
+    OFieldDescription* pField = weld::fromId<OFieldDescription*>(m_xColumnNames->get_selected_id());
     if ( pField )
     {
         m_xTypeControl->SaveData(pField);
@@ -339,7 +339,7 @@ bool OWizTypeSelectList::IsPrimaryKeyAllowed() const
 
     for( sal_Int32 j = 0; m_bPKey && j < nCount; ++j )
     {
-        OFieldDescription* pField = reinterpret_cast<OFieldDescription*>(m_xControl->get_id(aRows[j]).toInt64());
+        OFieldDescription* pField = weld::fromId<OFieldDescription*>(m_xControl->get_id(aRows[j]));
         if(!pField || pField->getTypeInfo()->nSearchType == ColumnSearch::NONE)
             return false;
     }
@@ -374,7 +374,7 @@ IMPL_LINK(OWizTypeSelectList, CommandHdl, const CommandEvent&, rCEvt, bool)
     bool bCheckOk = false;
     for(sal_Int32 j = 0 ; j < nCount ; ++j)
     {
-        OFieldDescription* pFieldDescr = reinterpret_cast<OFieldDescription*>(m_xControl->get_id(j).toInt64());
+        OFieldDescription* pFieldDescr = weld::fromId<OFieldDescription*>(m_xControl->get_id(j));
         // if at least one of the fields is selected but not in the primary key,
         // or is in the primary key but not selected, then don't check the
         // primary key checkbox.
@@ -396,7 +396,7 @@ IMPL_LINK(OWizTypeSelectList, CommandHdl, const CommandEvent&, rCEvt, bool)
 
     for (sal_Int32 j = 0 ; j < nCount; ++j)
     {
-        OFieldDescription* pFieldDescr = reinterpret_cast<OFieldDescription*>(m_xControl->get_id(j).toInt64());
+        OFieldDescription* pFieldDescr = weld::fromId<OFieldDescription*>(m_xControl->get_id(j));
         if (pFieldDescr)
         {
             if(!bCheckOk && m_xControl->is_selected(j))
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 8660a503f1a4..b8afc951d2d8 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -192,7 +192,7 @@ void OTableWindow::FillListBox()
 
     if (GetData()->IsShowAll())
     {
-        rTreeView.append(OUString::number(reinterpret_cast<sal_uInt64>(createUserData(nullptr,false))), OUString("*"));
+        rTreeView.append(weld::toId(createUserData(nullptr,false)), OUString("*"));
     }
 
     Reference<XNameAccess> xPKeyColumns;
@@ -220,7 +220,7 @@ void OTableWindow::FillListBox()
                 OUString sId;
                 Reference<XPropertySet> xColumn(xColumns->getByName(*pIter),UNO_QUERY);
                 if (xColumn.is())
-                    sId = OUString::number(reinterpret_cast<sal_uInt64>(createUserData(xColumn, bPrimaryKeyColumn)));
+                    sId = weld::toId(createUserData(xColumn, bPrimaryKeyColumn));
 
                 rTreeView.append(sId, *pIter);
 
@@ -255,7 +255,7 @@ void OTableWindow::clearListBox()
 
     weld::TreeView& rTreeView = m_xListBox->get_widget();
     rTreeView.all_foreach([this, &rTreeView](weld::TreeIter& rEntry){
-        void* pUserData = reinterpret_cast<void*>(rTreeView.get_id(rEntry).toUInt64());
+        void* pUserData = weld::fromId<void*>(rTreeView.get_id(rEntry));
         deleteUserData(pUserData);
         return false;
     });