diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-03-17 14:37:53 +0100 |
|---|---|---|
| committer | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-03-17 14:37:53 +0100 |
| commit | ac254e099c57010222d8cc25a78796e2e71f490a (patch) | |
| tree | 4a4c9474865d9c75ed56a57e4435ffdd4b11569a /dbaccess | |
| parent | e1f79f156a42e2170cb3db92edc27bca38d185e3 (diff) | |
dba34d: remove patch for date axises
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/misc/DatabaseDataProvider.cxx | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index 574139b78f76..dbed20058780 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -783,7 +783,6 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat } ::std::vector< ::rtl::OUString > aRowLabels; - ::std::vector< double > aDateRowLabels; ::std::vector< ::std::vector< double > > aDataValues; sal_Int32 nRowCount = 0; ::connectivity::ORowSetValue aValue; @@ -792,16 +791,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat ++nRowCount; aValue.fill( aColumns[0].nResultSetPosition, aColumns[0].nDataType, xRow ); - switch(aColumns[0].nDataType) - { - case sdbc::DataType::DATE: - case sdbc::DataType::TIMESTAMP: - aDateRowLabels.push_back( aValue.getDouble() ); - break; - default: - aRowLabels.push_back( aValue.getString() ); - break; - } + aRowLabels.push_back( aValue.getString() ); ::std::vector< double > aRow; for ( ColumnDescriptions::const_iterator col = aColumns.begin(); @@ -851,16 +841,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat } // if ( !nRowCount ) uno::Reference< chart::XChartDataArray> xData(m_xInternal,uno::UNO_QUERY); - if ( aDateRowLabels.empty() ) - { - xData->setRowDescriptions(uno::Sequence< ::rtl::OUString >(&(*aRowLabels.begin()),aRowLabels.size())); - } - else - { - uno::Reference< chart::XDateCategories> xDate(m_xInternal,uno::UNO_QUERY); - xDate->setDateCategories(uno::Sequence< double >(&(*aDateRowLabels.begin()),aDateRowLabels.size())); - } - + xData->setRowDescriptions(uno::Sequence< ::rtl::OUString >(&(*aRowLabels.begin()),aRowLabels.size())); const size_t nOffset = bFirstColumnIsCategory ? 1 : 0; uno::Sequence< ::rtl::OUString > aColumnDescriptions( aColumns.size() - nOffset ); |