From fc6d597a933f9ca71b479864b31682dac17724c3 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 29 Mar 2022 20:28:37 +0100 Subject: Related: tdf#117162 use a marginally tidier but riskier fix for trunk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I94a836d7424eb561af623fee9d3a7e6d307cf065 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132287 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 963264436092..4e7fd13b47c7 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -343,13 +343,9 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any > m_xDatabaseDataProvider.set(m_xModel->getDataProvider(),uno::UNO_QUERY); if ( !m_xDatabaseDataProvider.is() ) { - static constexpr OUStringLiteral s_sDatabaseDataProvider = u"com.sun.star.chart2.data.DatabaseDataProvider"; - m_xDatabaseDataProvider.set(m_xContext->getServiceManager()->createInstanceWithContext(s_sDatabaseDataProvider - ,m_xContext),uno::UNO_QUERY_THROW); - m_xDatabaseDataProvider->setRowLimit(10); - - uno::Reference< chart2::data::XDataReceiver > xReceiver(m_xModel,uno::UNO_QUERY_THROW); - xReceiver->attachDataProvider(m_xDatabaseDataProvider); + // tdf#117162 reportbuilder needs the DataProvider to exist to progress further + setDataProvider(m_xModel, OUString()); + m_xDatabaseDataProvider.set(m_xModel->getDataProvider(), uno::UNO_QUERY_THROW); } m_aArguments = m_xDatabaseDataProvider->detectArguments(nullptr); -- cgit