Skip to content

C
core
Kaydet (Commit) cbea6a70 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

xstUsrInitl contains max 9 chars 

Change-Id: Ia40d037d7af6cd3a283aa12948e4c5565dcb2ae6
üst 96d44c9b
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
sw/qa/core/data/ww8/pass/crash-1.doc 0 → 100644
Dosyayı görüntüle @ cbea6a70
This diff was suppressed by a .gitattributes entry.
sw/source/filter/ww8/ww8par.cxx
Dosyayı görüntüle @ cbea6a70
...@@ -2170,15 +2170,18 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes) ...@@ -2170,15 +2170,18 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
if (pA) if (pA)
sAuthor = *pA; sAuthor = *pA;
else else
sAuthor = OUString(pDescri->xstUsrInitl + 1, pDescri->xstUsrInitl[0], {
RTL_TEXTENCODING_MS_1252); const sal_uInt8 nLen = std::min<sal_uInt8>(pDescri->xstUsrInitl[0],
SAL_N_ELEMENTS(pDescri->xstUsrInitl)-1);
sAuthor = OUString(pDescri->xstUsrInitl + 1, nLen, RTL_TEXTENCODING_MS_1252);
}
} }
else else
{ {
const WW8_ATRD* pDescri = static_cast<const WW8_ATRD*>(pSD->GetData()); const WW8_ATRD* pDescri = static_cast<const WW8_ATRD*>(pSD->GetData());
{ {
const sal_uInt16 nLen = SVBT16ToShort(pDescri->xstUsrInitl[0]); const sal_uInt16 nLen = std::min<sal_uInt16>(SVBT16ToShort(pDescri->xstUsrInitl[0]),
SAL_N_ELEMENTS(pDescri->xstUsrInitl)-1);
OUStringBuffer aBuf; OUStringBuffer aBuf;
aBuf.setLength(nLen); aBuf.setLength(nLen);
for(sal_uInt16 nIdx = 1; nIdx <= nLen; ++nIdx) for(sal_uInt16 nIdx = 1; nIdx <= nLen; ++nIdx)
......
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