[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/plugins/chartshape/kdchart/src
From:       Johannes Simon <johannes.simon () gmail ! com>
Date:       2010-10-21 23:41:52
Message-ID: 20101021234152.02A73AC89C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1188310 by jsimon:

This check can't be used for columns/rowsRemoved() because it is called after the \
column/row was removed from the model, thus asking the model if the row being removed \
is valid doesn't work.

Sebastian, I saw you made the change. Please verify the fix. Although I like the \
additional asserts, I don't see why we should silently ignore any inconsistency \
(lines 213 and 302). Is there a certain case that requires tolerating them?

See r1187158.

CCMAIL: sebastian.sauer@kdab.com

 M  +2 -2      KDChartModelDataCache_p.h  


--- trunk/koffice/plugins/chartshape/kdchart/src/KDChartModelDataCache_p.h \
#1188309:1188310 @@ -230,7 +230,7 @@
         {
             Q_ASSERT( m_model != 0 );
 
-            if( parent != m_rootIndex || start >= m_model->columnCount(m_rootIndex) \
) +            if( parent != m_rootIndex )
                 return;
 
             Q_ASSERT( start <= end );
@@ -316,7 +316,7 @@
         {
             Q_ASSERT( m_model != 0 );
 
-            if( parent != m_rootIndex || start >= m_model->rowCount(m_rootIndex) )
+            if( parent != m_rootIndex )
                 return;
 
             Q_ASSERT( start <= end );


[prev in list] [next in list] [prev in thread] [next in thread]