User: kz Date: 2006/10/05 06:01:09 Modified: dba/dbaccess/source/ui/app/AppView.cxx
Log: INTEGRATION: CWS hsqlcsvstage1 (1.16.2); FILE MERGED 2006/09/20 19:29:05 fs 1.16.2.2: #i10000# 2006/09/20 11:43:55 fs 1.16.2.1: #i69696#, being stage 1 of issue #i69526#: merging changes from CWS hsqlcsv herein File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppView.cxx?r1=1.16&r2=1.17 Delta lines: +12 -14 --------------------- --- AppView.cxx 17 Sep 2006 06:55:42 -0000 1.16 +++ AppView.cxx 5 Oct 2006 13:01:06 -0000 1.17 @@ -154,7 +154,7 @@ m_pPanel->SetUniqueId(UID_APP_DATABASE_VIEW); m_pPanel->Show(); - m_pDetailView = new OApplicationDetailView(this,_ePreviewMode); + m_pDetailView = new OApplicationDetailView(*this,_ePreviewMode); m_pDetailView->Show(); ImplInitSettings(); @@ -414,10 +414,10 @@ pTest->paste(); } // ----------------------------------------------------------------------------- -::rtl::OUString OApplicationView::getQualifiedName(SvLBoxEntry* _pEntry,const Reference< XDatabaseMetaData>& _xMetaData) const +::rtl::OUString OApplicationView::getQualifiedName( SvLBoxEntry* _pEntry ) const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); - return getDetailView()->getQualifiedName(_pEntry,_xMetaData); + return getDetailView()->getQualifiedName( _pEntry ); } // ----------------------------------------------------------------------------- sal_Bool OApplicationView::isLeaf(SvLBoxEntry* _pEntry) const @@ -480,32 +480,30 @@ return getDetailView()->getElementCount(); } // ----------------------------------------------------------------------------- -void OApplicationView::getSelectionElementNames(::std::vector< ::rtl::OUString>& _rNames,const Reference< XDatabaseMetaData>& _xMetaData) const +void OApplicationView::getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); - getDetailView()->getSelectionElementNames(_rNames,_xMetaData); + getDetailView()->getSelectionElementNames( _rNames ); } // ----------------------------------------------------------------------------- -SvLBoxEntry* OApplicationView::elementAdded(ElementType eType,const ::rtl::OUString& _rName, const Any& _rObject, const Reference< XConnection >& _rxConn ) +SvLBoxEntry* OApplicationView::elementAdded(ElementType eType,const ::rtl::OUString& _rName, const Any& _rObject ) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); - return getDetailView()->elementAdded(eType,_rName,_rObject,_rxConn); + return getDetailView()->elementAdded(eType,_rName,_rObject); } // ----------------------------------------------------------------------------- -void OApplicationView::elementRemoved(ElementType eType,const ::rtl::OUString& _rName, const Reference< XConnection >& _rxConn ) +void OApplicationView::elementRemoved(ElementType eType,const ::rtl::OUString& _rName ) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); - getDetailView()->elementRemoved(eType,_rName,_rxConn); + getDetailView()->elementRemoved(eType,_rName); } // ----------------------------------------------------------------------------- void OApplicationView::elementReplaced(ElementType _eType ,const ::rtl::OUString& _rOldName - ,const ::rtl::OUString& _rNewName - ,const Reference< XConnection >& _rxConn - ,const Reference<XInterface>& _xObject) + ,const ::rtl::OUString& _rNewName ) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); - getDetailView()->elementReplaced(_eType, _rOldName,_rNewName,_rxConn ,_xObject); + getDetailView()->elementReplaced(_eType, _rOldName, _rNewName ); } // ----------------------------------------------------------------------------- void OApplicationView::clearPages(sal_Bool _bTaskAlso) @@ -600,7 +598,7 @@ } if ( m_xObject.is() ) startComponentListening(m_xObject); - getDetailView()->showPreview(_sDataSourceName,_xConnection,_sName,_bTable); + getDetailView()->showPreview(_sDataSourceName,_sName,_bTable); } } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
