Tag: cws_dev300_rptchart02 User: oj Date: 2008-04-18 08:46:53+0000 Modified: dba/dbaccess/source/ext/adabas/ANewDb.cxx dba/dbaccess/source/filter/xml/xmlExport.cxx dba/dbaccess/source/filter/xml/xmlExport.hxx dba/dbaccess/source/ui/app/AppSwapWindow.cxx dba/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx dba/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx dba/dbaccess/source/ui/uno/DBTypeWizDlg.cxx dba/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx dba/dbaccess/source/ui/uno/TableFilterDlg.cxx dba/dbaccess/source/ui/uno/UserSettingsDlg.cxx dba/dbaccess/source/ui/uno/admindlg.cxx dba/dbaccess/source/ui/uno/composerdialogs.cxx dba/dbaccess/source/ui/uno/unoDirectSql.cxx dba/dbaccess/source/ui/uno/unoadmin.cxx
Log: #i86850# use of ComponentContext File Changes: Directory: /dba/dbaccess/source/ext/adabas/ =========================================== File [changed]: ANewDb.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/adabas/ANewDb.cxx?r1=1.4&r2=1.4.6.1 Delta lines: +3 -3 ------------------- --- ANewDb.cxx 2008-04-10 13:05:30+0000 1.4 +++ ANewDb.cxx 2008-04-18 08:46:49+0000 1.4.6.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ANewDb.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.6.1 $ * * This file is part of OpenOffice.org. * @@ -144,7 +144,7 @@ { if(!m_xCreateCatalog.is()) throw SQLException(); - m_pDialog = new OAdabasNewDbDlg(_pParent,m_xCreateCatalog,m_xORB); + m_pDialog = new OAdabasNewDbDlg(_pParent,m_xCreateCatalog,m_aContext.getLegacyServiceFactory()); return m_pDialog; } // ----------------------------------------------------------------------------- Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlExport.cxx?r1=1.20&r2=1.20.6.1 Delta lines: +13 -6 -------------------- --- xmlExport.cxx 2008-04-10 13:29:28+0000 1.20 +++ xmlExport.cxx 2008-04-18 08:46:49+0000 1.20.6.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlExport.cxx,v $ - * $Revision: 1.20 $ + * $Revision: 1.20.6.1 $ * * This file is part of OpenOffice.org. * @@ -831,7 +831,8 @@ ,enum ::xmloff::token::XMLTokenEnum _eComponents ,enum ::xmloff::token::XMLTokenEnum _eSubComponents ,sal_Bool _bExportContext - ,const ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >& _aMemFunc) + ,const ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >& _aMemFunc + ) { if ( _xCollection.is() ) { @@ -1109,7 +1110,7 @@ { const TExportPropMapperPair pExportHelper[] = { TExportPropMapperPair(m_xExportHelper,TEnumMapperPair(&m_aAutoStyleNames,XML_STYLE_FAMILY_TABLE_TABLE )) - ,TExportPropMapperPair(m_xCellExportHelper,TEnumMapperPair(&m_aCellAutoStyleNames,XML_STYLE_FAMILY_TABLE_CELL)) + // ,TExportPropMapperPair(m_xCellExportHelper,TEnumMapperPair(&m_aCellAutoStyleNames,XML_STYLE_FAMILY_TABLE_CELL)) ,TExportPropMapperPair(m_xRowExportHelper,TEnumMapperPair(&m_aRowAutoStyleNames,XML_STYLE_FAMILY_TABLE_ROW)) }; @@ -1132,8 +1133,10 @@ { // not interested in } + m_aCurrentPropertyStates = m_xCellExportHelper->Filter(_xProp); ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > aMemFunc(&ODBExport::exportAutoStyle); exportCollection(xCollection,XML_TOKEN_INVALID,XML_TOKEN_INVALID,sal_False,aMemFunc); + m_aCurrentPropertyStates.clear(); } else { // here I know I have a column @@ -1169,11 +1172,15 @@ } } ++aItr; - } + } // while ( aItr != aEnd ) + + } // if ( !aPropStates.empty() ) + if ( XML_STYLE_FAMILY_TABLE_CELL == pExportHelper[i].second.second ) + ::std::copy( m_aCurrentPropertyStates.begin(), m_aCurrentPropertyStates.end(), ::std::back_inserter( aPropStates )); + if ( !aPropStates.empty() ) pExportHelper[i].second.first->insert( TPropertyStyleMap::value_type(_xProp,GetAutoStylePool()->Add( pExportHelper[i].second.second, aPropStates ))); } } - } } // ----------------------------------------------------------------------------- void ODBExport::_ExportContent() File [changed]: xmlExport.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlExport.hxx?r1=1.10&r2=1.10.6.1 Delta lines: +5 -3 ------------------- --- xmlExport.hxx 2008-04-10 13:29:46+0000 1.10 +++ xmlExport.hxx 2008-04-18 08:46:49+0000 1.10.6.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlExport.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.6.1 $ * * This file is part of OpenOffice.org. * @@ -135,6 +135,7 @@ ::std::auto_ptr< TStringPair > m_aAutoIncrement; ::std::auto_ptr< TDelimiter > m_aDelimiter; ::std::vector< Any> m_aDataSourceSettings; + ::std::vector< XMLPropertyState > m_aCurrentPropertyStates; TPropertyStyleMap m_aAutoStyleNames; TPropertyStyleMap m_aCellAutoStyleNames; TPropertyStyleMap m_aRowAutoStyleNames; @@ -176,7 +177,8 @@ ,enum ::xmloff::token::XMLTokenEnum _eComponents ,enum ::xmloff::token::XMLTokenEnum _eSubComponents ,sal_Bool _bExportContext - ,const ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >& _aMemFunc); + ,const ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >& _aMemFunc + ); void exportComponent(XPropertySet* _xProp); void exportQuery(XPropertySet* _xProp); void exportTable(XPropertySet* _xProp); Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppSwapWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppSwapWindow.cxx?r1=1.14&r2=1.14.6.1 Delta lines: +5 -4 ------------------- --- AppSwapWindow.cxx 2008-04-10 13:59:18+0000 1.14 +++ AppSwapWindow.cxx 2008-04-18 08:46:49+0000 1.14.6.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AppSwapWindow.cxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.14.6.1 $ * * This file is part of OpenOffice.org. * @@ -204,9 +204,10 @@ SvxIconChoiceCtrlEntry* pEntry = _pControl->GetSelectedEntry( nPos ); ElementType eType = E_NONE; if ( pEntry ) + { eType = *static_cast<ElementType*>(pEntry->GetUserData()); - onContainerSelected( eType ); + } return 1L; } Directory: /dba/dbaccess/source/ui/uno/ ======================================= File [changed]: AdabasSettingsDlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx?r1=1.5&r2=1.5.6.1 Delta lines: +3 -3 ------------------- --- AdabasSettingsDlg.cxx 2008-04-10 16:45:21+0000 1.5 +++ AdabasSettingsDlg.cxx 2008-04-18 08:46:50+0000 1.5.6.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AdabasSettingsDlg.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.6.1 $ * * This file is part of OpenOffice.org. * @@ -126,7 +126,7 @@ //------------------------------------------------------------------------------ Dialog* OAdabasSettingsDialog::createDialog(Window* _pParent) { - OAdabasStatPageDlg* pDlg = new OAdabasStatPageDlg(_pParent, m_pDatasourceItems, m_xORB,m_aInitialSelection); + OAdabasStatPageDlg* pDlg = new OAdabasStatPageDlg(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection); return pDlg; } File [changed]: AdvancedSettingsDlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx?r1=1.6&r2=1.6.6.1 Delta lines: +3 -3 ------------------- --- AdvancedSettingsDlg.cxx 2008-04-10 16:45:52+0000 1.6 +++ AdvancedSettingsDlg.cxx 2008-04-18 08:46:50+0000 1.6.6.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AdvancedSettingsDlg.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.6.1 $ * * This file is part of OpenOffice.org. * @@ -148,7 +148,7 @@ //------------------------------------------------------------------------------ Dialog* OAdvancedSettingsDialog::createDialog(Window* _pParent) { - AdvancedSettingsDialog* pDlg = new AdvancedSettingsDialog(_pParent, m_pDatasourceItems, m_xORB,m_aInitialSelection); + AdvancedSettingsDialog* pDlg = new AdvancedSettingsDialog(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection); return pDlg; } File [changed]: DBTypeWizDlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/DBTypeWizDlg.cxx?r1=1.5&r2=1.5.6.1 Delta lines: +3 -3 ------------------- --- DBTypeWizDlg.cxx 2008-04-10 16:48:03+0000 1.5 +++ DBTypeWizDlg.cxx 2008-04-18 08:46:50+0000 1.5.6.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DBTypeWizDlg.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.6.1 $ * * This file is part of OpenOffice.org. * @@ -125,7 +125,7 @@ //------------------------------------------------------------------------------ Dialog* ODBTypeWizDialog::createDialog(Window* _pParent) { - ODbTypeWizDialog* pDlg = new ODbTypeWizDialog(_pParent, m_pDatasourceItems, m_xORB,m_aInitialSelection); + ODbTypeWizDialog* pDlg = new ODbTypeWizDialog(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection); return pDlg; } File [changed]: DBTypeWizDlgSetup.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx?r1=1.11&r2=1.11.6.1 Delta lines: +3 -3 ------------------- --- DBTypeWizDlgSetup.cxx 2008-04-10 16:48:43+0000 1.11 +++ DBTypeWizDlgSetup.cxx 2008-04-18 08:46:50+0000 1.11.6.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DBTypeWizDlgSetup.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.6.1 $ * * This file is part of OpenOffice.org. * @@ -150,7 +150,7 @@ //------------------------------------------------------------------------------ Dialog* ODBTypeWizDialogSetup::createDialog(Window* _pParent) { - return new ODbTypeWizDialogSetup(_pParent, m_pDatasourceItems, m_xORB, m_aInitialSelection); + return new ODbTypeWizDialogSetup(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(), m_aInitialSelection); } // ----------------------------------------------------------------------------- void ODBTypeWizDialogSetup::executedDialog(sal_Int16 _nExecutionResult) File [changed]: TableFilterDlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/TableFilterDlg.cxx?r1=1.5&r2=1.5.6.1 Delta lines: +3 -3 ------------------- --- TableFilterDlg.cxx 2008-04-10 16:49:23+0000 1.5 +++ TableFilterDlg.cxx 2008-04-18 08:46:50+0000 1.5.6.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TableFilterDlg.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.6.1 $ * * This file is part of OpenOffice.org. * @@ -126,7 +126,7 @@ //------------------------------------------------------------------------------ Dialog* OTableFilterDialog::createDialog(Window* _pParent) { - OTableSubscriptionDialog* pDlg = new OTableSubscriptionDialog(_pParent, m_pDatasourceItems, m_xORB,m_aInitialSelection); + OTableSubscriptionDialog* pDlg = new OTableSubscriptionDialog(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection); return pDlg; } File [changed]: UserSettingsDlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/UserSettingsDlg.cxx?r1=1.6&r2=1.6.6.1 Delta lines: +3 -3 ------------------- --- UserSettingsDlg.cxx 2008-04-10 16:50:02+0000 1.6 +++ UserSettingsDlg.cxx 2008-04-18 08:46:50+0000 1.6.6.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: UserSettingsDlg.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.6.1 $ * * This file is part of OpenOffice.org. * @@ -126,7 +126,7 @@ //------------------------------------------------------------------------------ Dialog* OUserSettingsDialog::createDialog(Window* _pParent) { - OUserAdminDlg* pDlg = new OUserAdminDlg(_pParent, m_pDatasourceItems, m_xORB,m_aInitialSelection,m_xActiveConnection); + OUserAdminDlg* pDlg = new OUserAdminDlg(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection,m_xActiveConnection); return pDlg; } File [changed]: admindlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/admindlg.cxx?r1=1.5&r2=1.5.6.1 Delta lines: +3 -3 ------------------- --- admindlg.cxx 2008-04-10 16:50:40+0000 1.5 +++ admindlg.cxx 2008-04-18 08:46:50+0000 1.5.6.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: admindlg.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.6.1 $ * * This file is part of OpenOffice.org. * @@ -127,7 +127,7 @@ Dialog* ODataSourcePropertyDialog::createDialog(Window* _pParent) { - ODbAdminDialog* pDialog = new ODbAdminDialog(_pParent, m_pDatasourceItems, m_xORB); + ODbAdminDialog* pDialog = new ODbAdminDialog(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory()); // the initial selection if ( m_aInitialSelection.hasValue() ) File [changed]: composerdialogs.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/composerdialogs.cxx?r1=1.10&r2=1.10.2.1 Delta lines: +4 -4 ------------------- --- composerdialogs.cxx 2008-04-10 16:51:17+0000 1.10 +++ composerdialogs.cxx 2008-04-18 08:46:50+0000 1.10.2.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: composerdialogs.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.2.1 $ * * This file is part of OpenOffice.org. * @@ -131,7 +131,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 ); @@ -176,7 +176,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 ); } //--------------------------------------------------------------------- File [changed]: unoDirectSql.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/unoDirectSql.cxx?r1=1.8&r2=1.8.2.1 Delta lines: +3 -3 ------------------- --- unoDirectSql.cxx 2008-04-10 16:57:09+0000 1.8 +++ unoDirectSql.cxx 2008-04-18 08:46:50+0000 1.8.2.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unoDirectSql.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.2.1 $ * * This file is part of OpenOffice.org. * @@ -116,7 +116,7 @@ try { // the connection the row set is working with - ODatasourceConnector aDSConnector(m_xORB,_pParent); + ODatasourceConnector aDSConnector(m_aContext.getLegacyServiceFactory(),_pParent); xConnection = aDSConnector.connect(m_sInitialSelection); } catch( const Exception& ) File [changed]: unoadmin.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/unoadmin.cxx?r1=1.19&r2=1.19.6.1 Delta lines: +3 -3 ------------------- --- unoadmin.cxx 2008-04-10 16:57:50+0000 1.19 +++ unoadmin.cxx 2008-04-18 08:46:50+0000 1.19.6.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unoadmin.cxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.19.6.1 $ * * This file is part of OpenOffice.org. * @@ -95,7 +95,7 @@ DBG_CTOR(ODatabaseAdministrationDialog,NULL); m_pCollection = new ODsnTypeCollection(); - m_pCollection->initUserDriverTypes(m_xORB); + m_pCollection->initUserDriverTypes(m_aContext.getLegacyServiceFactory()); ODbAdminDialog::createItemSet(m_pDatasourceItems, m_pItemPool, m_pItemPoolDefaults, m_pCollection); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
