diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-09-02 13:50:32 +0200 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-09-02 13:50:32 +0200 |
| commit | 2fc62ba1a827201303191184f697ec22b9216f44 (patch) | |
| tree | 19844061732fc5c06db3b0944e5c31c02be0eacc | |
| parent | 3c6b622a6cd10d937e9e5b17fd042a698bfbd00a (diff) | |
| parent | 5e44c6e598d084c87290225ede5485cc28636f64 (diff) | |
dba33i: merged latest changes from CWS dba33h
| -rw-r--r-- | reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 1455dee74b3c..d3a557c3ff6b 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -339,10 +339,16 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any > // set ourself as delegator m_xProxy->setDelegator( *this ); + const ::rtl::OUString sCommand = m_xDatabaseDataProvider->getCommand(); + if ( sCommand.getLength() ) + m_aColumns = ::dbtools::getFieldNamesByCommandDescriptor(m_xDatabaseDataProvider->getActiveConnection() + ,m_xDatabaseDataProvider->getCommandType() + ,sCommand); uno::Reference< chart::XComplexDescriptionAccess > xDataProvider(m_xDatabaseDataProvider,uno::UNO_QUERY); if ( xDataProvider.is() ) { + m_aColumns.realloc(1); uno::Sequence< uno::Sequence< ::rtl::OUString > > aColumnNames = xDataProvider->getComplexColumnDescriptions(); for(sal_Int32 i = 0 ; i < aColumnNames.getLength();++i) { @@ -354,14 +360,6 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any > } } } - else - { - const ::rtl::OUString sCommand = m_xDatabaseDataProvider->getCommand(); - if ( sCommand.getLength() ) - m_aColumns = ::dbtools::getFieldNamesByCommandDescriptor(m_xDatabaseDataProvider->getActiveConnection() - ,m_xDatabaseDataProvider->getCommandType() - ,sCommand); - } } // -------------------------------------------------------------------------------- uno::Any SAL_CALL ExportDocumentHandler::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException) |