diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-08 16:47:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-10 12:49:48 +0100 |
| commit | 0c38c3e0899f50ba2a780ca7c261a622bcf32bb2 (patch) | |
| tree | 5cd878cb64b5a6e3a93f48fdf810bc6fe5bc0b0f /sw/source | |
| parent | 37af4b002422f889ceecc21474a4b049f516b72e (diff) | |
avoid possibility of storagename collision on 64bit
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 2c2d234b3599..477eaa4c4d60 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -2805,12 +2805,11 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrObject *pOb STREAM_SHARE_DENYALL); //Create a destination storage for the microsoft control - String sStorageName('_'); - sStorageName += String::CreateFromInt32((sal_uInt32)(sal_uIntPtr)pObj); - SvStorageRef xOleStg = xObjPool->OpenSotStorage(sStorageName, + rtl::OUStringBuffer sStorageName; + sStorageName.append('_').append(reinterpret_cast<sal_Int64>(pObj)); + SvStorageRef xOleStg = xObjPool->OpenSotStorage(sStorageName.makeStringAndClear(), STREAM_READWRITE|STREAM_SHARE_DENYALL); - if (!xOleStg.Is()) return false; |