User: rt Date: 2008-06-16 12:35:56+0000 Modified: dba/dbaccess/source/ui/uno/composerdialogs.cxx
Log: INTEGRATION: CWS rptchart02 (1.10.2); FILE MERGED 2008/05/21 11:57:48 oj 1.10.2.2: RESYNC: (1.10-1.11); FILE MERGED 2008/04/18 08:46:50 oj 1.10.2.1: #i86850# use of ComponentContext File Changes: Directory: /dba/dbaccess/source/ui/uno/ ======================================= File [changed]: composerdialogs.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/composerdialogs.cxx?r1=1.11&r2=1.12 Delta lines: +2 -2 ------------------- --- composerdialogs.cxx 2008-05-05 16:10:15+0000 1.11 +++ composerdialogs.cxx 2008-06-16 12:35:53+0000 1.12 @@ -134,7 +134,7 @@ // fallback: if there is a connection and thus a row set, but no composer, create one if ( xConnection.is() && !m_xComposer.is() ) - m_xComposer = ::dbtools::getCurrentSettingsComposer( Reference< XPropertySet >( m_xRowSet, UNO_QUERY ), m_xORB ); + m_xComposer = ::dbtools::getCurrentSettingsComposer( Reference< XPropertySet >( m_xRowSet, UNO_QUERY ), m_aContext.getLegacyServiceFactory() ); // the columns of the row set Reference< XColumnsSupplier > xSuppColumns( m_xRowSet, UNO_QUERY ); @@ -179,7 +179,7 @@ //--------------------------------------------------------------------- Dialog* RowsetFilterDialog::createComposerDialog( Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns ) { - return new DlgFilterCrit( _pParent, m_xORB, _rxConnection, m_xComposer, _rxColumns ); + return new DlgFilterCrit( _pParent, m_aContext.getLegacyServiceFactory(), _rxConnection, m_xComposer, _rxColumns ); } //--------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
