use some more add toId/fromId

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

3 files changed, 21 insertions, 21 deletions

diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 3ce4e81bb8e7..dc9d84801c2b 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -135,8 +135,8 @@ int SvxRedlinTable::ColCompare(const weld::TreeIter& rLeft, const weld::TreeIter
 
     if (pTreeView == xWriterTreeView.get() && nSortCol == 0)
     {
-        RedlinData *pLeftData = reinterpret_cast<RedlinData*>(pTreeView->get_id(rLeft).toInt64());
-        RedlinData *pRightData = reinterpret_cast<RedlinData*>(pTreeView->get_id(rRight).toInt64());
+        RedlinData *pLeftData = weld::fromId<RedlinData*>(pTreeView->get_id(rLeft));
+        RedlinData *pRightData = weld::fromId<RedlinData*>(pTreeView->get_id(rRight));
 
         if (pLeftData && pRightData)
         {
@@ -150,8 +150,8 @@ int SvxRedlinTable::ColCompare(const weld::TreeIter& rLeft, const weld::TreeIter
 
     if (nSortCol == nDatePos)
     {
-        RedlinData *pLeftData = reinterpret_cast<RedlinData*>(pTreeView->get_id(rLeft).toInt64());
-        RedlinData *pRightData = reinterpret_cast<RedlinData*>(pTreeView->get_id(rRight).toInt64());
+        RedlinData *pLeftData = weld::fromId<RedlinData*>(pTreeView->get_id(rLeft));
+        RedlinData *pRightData = weld::fromId<RedlinData*>(pTreeView->get_id(rRight));
 
         if (pLeftData && pRightData)
         {
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index fa4449c46b95..e950a060bd61 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -679,7 +679,7 @@ RecoveryDialog::RecoveryDialog(weld::Window* pParent, RecoveryCore* pCore)
     {
         const TURLInfo& rInfo = rURLList[i];
         m_xFileListLB->append();
-        m_xFileListLB->set_id(i, OUString::number(reinterpret_cast<sal_IntPtr>(&rInfo)));
+        m_xFileListLB->set_id(i, weld::toId(&rInfo));
         m_xFileListLB->set_image(i, rInfo.StandardImageId, 0);
         m_xFileListLB->set_text(i, rInfo.DisplayName, 1);
         m_xFileListLB->set_image(i, impl_getStatusImage(rInfo), 2);
@@ -871,7 +871,7 @@ void RecoveryDialog::updateItems()
     int c = m_xFileListLB->n_children();
     for (int i = 0; i < c; ++i)
     {
-        TURLInfo* pInfo = reinterpret_cast<TURLInfo*>(m_xFileListLB->get_id(i).toInt64());
+        TURLInfo* pInfo = weld::fromId<TURLInfo*>(m_xFileListLB->get_id(i));
         if ( !pInfo )
             continue;
 
@@ -887,7 +887,7 @@ void RecoveryDialog::stepNext(TURLInfo* pItem)
     int c = m_xFileListLB->n_children();
     for (int i=0; i < c; ++i)
     {
-        TURLInfo* pInfo = reinterpret_cast<TURLInfo*>(m_xFileListLB->get_id(i).toInt64());
+        TURLInfo* pInfo = weld::fromId<TURLInfo*>(m_xFileListLB->get_id(i));
         if (pInfo->ID != pItem->ID)
             continue;
 
@@ -1044,7 +1044,7 @@ void BrokenRecoveryDialog::impl_refresh()
 
         m_bExecutionNeeded = true;
 
-        m_xFileListLB->append(OUString::number(reinterpret_cast<sal_IntPtr>(&rInfo)), rInfo.DisplayName, rInfo.StandardImageId);
+        m_xFileListLB->append(weld::toId(&rInfo), rInfo.DisplayName, rInfo.StandardImageId);
     }
     m_sSavePath.clear();
     m_xOkBtn->grab_focus();
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 22426ad7dbeb..66c70522cf16 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -925,7 +925,7 @@ IMPL_STATIC_LINK(FmFilterNavigator, CustomGetSizeHdl, weld::TreeView::get_size_a
 
     Size aSize;
 
-    FmFilterData* pData = reinterpret_cast<FmFilterData*>(rId.toUInt64());
+    FmFilterData* pData = weld::fromId<FmFilterData*>(rId);
     OUString sText = pData->GetText();
 
     if (FmFilterItem* pItem = dynamic_cast<FmFilterItem*>(pData))
@@ -967,7 +967,7 @@ IMPL_STATIC_LINK(FmFilterNavigator, CustomRenderHdl, weld::TreeView::render_args
     else
         rRenderContext.SetTextColor(rStyleSettings.GetDialogTextColor());
 
-    FmFilterData* pData = reinterpret_cast<FmFilterData*>(rId.toUInt64());
+    FmFilterData* pData = weld::fromId<FmFilterData*>(rId);
     OUString sText = pData->GetText();
     Point aPos(aRect.TopLeft());
 
@@ -1108,7 +1108,7 @@ void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControl
 IMPL_LINK(FmFilterNavigator, EditingEntryHdl, const weld::TreeIter&, rIter, bool)
 {
     // returns true to allow editing
-    if (dynamic_cast<const FmFilterItem*>(reinterpret_cast<FmFilterData*>(m_xTreeView->get_id(rIter).toUInt64())))
+    if (dynamic_cast<const FmFilterItem*>(weld::fromId<FmFilterData*>(m_xTreeView->get_id(rIter))))
     {
         m_xEditingCurrently = m_xTreeView->make_iterator(&rIter);
         return true;
@@ -1126,7 +1126,7 @@ IMPL_LINK(FmFilterNavigator, EditedEntryHdl, const IterString&, rIterString, boo
                "FmFilterNavigator::EditedEntry: suspicious entry!");
     m_xEditingCurrently.reset();
 
-    FmFilterData* pData = reinterpret_cast<FmFilterData*>(m_xTreeView->get_id(rIter).toUInt64());
+    FmFilterData* pData = weld::fromId<FmFilterData*>(m_xTreeView->get_id(rIter));
 
     DBG_ASSERT(dynamic_cast<const FmFilterItem*>(pData) != nullptr,
                     "FmFilterNavigator::EditedEntry() wrong entry");
@@ -1190,7 +1190,7 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt )
     if (!xDropTarget)
         return DND_ACTION_NONE;
 
-    FmFilterData* pData = reinterpret_cast<FmFilterData*>(m_xTreeView->get_id(*xDropTarget).toUInt64());
+    FmFilterData* pData = weld::fromId<FmFilterData*>(m_xTreeView->get_id(*xDropTarget));
     FmFormItem* pForm = nullptr;
     if (dynamic_cast<const FmFilterItem*>(pData) !=  nullptr)
     {
@@ -1214,7 +1214,7 @@ namespace
 {
     FmFilterItems* getTargetItems(const weld::TreeView& rTreeView, const weld::TreeIter& rTarget)
     {
-        FmFilterData* pData = reinterpret_cast<FmFilterData*>(rTreeView.get_id(rTarget).toUInt64());
+        FmFilterData* pData = weld::fromId<FmFilterData*>(rTreeView.get_id(rTarget));
         FmFilterItems*  pTargetItems = dynamic_cast<FmFilterItems*>(pData);
         if (!pTargetItems)
             pTargetItems = dynamic_cast<FmFilterItems*>(pData->GetParent());
@@ -1253,7 +1253,7 @@ IMPL_LINK_NOARG(FmFilterNavigator, SelectHdl, weld::TreeView&, void)
     if (!m_xTreeView->get_selected(xIter.get()))
         return;
 
-    FmFilterData* pData = reinterpret_cast<FmFilterData*>(m_xTreeView->get_id(*xIter).toUInt64());
+    FmFilterData* pData = weld::fromId<FmFilterData*>(m_xTreeView->get_id(*xIter));
 
     FmFormItem* pFormItem = nullptr;
     if (FmFilterItem* pItem = dynamic_cast<FmFilterItem*>(pData))
@@ -1310,7 +1310,7 @@ std::unique_ptr<weld::TreeIter> FmFilterNavigator::FindEntry(const FmFilterData*
         return nullptr;
     do
     {
-        FmFilterData* pEntryItem = reinterpret_cast<FmFilterData*>(m_xTreeView->get_id(*xEntry).toUInt64());
+        FmFilterData* pEntryItem = weld::fromId<FmFilterData*>(m_xTreeView->get_id(*xEntry));
         if (pEntryItem == pItem)
             return xEntry;
     }
@@ -1326,7 +1326,7 @@ void FmFilterNavigator::Insert(FmFilterData* pItem, int nPos)
     // insert the item
     std::unique_ptr<weld::TreeIter> xParentEntry = FindEntry(pParent);
 
-    OUString sId(OUString::number(reinterpret_cast<sal_uIntPtr>(pItem)));
+    OUString sId(weld::toId(pItem));
     std::unique_ptr<weld::TreeIter> xRet(m_xTreeView->make_iterator());
     m_xTreeView->insert(xParentEntry.get(), nPos, &pItem->GetText(), &sId,
                         nullptr, nullptr, false, xRet.get());
@@ -1369,7 +1369,7 @@ FmFormItem* FmFilterNavigator::getSelectedFilterItems(::std::vector<FmFilterItem
     bool bFoundSomething = false;
 
     m_xTreeView->selected_foreach([this, &bHandled, &bFoundSomething, &pFirstItem, &_rItemList](weld::TreeIter& rEntry) {
-        FmFilterData* pFilterEntry = reinterpret_cast<FmFilterData*>(m_xTreeView->get_id(rEntry).toInt64());
+        FmFilterData* pFilterEntry = weld::fromId<FmFilterData*>(m_xTreeView->get_id(rEntry));
         FmFilterItem* pFilter = dynamic_cast<FmFilterItem*>(pFilterEntry);
         if (pFilter)
         {
@@ -1475,7 +1475,7 @@ IMPL_LINK(FmFilterNavigator, PopupMenuHdl, const CommandEvent&, rEvt, bool)
 
             ::std::vector<FmFilterData*> aSelectList;
             m_xTreeView->selected_foreach([this, &aSelectList](weld::TreeIter& rEntry) {
-                FmFilterData* pFilterEntry = reinterpret_cast<FmFilterData*>(m_xTreeView->get_id(rEntry).toInt64());
+                FmFilterData* pFilterEntry = weld::fromId<FmFilterData*>(m_xTreeView->get_id(rEntry));
 
                 // don't delete forms
                 FmFormItem* pForm = dynamic_cast<FmFormItem*>(pFilterEntry);
@@ -1505,7 +1505,7 @@ IMPL_LINK(FmFilterNavigator, PopupMenuHdl, const CommandEvent&, rEvt, bool)
                 xContextMenu->remove("delete");
             }
 
-            FmFilterData* pFilterEntry = reinterpret_cast<FmFilterData*>(m_xTreeView->get_id(*xClicked).toInt64());
+            FmFilterData* pFilterEntry = weld::fromId<FmFilterData*>(m_xTreeView->get_id(*xClicked));
             auto pFilterItem = dynamic_cast<FmFilterItem*>(pFilterEntry);
             bool bEdit = pFilterItem &&
                 m_xTreeView->is_selected(*xClicked) && m_xTreeView->count_selected_rows() == 1;
@@ -1697,7 +1697,7 @@ void FmFilterNavigator::DeleteSelection()
     std::vector<FmFilterData*> aEntryList;
 
     m_xTreeView->selected_foreach([this, &aEntryList](weld::TreeIter& rEntry) {
-        FmFilterData* pFilterEntry = reinterpret_cast<FmFilterData*>(m_xTreeView->get_id(rEntry).toInt64());
+        FmFilterData* pFilterEntry = weld::fromId<FmFilterData*>(m_xTreeView->get_id(rEntry));
 
         if (dynamic_cast<FmFilterItem*>(pFilterEntry))
         {