1 files changed, 31 insertions, 29 deletions

diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index afff27b75dfd..18ca75e01bfe 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -25,13 +25,14 @@
 #include <bitmaps.hlst>
 #include <iderid.hxx>
 #include <tools/urlobj.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <svtools/imagemgr.hxx>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/sfxsids.hrc>
+#include <svl/itemset.hxx>
 
 #include <initializer_list>
 #include <memory>
@@ -41,6 +42,7 @@
 #include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNamed.hpp>
+#include <utility>
 
 namespace basctl
 {
@@ -87,12 +89,12 @@ Entry::~Entry()
 { }
 
 DocumentEntry::DocumentEntry (
-    ScriptDocument const& rDocument,
+    ScriptDocument aDocument,
     LibraryLocation eLocation,
     EntryType eType
 ) :
     Entry(eType),
-    m_aDocument(rDocument),
+    m_aDocument(std::move(aDocument)),
     m_eLocation(eLocation)
 {
     OSL_ENSURE( m_aDocument.isValid(), "DocumentEntry::DocumentEntry: illegal document!" );
@@ -104,10 +106,10 @@ DocumentEntry::~DocumentEntry()
 LibEntry::LibEntry (
     ScriptDocument const& rDocument,
     LibraryLocation eLocation,
-    OUString const& rLibName
+    OUString aLibName
 ) :
     DocumentEntry(rDocument, eLocation, OBJ_TYPE_LIBRARY),
-    m_aLibName(rLibName)
+    m_aLibName(std::move(aLibName))
 { }
 
 LibEntry::~LibEntry()
@@ -120,38 +122,38 @@ EntryDescriptor::EntryDescriptor () :
 { }
 
 EntryDescriptor::EntryDescriptor (
-    ScriptDocument const& rDocument,
+    ScriptDocument aDocument,
     LibraryLocation eLocation,
-    OUString const& rLibName,
-    OUString const& rLibSubName,
-    OUString const& rName,
+    OUString aLibName,
+    OUString aLibSubName,
+    OUString aName,
     EntryType eType
 ) :
-    m_aDocument(rDocument),
+    m_aDocument(std::move(aDocument)),
     m_eLocation(eLocation),
-    m_aLibName(rLibName),
-    m_aLibSubName(rLibSubName),
-    m_aName(rName),
+    m_aLibName(std::move(aLibName)),
+    m_aLibSubName(std::move(aLibSubName)),
+    m_aName(std::move(aName)),
     m_eType(eType)
 {
     OSL_ENSURE( m_aDocument.isValid(), "EntryDescriptor::EntryDescriptor: invalid document!" );
 }
 
 EntryDescriptor::EntryDescriptor (
-    ScriptDocument const& rDocument,
+    ScriptDocument aDocument,
     LibraryLocation eLocation,
-    OUString const& rLibName,
-    OUString const& rLibSubName,
-    OUString const& rName,
-    OUString const& rMethodName,
+    OUString aLibName,
+    OUString aLibSubName,
+    OUString aName,
+    OUString aMethodName,
     EntryType eType
 ) :
-    m_aDocument(rDocument),
+    m_aDocument(std::move(aDocument)),
     m_eLocation(eLocation),
-    m_aLibName(rLibName),
-    m_aLibSubName(rLibSubName),
-    m_aName(rName),
-    m_aMethodName(rMethodName),
+    m_aLibName(std::move(aLibName)),
+    m_aLibSubName(std::move(aLibSubName)),
+    m_aName(std::move(aName)),
+    m_aMethodName(std::move(aMethodName)),
     m_eType(eType)
 {
     OSL_ENSURE( m_aDocument.isValid(), "EntryDescriptor::EntryDescriptor: invalid document!" );
@@ -176,7 +178,7 @@ SbTreeListBox::~SbTreeListBox()
     bool bValidIter = m_xControl->get_iter_first(*m_xScratchIter);
     while (bValidIter)
     {
-        Entry* pBasicEntry = reinterpret_cast<Entry*>(m_xControl->get_id(*m_xScratchIter).toInt64());
+        Entry* pBasicEntry = weld::fromId<Entry*>(m_xControl->get_id(*m_xScratchIter));
         delete pBasicEntry;
         bValidIter = m_xControl->iter_next(*m_xScratchIter);
     }
@@ -243,9 +245,9 @@ void SbTreeListBox::ImpCreateLibEntries(const weld::TreeIter& rIter, const Scrip
             // create tree list box entry
             OUString sId;
             if ( ( nMode & BrowseMode::Dialogs ) && !( nMode & BrowseMode::Modules ) )
-                sId = bLoaded ? OUString(RID_BMP_DLGLIB) : OUString(RID_BMP_DLGLIBNOTLOADED);
+                sId = bLoaded ? RID_BMP_DLGLIB : RID_BMP_DLGLIBNOTLOADED;
             else
-                sId = bLoaded ? OUString(RID_BMP_MODLIB) : OUString(RID_BMP_MODLIBNOTLOADED);
+                sId = bLoaded ? RID_BMP_MODLIB : RID_BMP_MODLIBNOTLOADED;
             std::unique_ptr<weld::TreeIter> xLibRootEntry(m_xControl->make_iterator(&rIter));
             bool bLibRootEntry = FindEntry(aLibName, OBJ_TYPE_LIBRARY, *xLibRootEntry);
             if (bLibRootEntry)
@@ -577,7 +579,7 @@ void SbTreeListBox::RemoveEntry(const weld::TreeIter& rIter)
     }
 
     // removing the associated user data
-    Entry* pBasicEntry = reinterpret_cast<Entry*>(m_xControl->get_id(rIter).toInt64());
+    Entry* pBasicEntry = weld::fromId<Entry*>(m_xControl->get_id(rIter));
     delete pBasicEntry;
     // removing the entry
     m_xControl->remove(rIter);
@@ -604,7 +606,7 @@ bool SbTreeListBox::FindEntry(std::u16string_view rText, EntryType eType, weld::
     bool bValidIter = m_xControl->iter_children(rIter);
     while (bValidIter)
     {
-        Entry* pBasicEntry = reinterpret_cast<Entry*>(m_xControl->get_id(rIter).toInt64());
+        Entry* pBasicEntry = weld::fromId<Entry*>(m_xControl->get_id(rIter));
         assert(pBasicEntry && "FindEntry: no Entry ?!");
         if (pBasicEntry->GetType() == eType && rText == m_xControl->get_text(rIter))
             return true;
@@ -654,7 +656,7 @@ void SbTreeListBox::AddEntry(
     std::unique_ptr<weld::TreeIter> xScratch = pRet ? nullptr : m_xControl->make_iterator();
     if (!pRet)
         pRet = xScratch.get();
-    OUString sId(OUString::number(reinterpret_cast<sal_uInt64>(rUserData.release())));
+    OUString sId(weld::toId(rUserData.release()));
     m_xControl->insert(pParent, -1, &rText, &sId, nullptr, nullptr, bChildrenOnDemand, pRet);
     m_xControl->set_image(*pRet, rImage);
 }