User: rt Date: 2008-01-29 13:44:25+0000 Modified: dba/reportdesign/source/core/api/ReportEngineJFree.cxx
Log: INTEGRATION: CWS reportdesign02 (1.4.36); FILE MERGED 2007/12/20 07:48:13 oj 1.4.36.2: RESYNC: (1.4-1.5); FILE MERGED 2007/10/26 10:42:11 oj 1.4.36.1: #i82914# add configuration entry File Changes: Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: ReportEngineJFree.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/ReportEngineJFree.cxx?r1=1.5&r2=1.6 Delta lines: +50 -55 --------------------- --- ReportEngineJFree.cxx 2007-11-20 18:58:12+0000 1.5 +++ ReportEngineJFree.cxx 2008-01-29 13:44:22+0000 1.6 @@ -104,13 +104,13 @@ #ifndef _RTL_USTRBUF_HXX_ #include <rtl/ustrbuf.hxx> #endif - // ============================================================================= namespace reportdesign { // ============================================================================= using namespace com::sun::star; using namespace comphelper; + DBG_NAME( rpt_OReportEngineJFree ) // ----------------------------------------------------------------------------- OReportEngineJFree::OReportEngineJFree( const uno::Reference< uno::XComponentContext >& context) @@ -284,12 +284,11 @@ aConvertedProperties[nPos++].Value <<= m_xRowSet; // create job factory and initialize - uno::Reference<task::XJob> xJob(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.pentaho.SOReportJobFactory")),m_xContext),uno::UNO_QUERY); - if ( xJob.is() ) - { + const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(uno::Reference< lang::XMultiServiceFactory >(m_xContext->getServiceManager(),uno::UNO_QUERY_THROW)); + uno::Reference<task::XJob> xJob(m_xContext->getServiceManager()->createInstanceWithContext(sReportEngineServiceName,m_xContext),uno::UNO_QUERY_THROW); if ( m_xReport->getCommand().getLength() ) { - uno::Reference< beans::XPropertySet> xRowSetProp(m_xRowSet,uno::UNO_QUERY); + uno::Reference< beans::XPropertySet> xRowSetProp(m_xRowSet,uno::UNO_QUERY_THROW); xRowSetProp->setPropertyValue(PROPERTY_ACTIVECONNECTION,uno::makeAny(m_xActiveConnection)); ::rtl::OUString sOrder = getOrderStatement(); @@ -342,11 +341,7 @@ } if ( xStorageProp.is() ) - { - //xStorageProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"))) >>= sOutputName; sOutputName = aFile.GetURL(); - } - } uno::Reference<embed::XTransactedObject> xTransact(xOut,uno::UNO_QUERY); if ( sOutputName.getLength() && xTransact.is() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
