head 1.2; access; symbols pkgsrc-2016Q4:1.1.0.32 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.30 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.28 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.26 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.24 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.22 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.20 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.18 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.16 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.14 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.12 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.10 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.8 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.6 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.4 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.2 pkgsrc-2013Q1-base:1.1; locks; strict; comment @// @; 1.2 date 2016.12.29.19.10.28; author wiz; state dead; branches; next 1.1; commitid UT4GSflIUbUnEUzz; 1.1 date 2013.04.01.12.19.14; author joerg; state Exp; branches; next ; desc @@ 1.2 log @Remove old openoffice and libreoffice packages. As discussed on pkgsrc-users. @ text @$NetBSD: patch-sc_source_core_data_compressedarray.cxx,v 1.1 2013/04/01 12:19:14 joerg Exp $ --- sc/source/core/data/compressedarray.cxx.orig 2013-03-30 20:02:28.000000000 +0000 +++ sc/source/core/data/compressedarray.cxx @@@@ -370,7 +370,7 @@@@ A ScCompressedArray::GetLastUnequal template< typename A, typename D > unsigned long ScSummableCompressedArray::SumValues( A nStart, A nEnd ) const { - size_t nIndex = Search( nStart); + size_t nIndex = this->Search( nStart); unsigned long nSum = SumValuesContinuation( nStart, nEnd, nIndex); if (nEnd > this->nMaxAccess) nSum += this->pData[this->nCount-1].aValue * (nEnd - this->nMaxAccess); @@@@ -432,17 +432,17 @@@@ void ScBitMaskCompressedArray::AndV if (nStart > nEnd) return; - size_t nIndex = Search( nStart); + size_t nIndex = this->Search( nStart); do { if ((this->pData[nIndex].aValue & rValueToAnd) != this->pData[nIndex].aValue) { A nS = ::std::max( (nIndex>0 ? this->pData[nIndex-1].nEnd+1 : 0), nStart); A nE = ::std::min( this->pData[nIndex].nEnd, nEnd); - SetValue( nS, nE, this->pData[nIndex].aValue & rValueToAnd); + this->SetValue( nS, nE, this->pData[nIndex].aValue & rValueToAnd); if (nE >= nEnd) break; // while - nIndex = Search( nE + 1); + nIndex = this->Search( nE + 1); } else if (this->pData[nIndex].nEnd >= nEnd) break; // while @@@@ -459,17 +459,17 @@@@ void ScBitMaskCompressedArray::OrVa if (nStart > nEnd) return; - size_t nIndex = Search( nStart); + size_t nIndex = this->Search( nStart); do { if ((this->pData[nIndex].aValue | rValueToOr) != this->pData[nIndex].aValue) { A nS = ::std::max( (nIndex>0 ? this->pData[nIndex-1].nEnd+1 : 0), nStart); A nE = ::std::min( this->pData[nIndex].nEnd, nEnd); - SetValue( nS, nE, this->pData[nIndex].aValue | rValueToOr); + this->SetValue( nS, nE, this->pData[nIndex].aValue | rValueToOr); if (nE >= nEnd) break; // while - nIndex = Search( nE + 1); + nIndex = this->Search( nE + 1); } else if (this->pData[nIndex].nEnd >= nEnd) break; // while @@@@ -494,7 +494,7 @@@@ void ScBitMaskCompressedArray::Copy nRegionEnd -= nSourceDy; if (nRegionEnd > nEnd) nRegionEnd = nEnd; - SetValue( j, nRegionEnd, rValue & rValueToAnd); + this->SetValue( j, nRegionEnd, rValue & rValueToAnd); j = nRegionEnd; } } @@@@ -515,7 +515,7 @@@@ void ScBitMaskCompressedArray::Copy nRegionEnd -= nSourceDy; if (nRegionEnd > nEnd) nRegionEnd = nEnd; - SetValue( j, nRegionEnd, rValue | rValueToOr); + this->SetValue( j, nRegionEnd, rValue | rValueToOr); j = nRegionEnd; } } @@@@ -526,7 +526,7 @@@@ A ScBitMaskCompressedArray::GetBitS const D& rBitMask, const D& rMaskedCompare ) const { A nStart = ::std::numeric_limits::max(); - size_t nIndex = Search( nEnd); + size_t nIndex = this->Search( nEnd); while ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare) { if (nIndex > 0) @@@@ -549,7 +549,7 @@@@ A ScBitMaskCompressedArray::GetBitS const D& rBitMask, const D& rMaskedCompare ) const { A nEnd = ::std::numeric_limits::max(); - size_t nIndex = Search( nStart); + size_t nIndex = this->Search( nStart); while (nIndex < this->nCount && (this->pData[nIndex].aValue & rBitMask) == rMaskedCompare) { @@@@ -564,7 +564,7 @@@@ template< typename A, typename D > A ScBitMaskCompressedArray::GetFirstForCondition( A nStart, A nEnd, const D& rBitMask, const D& rMaskedCompare ) const { - size_t nIndex = Search( nStart); + size_t nIndex = this->Search( nStart); do { if ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare) @@@@ -584,7 +584,7 @@@@ template< typename A, typename D > A ScBitMaskCompressedArray::GetLastForCondition( A nStart, A nEnd, const D& rBitMask, const D& rMaskedCompare ) const { - size_t nIndex = Search( nEnd); + size_t nIndex = this->Search( nEnd); while (1) { if ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare) @@@@ -608,7 +608,7 @@@@ A ScBitMaskCompressedArray::CountFo const D& rBitMask, const D& rMaskedCompare ) const { A nRet = 0; - size_t nIndex = Search( nStart); + size_t nIndex = this->Search( nStart); do { if ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare) @@@@ -631,7 +631,7 @@@@ size_t ScBitMaskCompressedArray::Fi A * pArray, size_t nArraySize ) const { size_t nUsed = 0; - size_t nIndex = Search( nStart); + size_t nIndex = this->Search( nStart); while (nIndex < this->nCount && nUsed < nArraySize) { if ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare) @@@@ -653,7 +653,7 @@@@ template< typename A, typename D > bool ScBitMaskCompressedArray::HasCondition( A nStart, A nEnd, const D& rBitMask, const D& rMaskedCompare ) const { - size_t nIndex = Search( nStart); + size_t nIndex = this->Search( nStart); do { if ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare) @@@@ -671,7 +671,7 @@@@ A ScBitMaskCompressedArray::CountFo const D& rBitMask ) const { A nRet = 0; - size_t nIndex = Search( nStart); + size_t nIndex = this->Search( nStart); do { if ((this->pData[nIndex].aValue & rBitMask) != 0) @@@@ -725,7 +725,7 @@@@ unsigned long ScBitMaskCompressedArraySearch( nStart); size_t nIndex2 = rArray.Search( nStart); do { @@@@ -759,7 +759,7 @@@@ unsigned long ScBitMaskCompressedArraySearch( nStart); size_t nIndex2 = rArray.Search( nStart); do { @ 1.1 log @Fix various C++ issues to allow building with Clang. @ text @d1 1 a1 1 $NetBSD$ @