diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-10-04 11:34:57 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-10-27 13:59:09 +0100 |
| commit | 7e89e2827489d0b3bbd488f6c9e5a9e7e404d732 (patch) | |
| tree | ca34b4ec312dffbe8e71a8106a4c3d21478d64a1 /sd | |
| parent | 99628775132143936fcd00ca9e18a853616418e4 (diff) | |
sal_uIntPtr to sal_uInt64, sal_uLong to sal_Size for streams
Change-Id: I062f1f6c5b20ca47734a9a3cd1a229d51763a206
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/html/htmlex.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 56f4caf9d1a8..a52d5b3b7575 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -1080,7 +1080,9 @@ OUString HtmlExport::DocumentMetadata() const " ", RTL_TEXTENCODING_UTF8, &aNonConvertableCharacters); - OString aData(static_cast<const char*>(aStream.GetData()), aStream.GetSize()); + const sal_uInt64 nLen = aStream.GetSize(); + OSL_ENSURE(nLen < static_cast<sal_uInt64>(SAL_MAX_INT32), "Stream can't fit in OString"); + OString aData(static_cast<const char*>(aStream.GetData()), static_cast<sal_Int32>(nLen)); return OStringToOUString(aData, RTL_TEXTENCODING_UTF8); } |