Unwind this logic a bit.

Change-Id: I320b28fb319b42eeae7cada31b6f27f9e342db15
This commit is contained in:
Kohei Yoshida
2014-06-24 19:07:27 -04:00
parent e32b78ebfd
commit 1e0c38bb54

View File

@@ -748,10 +748,14 @@ OUString DataBrowserModel::getRoleOfColumn( sal_Int32 nColumnIndex ) const
bool DataBrowserModel::isCategoriesColumn( sal_Int32 nColumnIndex ) const bool DataBrowserModel::isCategoriesColumn( sal_Int32 nColumnIndex ) const
{ {
bool bIsCategories = false; if (nColumnIndex < 0)
if( nColumnIndex>=0 && nColumnIndex<static_cast< sal_Int32 >(m_aColumns.size()) ) return false;
bIsCategories = !m_aColumns[ nColumnIndex ].m_xDataSeries.is();
return bIsCategories; if (static_cast<size_t>(nColumnIndex) >= m_aColumns.size())
return false;
// A column is a category when it doesn't have an associated data series.
return !m_aColumns[nColumnIndex].m_xDataSeries.is();
} }
sal_Int32 DataBrowserModel::getCategoryColumnCount() sal_Int32 DataBrowserModel::getCategoryColumnCount()