diff options
Diffstat (limited to 'extensions/source/ole/oleobjw.cxx')
| -rw-r--r-- | extensions/source/ole/oleobjw.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index ac431e61ff23..66742712b24d 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -78,16 +78,16 @@ namespace ole_adapter // called. // Before UNO object is wrapped to COM object this map is checked // to see if the UNO object is already a wrapper. -std::unordered_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap; +std::unordered_map<sal_uIntPtr, sal_uIntPtr> AdapterToWrapperMap; // key: XInterface of the wrapper object. // value: XInterface of the Interface created by the Invocation Adapter Factory. // A COM wrapper is responsible for removing the corresponding entry // in AdapterToWrappperMap if it is being destroyed. Because the wrapper does not // know about its adapted interface it uses WrapperToAdapterMap to get the // adapted interface which is then used to locate the entry in AdapterToWrapperMap. -std::unordered_map<sal_uInt32,sal_uInt32> WrapperToAdapterMap; +std::unordered_map<sal_uIntPtr,sal_uIntPtr> WrapperToAdapterMap; -std::unordered_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap; +std::unordered_map<sal_uIntPtr, WeakReference<XInterface> > ComPtrToWrapperMap; /***************************************************************************** class implementation IUnknownWrapper_Impl @@ -114,17 +114,17 @@ IUnknownWrapper_Impl::~IUnknownWrapper_Impl() #endif // remove entries in global maps - typedef std::unordered_map<sal_uInt32, sal_uInt32>::iterator _IT; - _IT it= WrapperToAdapterMap.find( (sal_uInt32) xIntRoot); + typedef std::unordered_map<sal_uIntPtr, sal_uIntPtr>::iterator _IT; + _IT it= WrapperToAdapterMap.find( (sal_uIntPtr) xIntRoot); if( it != WrapperToAdapterMap.end()) { - sal_uInt32 adapter= it->second; + sal_uIntPtr adapter= it->second; AdapterToWrapperMap.erase( adapter); WrapperToAdapterMap.erase( it); } - IT_Com it_c= ComPtrToWrapperMap.find( (sal_uInt32) m_spUnknown.p); + IT_Com it_c= ComPtrToWrapperMap.find( (sal_uIntPtr) m_spUnknown.p); if(it_c != ComPtrToWrapperMap.end()) ComPtrToWrapperMap.erase(it_c); } |