mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

std::unique_ptr<[]> -> std::vector

Browse Source 
Change-Id: I7fd4275664fab42c61941a4ea21750a653b437d3
This commit is contained in:
Caolán McNamara
2017-04-04 15:28:54 +01:00
parent be752d9f4e
commit 0144600bf5
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sw/source/filter/ww8/ww8scan.cxx
View File

@@ -6825,8 +6825,8 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
} }
// allocate Font Array // allocate Font Array
std::unique_ptr<sal_uInt8[]> pA( new sal_uInt8[nFFn] ); std::vector<sal_uInt8> aA(nFFn);
memset(pA.get(), 0, nFFn); memset(aA.data(), 0, nFFn);
ww::WordVersion eVersion = rFib.GetFIBVersion(); ww::WordVersion eVersion = rFib.GetFIBVersion();
@@ -6842,9 +6842,9 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
rSt.SeekRel( 2 ); rSt.SeekRel( 2 );
// read all font information // read all font information
nFFn = rSt.ReadBytes(pA.get(), nFFn); nFFn = rSt.ReadBytes(aA.data(), nFFn);
sal_uInt8 * const pEnd = pA.get() + nFFn; sal_uInt8 * const pEnd = aA.data() + nFFn;
const sal_uInt16 nCalcMax = calcMaxFonts(pA.get(), nFFn); const sal_uInt16 nCalcMax = calcMaxFonts(aA.data(), nFFn);
if (eVersion < ww::eWW8) if (eVersion < ww::eWW8)
nMax = nCalcMax; nMax = nCalcMax;
@@ -6863,7 +6863,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
if( eVersion <= ww::eWW2 ) if( eVersion <= ww::eWW2 )
{ {
sal_uInt8 const * pVer2 = pA.get(); sal_uInt8 const * pVer2 = aA.data();
sal_uInt16 i = 0; sal_uInt16 i = 0;
for(; i<nMax; ++i, ++p) for(; i<nMax; ++i, ++p)
{ {
@@ -6904,7 +6904,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
} }
else if( eVersion < ww::eWW8 ) else if( eVersion < ww::eWW8 )
{ {
sal_uInt8 const * pVer6 = pA.get(); sal_uInt8 const * pVer6 = aA.data();
sal_uInt16 i = 0; sal_uInt16 i = 0;
for(; i<nMax; ++i, ++p) for(; i<nMax; ++i, ++p)
{ {
@@ -6986,7 +6986,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
const sal_uInt8 cbMinFFNPayload = 41; const sal_uInt8 cbMinFFNPayload = 41;
sal_uInt16 nValidFonts = 0; sal_uInt16 nValidFonts = 0;
sal_Int32 nRemainingFFn = nFFn; sal_Int32 nRemainingFFn = nFFn;
sal_uInt8* pRaw = pA.get(); sal_uInt8* pRaw = aA.data();
for (sal_uInt16 i=0; i < nMax && nRemainingFFn; ++i, ++p) for (sal_uInt16 i=0; i < nMax && nRemainingFFn; ++i, ++p)
{ {
//pRaw[0] is cbFfnM1, the alleged total length of FFN - 1 //pRaw[0] is cbFfnM1, the alleged total length of FFN - 1