diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-08-26 12:47:18 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-08-26 12:47:18 +0000 |
| commit | 004098681b06be35ad163abf2ae7ef8c39212a5a (patch) | |
| tree | 4bb1bf452ac0908ed1acb02116cafefc02565c8a /xmloff/source/chart/SchXMLTableContext.cxx | |
| parent | df2226e0bdc0ab020d8a59f6f5fc83d5a769ee00 (diff) | |
CWS-TOOLING: integrate CWS chart40
2009-08-05 10:28:53 +0200 iha r274640 : CWS-TOOLING: rebase CWS chart40 to trunk@274622 (milestone: DEV300:m54)
2009-07-31 18:03:11 +0200 iha r274546 : #i91420# number of lines on chart type dialog is incorrect
2009-07-23 15:51:13 +0200 iha r274275 : correct detection of old chart files b6700820
2009-07-23 15:10:30 +0200 iha r274273 : #i103287# some lines vanish on import of some old files (opacity-problem)
2009-07-23 13:42:10 +0200 iha r274268 : #i103588# Chart in report cause crash
2009-07-23 10:57:14 +0200 iha r274264 : #i95503# Enter key does not work in source ranges dialog
2009-07-22 10:25:02 +0200 iha r274221 : #i103713# ambiguous && ||
2009-07-20 12:59:02 +0200 iha r274120 : #i103468# remove warning
Diffstat (limited to 'xmloff/source/chart/SchXMLTableContext.cxx')
| -rw-r--r-- | xmloff/source/chart/SchXMLTableContext.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index 4eb17d289d73..a1c021171a92 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -936,7 +936,15 @@ void SchXMLTableHelper::applyTableSimple( sal_Int32 nColumnCount = 0; sal_Int32 nCol = 0, nRow = 0; if( nRowCount ) + { nColumnCount = rTable.aData[ 0 ].size(); + ::std::vector< ::std::vector< SchXMLCell > >::const_iterator iRow = rTable.aData.begin(); + while( iRow != rTable.aData.end() ) + { + nColumnCount = ::std::max( nColumnCount, static_cast<sal_Int32>(iRow->size()) ); + iRow++; + } + } // #i27909# avoid illegal index access for empty tables if( nColumnCount == 0 || nRowCount == 0 ) @@ -950,7 +958,8 @@ void SchXMLTableHelper::applyTableSimple( // set labels ::std::vector< ::std::vector< SchXMLCell > >::const_iterator iRow = rTable.aData.begin(); - for( nCol = 1; nCol < nColumnCount; nCol++ ) + sal_Int32 nColumnCountOnFirstRow = iRow->size(); + for( nCol = 1; nCol < nColumnCountOnFirstRow; nCol++ ) { aLabels[ nCol - 1 ] = (*iRow)[ nCol ].aString; } |