sw/source/filter/ww8/wrtww8.cxx | 2 +- sw/source/filter/ww8/ww8scan.cxx | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-)
New commits: commit 089c91b1ad16232f130cb50266732509f83c52eb Author: Rene Engelhard <r...@rene-engelhard.de> AuthorDate: Thu Jun 9 15:51:33 2022 +0200 Commit: René Engelhard <r...@debian.org> CommitDate: Thu Jun 9 19:32:10 2022 +0200 fix bigendian builds after 410a64b472ae9de0bb06ddd8f4b55fd16686c860 and 6624721b3226ace33f5032b1c1ce595c19f1915c which changed the surrounding places but missed the occurence in #ifdef OSL_BIGENDIAN: Change-Id: I610b0e19a37207b925668d7f2315b27abce21b2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135558 Tested-by: René Engelhard <r...@debian.org> Reviewed-by: René Engelhard <r...@debian.org> diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 2a25fdc8a1e3..fdf0bd056de9 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -1239,7 +1239,7 @@ void WW8_WrFkp::Combine() sal_uInt16 i; // the Sprms must be rotated elsewhere sal_uInt32* p; - for( i = 0, p = (sal_uInt32*)pFkp; i <= nIMax; i++, p++ ) + for( i = 0, p = (sal_uInt32*)m_pFkp; i <= m_nIMax; i++, p++ ) *p = OSL_SWAPDWORD( *p ); #endif // ifdef OSL_BIGENDIAN } diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 51aa725e36b8..79ad6b110530 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -2159,9 +2159,9 @@ WW8PLCFspecial::WW8PLCFspecial(SvStream* pSt, sal_uInt32 nFilePos, m_nIMax = ( nPLCF - 4 ) / ( 4 + nStruct ); #ifdef OSL_BIGENDIAN - for( nIdx = 0; nIdx <= nIMax; nIdx++ ) - pPLCF_PosArray[nIdx] = OSL_SWAPDWORD( pPLCF_PosArray[nIdx] ); - nIdx = 0; + for( m_nIdx = 0; m_nIdx <= m_nIMax; nIdx++ ) + m_pPLCF_PosArray[m_nIdx] = OSL_SWAPDWORD( m_pPLCF_PosArray[m_nIdx] ); + m_nIdx = 0; #endif // OSL_BIGENDIAN if( nStruct ) // Pointer to content array m_pPLCF_Contents = reinterpret_cast<sal_uInt8*>(&m_pPLCF_PosArray[m_nIMax + 1]); @@ -2327,9 +2327,9 @@ void WW8PLCF::ReadPLCF(SvStream& rSt, WW8_FC nFilePos, sal_uInt32 nPLCF) if (bValid) { #ifdef OSL_BIGENDIAN - for( nIdx = 0; nIdx <= nIMax; nIdx++ ) - pPLCF_PosArray[nIdx] = OSL_SWAPDWORD( pPLCF_PosArray[nIdx] ); - nIdx = 0; + for( m_nIdx = 0; m_nIdx <= m_nIMax; m_nIdx++ ) + m_pPLCF_PosArray[m_nIdx] = OSL_SWAPDWORD( m_pPLCF_PosArray[m_nIdx] ); + m_nIdx = 0; #endif // OSL_BIGENDIAN // Pointer to content array m_pPLCF_Contents = reinterpret_cast<sal_uInt8*>(&m_pPLCF_PosArray[m_nIMax + 1]); @@ -2545,8 +2545,8 @@ WW8PLCFpcd::WW8PLCFpcd(SvStream* pSt, sal_uInt32 nFilePos, m_nIMax = ( nPLCF - 4 ) / ( 4 + nStruct ); #ifdef OSL_BIGENDIAN - for( tools::Long nI = 0; nI <= nIMax; nI++ ) - pPLCF_PosArray[nI] = OSL_SWAPDWORD( pPLCF_PosArray[nI] ); + for( tools::Long nI = 0; nI <= m_nIMax; nI++ ) + m_pPLCF_PosArray[nI] = OSL_SWAPDWORD( m_pPLCF_PosArray[nI] ); #endif // OSL_BIGENDIAN // Pointer to content array