Kaydet (Commit) 0c38c3e0 authored tarafından Caolán McNamara's avatar Caolán McNamara

avoid possibility of storagename collision on 64bit

üst 37af4b00
...@@ -2805,12 +2805,11 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrObject *pOb ...@@ -2805,12 +2805,11 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrObject *pOb
STREAM_SHARE_DENYALL); STREAM_SHARE_DENYALL);
//Create a destination storage for the microsoft control //Create a destination storage for the microsoft control
String sStorageName('_'); rtl::OUStringBuffer sStorageName;
sStorageName += String::CreateFromInt32((sal_uInt32)(sal_uIntPtr)pObj); sStorageName.append('_').append(reinterpret_cast<sal_Int64>(pObj));
SvStorageRef xOleStg = xObjPool->OpenSotStorage(sStorageName, SvStorageRef xOleStg = xObjPool->OpenSotStorage(sStorageName.makeStringAndClear(),
STREAM_READWRITE|STREAM_SHARE_DENYALL); STREAM_READWRITE|STREAM_SHARE_DENYALL);
if (!xOleStg.Is()) if (!xOleStg.Is())
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment