[Libreoffice-commits] core.git: sw/source

himajin100000 himajin100000 at gmail.com
Sat Mar 31 09:03:31 UTC 2018


 sw/source/core/bastyp/bparr.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 0c71a3efb9c7b617c82cef0e9db105f64690cbcb
Author: himajin100000 <himajin100000 at gmail.com>
Date:   Thu Mar 29 02:25:46 2018 +0900

    adapt to variable name change in commit ca67dcae
    
    Change-Id: Ie5eef74f76221b45c72a78f53a3f7ce072f02b5c
    Reviewed-on: https://gerrit.libreoffice.org/52168
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx
index 81316418a55e..e8add976077e 100644
--- a/sw/source/core/bastyp/bparr.cxx
+++ b/sw/source/core/bastyp/bparr.cxx
@@ -200,7 +200,7 @@ void BigPtrArray::BlockDel( sal_uInt16 nDel )
 
 void BigPtrArray::Insert( BigPtrEntry* pElem, sal_uLong pos )
 {
-    CHECKIDX( ppInf, nBlock, nSize, nCur );
+    CHECKIDX( m_ppInf.get(), m_nBlock, m_nSize, m_nCur );
 
     BlockInfo* p;
     sal_uInt16 cur;
@@ -293,12 +293,12 @@ void BigPtrArray::Insert( BigPtrEntry* pElem, sal_uLong pos )
     if( cur != ( m_nBlock - 1 ) ) UpdIndex( cur );
     m_nCur = cur;
 
-    CHECKIDX( ppInf, nBlock, nSize, nCur );
+    CHECKIDX( m_ppInf.get(), m_nBlock, m_nSize, m_nCur );
 }
 
 void BigPtrArray::Remove( sal_uLong pos, sal_uLong n )
 {
-    CHECKIDX( ppInf, nBlock, nSize, nCur );
+    CHECKIDX( m_ppInf.get(), m_nBlock, m_nSize, m_nCur );
 
     sal_uInt16 nBlkdel = 0;              // deleted blocks
     sal_uInt16 cur = Index2Block( pos ); // current block number
@@ -377,7 +377,7 @@ void BigPtrArray::Remove( sal_uLong pos, sal_uLong n )
     if( m_nBlock > ( m_nSize / ( MAXENTRY / 2 ) ) )
         Compress();
 
-    CHECKIDX( ppInf, nBlock, nSize, nCur );
+    CHECKIDX( m_ppInf.get(), m_nBlock, m_nSize, m_nCur );
 }
 
 void BigPtrArray::Replace( sal_uLong idx, BigPtrEntry* pElem)
@@ -393,7 +393,7 @@ void BigPtrArray::Replace( sal_uLong idx, BigPtrEntry* pElem)
 /** Compress the array */
 sal_uInt16 BigPtrArray::Compress()
 {
-    CHECKIDX( ppInf, nBlock, nSize, nCur );
+    CHECKIDX( m_ppInf.get(), m_nBlock, m_nSize, m_nCur );
 
     // Iterate over InfoBlock array from beginning to end. If there is a deleted
     // block in between so move all following ones accordingly. The pointer <pp>
@@ -490,9 +490,9 @@ sal_uInt16 BigPtrArray::Compress()
     if( m_nCur >= nFirstChgPos )
         m_nCur = 0;
 
-    CHECKIDX( ppInf, nBlock, nSize, nCur );
+    CHECKIDX( m_ppInf.get(), m_nBlock, m_nSize, m_nCur );
 
     return nFirstChgPos;
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 */


More information about the Libreoffice-commits mailing list