From e00032ba6a2ddd4c08ae6f03b1982d3c099d288e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 4 Feb 2022 09:13:52 +0000 Subject: add toId/fromId to tidy up some ugly casting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I70f34ac5e9b5d2f2d6c0375e823908eaa2e540b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129487 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- reportdesign/source/ui/dlg/AddField.cxx | 8 ++++---- reportdesign/source/ui/dlg/Navigator.cxx | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 80c868eb5fd9..e3e1fb3a71ea 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -151,7 +151,7 @@ void OAddFieldWindow::addToList(const uno::Sequence< OUString >& rEntries) for (const OUString& rEntry : rEntries) { m_aListBoxData.emplace_back(new ColumnInfo(rEntry)); - OUString sId(OUString::number(reinterpret_cast(m_aListBoxData.back().get()))); + OUString sId(weld::toId(m_aListBoxData.back().get())); m_xListBox->append(sId, rEntry); } } @@ -166,7 +166,7 @@ void OAddFieldWindow::addToList(const uno::Reference< container::XNameAccess>& i if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) ) xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel; m_aListBoxData.emplace_back(new ColumnInfo(rEntry, sLabel)); - OUString sId(OUString::number(reinterpret_cast(m_aListBoxData.back().get()))); + OUString sId(weld::toId(m_aListBoxData.back().get())); if ( !sLabel.isEmpty() ) m_xListBox->append(sId, sLabel); else @@ -272,7 +272,7 @@ void OAddFieldWindow::fillDescriptor(const weld::TreeIter& rSelected, svx::OData rDescriptor[ svx::DataAccessDescriptorProperty::EscapeProcessing ] <<= m_bEscapeProcessing; rDescriptor[ svx::DataAccessDescriptorProperty::Connection ] <<= getConnection(); - ColumnInfo* pInfo = reinterpret_cast(m_xListBox->get_id(rSelected).toInt64()); + ColumnInfo* pInfo = weld::fromId(m_xListBox->get_id(rSelected)); rDescriptor[ svx::DataAccessDescriptorProperty::ColumnName ] <<= pInfo->sColumnName; if ( m_xColumns->hasByName( pInfo->sColumnName ) ) rDescriptor[ svx::DataAccessDescriptorProperty::ColumnObject ] = m_xColumns->getByName(pInfo->sColumnName); @@ -289,7 +289,7 @@ void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) ) xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel; m_aListBoxData.emplace_back(new ColumnInfo(sName, sLabel)); - OUString sId(OUString::number(reinterpret_cast(m_aListBoxData.back().get()))); + OUString sId(weld::toId(m_aListBoxData.back().get())); if (!sLabel.isEmpty()) m_xListBox->append(sId, sLabel); else diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 2a9f4f3ac010..64bc04129c54 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -234,7 +234,7 @@ NavigatorTree::NavigatorTree(std::unique_ptr xTreeView, OReportC NavigatorTree::~NavigatorTree() { m_xTreeView->all_foreach([this](weld::TreeIter& rIter) { - UserData* pData = reinterpret_cast(m_xTreeView->get_id(rIter).toInt64()); + UserData* pData = weld::fromId(m_xTreeView->get_id(rIter)); delete pData; return false; }); @@ -268,7 +268,7 @@ IMPL_LINK(NavigatorTree, CommandHdl, const CommandEvent&, rEvt, bool) { case CommandEventId::ContextMenu: { - UserData* pData = reinterpret_cast(m_xTreeView->get_selected_id().toInt64()); + UserData* pData = weld::fromId(m_xTreeView->get_selected_id()); if (!pData) break; @@ -337,7 +337,7 @@ IMPL_LINK_NOARG(NavigatorTree, OnEntrySelDesel, weld::TreeView&, void) bool bEntry = m_xTreeView->get_cursor(xEntry.get()); uno::Any aSelection; if (bEntry && m_xTreeView->is_selected(*xEntry)) - aSelection <<= reinterpret_cast(m_xTreeView->get_id(*xEntry).toInt64())->getContent(); + aSelection <<= weld::fromId(m_xTreeView->get_id(*xEntry))->getContent(); m_rController.select(aSelection); m_pSelectionListener->unlock(); } @@ -381,7 +381,7 @@ void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) void NavigatorTree::insertEntry(const OUString& rName, const weld::TreeIter* pParent, const OUString& rImageId, int nPosition, UserData* pData, weld::TreeIter& rRet) { - OUString sId = pData ? OUString::number(reinterpret_cast(pData)) : OUString(); + OUString sId = pData ? weld::toId(pData) : OUString(); m_xTreeView->insert(pParent, nPosition, &rName, &sId, nullptr, nullptr, false, &rRet); if (!rImageId.isEmpty()) m_xTreeView->set_image(rRet, rImageId); @@ -430,7 +430,7 @@ bool NavigatorTree::find(const uno::Reference& xContent, weld:: if (xContent.is()) { m_xTreeView->all_foreach([this, &xContent, &bRet, &rRet](weld::TreeIter& rIter) { - UserData* pData = reinterpret_cast(m_xTreeView->get_id(rIter).toInt64()); + UserData* pData = weld::fromId(m_xTreeView->get_id(rIter)); if (pData->getContent() == xContent) { m_xTreeView->copy_iterator(rIter, rRet); @@ -647,7 +647,7 @@ void NavigatorTree::_elementReplaced( const container::ContainerEvent& _rEvent ) bool bEntry = find(xProp, *xEntry); if (bEntry) { - UserData* pData = reinterpret_cast(m_xTreeView->get_id(*xEntry).toInt64()); + UserData* pData = weld::fromId(m_xTreeView->get_id(*xEntry)); xProp.set(_rEvent.Element,uno::UNO_QUERY); pData->setContent(xProp); OUString sName; @@ -672,7 +672,7 @@ void NavigatorTree::removeEntry(const weld::TreeIter& rEntry, bool bRemove) removeEntry(*xChild, false); bChild = m_xTreeView->iter_next_sibling(*xChild); } - delete reinterpret_cast(m_xTreeView->get_id(rEntry).toInt64()); + delete weld::fromId(m_xTreeView->get_id(rEntry)); if (bRemove) m_xTreeView->remove(rEntry); } -- cgit