Tag: cws_src680_hsqlcsvstage1 User: fs Date: 2006/09/20 12:29:08 Modified: dba/dbaccess/source/ui/app/AppController.cxx dba/dbaccess/source/ui/app/AppControllerGen.cxx dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx dba/dbaccess/source/ui/app/AppDetailPageHelper.hxx dba/dbaccess/source/ui/app/AppDetailView.cxx dba/dbaccess/source/ui/app/AppDetailView.hxx dba/dbaccess/source/ui/app/AppView.cxx dba/dbaccess/source/ui/app/AppView.hxx
Log: #i10000# File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.34.2.1&r2=1.34.2.2 Delta lines: +6 -6 ------------------- --- AppController.cxx 20 Sep 2006 11:43:54 -0000 1.34.2.1 +++ AppController.cxx 20 Sep 2006 19:29:04 -0000 1.34.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.34.2.1 $ + * $Revision: 1.34.2.2 $ * - * last change: $Author: fs $ $Date: 2006/09/20 11:43:54 $ + * last change: $Author: fs $ $Date: 2006/09/20 19:29:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1439,7 +1439,7 @@ default: break; } - getContainer()->elementAdded(eType,sName,_rEvent.Element,getConnection()); + getContainer()->elementAdded(eType,sName,_rEvent.Element); } } } @@ -1474,7 +1474,7 @@ default: break; } - getContainer()->elementRemoved(eType,sName,getConnection()); + getContainer()->elementRemoved(eType,sName); } } // ----------------------------------------------------------------------------- @@ -1518,7 +1518,7 @@ default: break; } - // getContainer()->elementReplaced(getContainer()->getElementType(),sName,sNewName,xConnection); + // getContainer()->elementReplaced(getContainer()->getElementType(),sName,sNewName); } catch( Exception& ) { @@ -1943,7 +1943,7 @@ Reference<XPropertySet> xProp(xRename,UNO_QUERY); sNewName = ::dbaui::composeTableName( m_xMetaData, xProp, ::dbtools::eInDataManipulation, false, false, false ); } - getContainer()->elementReplaced( eType , sOldName, sNewName, getConnection() ); + getContainer()->elementReplaced( eType , sOldName, sNewName ); } bTryAgain = sal_False; File [changed]: AppControllerGen.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppControllerGen.cxx?r1=1.21.2.1&r2=1.21.2.2 Delta lines: +3 -3 ------------------- --- AppControllerGen.cxx 20 Sep 2006 11:43:55 -0000 1.21.2.1 +++ AppControllerGen.cxx 20 Sep 2006 19:29:04 -0000 1.21.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: AppControllerGen.cxx,v $ * - * $Revision: 1.21.2.1 $ + * $Revision: 1.21.2.2 $ * - * last change: $Author: fs $ $Date: 2006/09/20 11:43:55 $ + * last change: $Author: fs $ $Date: 2006/09/20 19:29:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -185,7 +185,7 @@ Reference<XPropertySet> xView = ::dbaui::createView(sNewName,xConnection,xSourceObject); if ( !xView.is() ) throw SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*this,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")) ,0,Any()); - getContainer()->elementAdded(E_TABLE,sNewName,makeAny(xView),xConnection); + getContainer()->elementAdded(E_TABLE,sNewName,makeAny(xView)); } } catch(SQLContext& e) { showError(SQLExceptionInfo(e)); } File [changed]: AppDetailPageHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx?r1=1.16.2.1&r2=1.16.2.2 Delta lines: +5 -6 ------------------- --- AppDetailPageHelper.cxx 20 Sep 2006 11:43:55 -0000 1.16.2.1 +++ AppDetailPageHelper.cxx 20 Sep 2006 19:29:04 -0000 1.16.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: AppDetailPageHelper.cxx,v $ * - * $Revision: 1.16.2.1 $ + * $Revision: 1.16.2.2 $ * - * last change: $Author: fs $ $Date: 2006/09/20 11:43:55 $ + * last change: $Author: fs $ $Date: 2006/09/20 19:29:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -753,8 +753,7 @@ // ----------------------------------------------------------------------------- void OAppDetailPageHelper::elementReplaced(ElementType _eType ,const ::rtl::OUString& _rOldName - ,const ::rtl::OUString& _rNewName - ,const Reference< XConnection >& _rxConn) + ,const ::rtl::OUString& _rNewName ) { DBTreeListBox* pTreeView = getCurrentView(); if ( pTreeView ) @@ -787,7 +786,7 @@ } } // ----------------------------------------------------------------------------- -SvLBoxEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject, const Reference< XConnection >& _rxConn ) +SvLBoxEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject ) { SvLBoxEntry* pRet = NULL; DBTreeListBox* pTreeView = m_pLists[_eType]; @@ -835,7 +834,7 @@ return pRet; } // ----------------------------------------------------------------------------- -void OAppDetailPageHelper::elementRemoved(ElementType _eType,const ::rtl::OUString& _rName, const Reference< XConnection >& _rxConn ) +void OAppDetailPageHelper::elementRemoved( ElementType _eType,const ::rtl::OUString& _rName ) { DBTreeListBox* pTreeView = getCurrentView(); if ( pTreeView ) File [changed]: AppDetailPageHelper.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailPageHelper.hxx?r1=1.10.16.1&r2=1.10.16.2 Delta lines: +5 -8 ------------------- --- AppDetailPageHelper.hxx 20 Sep 2006 11:43:55 -0000 1.10.16.1 +++ AppDetailPageHelper.hxx 20 Sep 2006 19:29:04 -0000 1.10.16.2 @@ -4,9 +4,9 @@ * * $RCSfile: AppDetailPageHelper.hxx,v $ * - * $Revision: 1.10.16.1 $ + * $Revision: 1.10.16.2 $ * - * last change: $Author: fs $ $Date: 2006/09/20 11:43:55 $ + * last change: $Author: fs $ $Date: 2006/09/20 19:29:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -318,8 +318,7 @@ */ SvLBoxEntry* elementAdded(ElementType eType ,const ::rtl::OUString& _rName - ,const ::com::sun::star::uno::Any& _rObject - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn = NULL); + ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one @param _eType @@ -333,8 +332,7 @@ */ void elementReplaced(ElementType eType ,const ::rtl::OUString& _rOldName - ,const ::rtl::OUString& _rNewName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn ); + ,const ::rtl::OUString& _rNewName ); /** removes an element from the detail page. @param _eType @@ -345,8 +343,7 @@ If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType - ,const ::rtl::OUString& _rName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn); + ,const ::rtl::OUString& _rName ); /// returns the preview mode File [changed]: AppDetailView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailView.cxx?r1=1.19.2.1&r2=1.19.2.2 Delta lines: +8 -9 ------------------- --- AppDetailView.cxx 20 Sep 2006 11:43:55 -0000 1.19.2.1 +++ AppDetailView.cxx 20 Sep 2006 19:29:05 -0000 1.19.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: AppDetailView.cxx,v $ * - * $Revision: 1.19.2.1 $ + * $Revision: 1.19.2.2 $ * - * last change: $Author: fs $ $Date: 2006/09/20 11:43:55 $ + * last change: $Author: fs $ $Date: 2006/09/20 19:29:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -800,25 +800,24 @@ static_cast<OAppBorderWindow*>(GetParent())->getView()->getElementNotification()->onCreationClick(_sCommand); } // ----------------------------------------------------------------------------- -SvLBoxEntry* OApplicationDetailView::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject, const Reference< XConnection >& _rxConn ) +SvLBoxEntry* OApplicationDetailView::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject ) { DBG_CHKTHIS(OApplicationDetailView,NULL); - return m_pControlHelper->elementAdded(_eType,_rName, _rObject, _rxConn ); + return m_pControlHelper->elementAdded(_eType,_rName, _rObject ); } // ----------------------------------------------------------------------------- -void OApplicationDetailView::elementRemoved(ElementType _eType,const ::rtl::OUString& _rName, const Reference< XConnection >& _rxConn ) +void OApplicationDetailView::elementRemoved(ElementType _eType,const ::rtl::OUString& _rName ) { DBG_CHKTHIS(OApplicationDetailView,NULL); - m_pControlHelper->elementRemoved(_eType,_rName, _rxConn ); + m_pControlHelper->elementRemoved(_eType,_rName ); } // ----------------------------------------------------------------------------- void OApplicationDetailView::elementReplaced(ElementType _eType ,const ::rtl::OUString& _rOldName - ,const ::rtl::OUString& _rNewName - ,const Reference< XConnection >& _rxConn ) + ,const ::rtl::OUString& _rNewName ) { DBG_CHKTHIS(OApplicationDetailView,NULL); - m_pControlHelper->elementReplaced(_eType, _rOldName,_rNewName,_rxConn ); + m_pControlHelper->elementReplaced( _eType, _rOldName, _rNewName ); } // ----------------------------------------------------------------------------- PreviewMode OApplicationDetailView::getPreviewMode() File [changed]: AppDetailView.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailView.hxx?r1=1.12.14.1&r2=1.12.14.2 Delta lines: +5 -8 ------------------- --- AppDetailView.hxx 20 Sep 2006 11:43:55 -0000 1.12.14.1 +++ AppDetailView.hxx 20 Sep 2006 19:29:05 -0000 1.12.14.2 @@ -4,9 +4,9 @@ * * $RCSfile: AppDetailView.hxx,v $ * - * $Revision: 1.12.14.1 $ + * $Revision: 1.12.14.2 $ * - * last change: $Author: fs $ $Date: 2006/09/20 11:43:55 $ + * last change: $Author: fs $ $Date: 2006/09/20 19:29:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -268,8 +268,7 @@ */ SvLBoxEntry* elementAdded(ElementType eType ,const ::rtl::OUString& _rName - ,const ::com::sun::star::uno::Any& _rObject - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn = NULL); + ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one @param _eType @@ -285,8 +284,7 @@ */ void elementReplaced(ElementType eType ,const ::rtl::OUString& _rOldName - ,const ::rtl::OUString& _rNewName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn = NULL); + ,const ::rtl::OUString& _rNewName ); /** removes an element from the detail page. @param _eType @@ -297,8 +295,7 @@ If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType - ,const ::rtl::OUString& _rName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn); + ,const ::rtl::OUString& _rName ); /// returns the preview mode PreviewMode getPreviewMode(); File [changed]: AppView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppView.cxx?r1=1.16.2.1&r2=1.16.2.2 Delta lines: +8 -9 ------------------- --- AppView.cxx 20 Sep 2006 11:43:55 -0000 1.16.2.1 +++ AppView.cxx 20 Sep 2006 19:29:05 -0000 1.16.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: AppView.cxx,v $ * - * $Revision: 1.16.2.1 $ + * $Revision: 1.16.2.2 $ * - * last change: $Author: fs $ $Date: 2006/09/20 11:43:55 $ + * last change: $Author: fs $ $Date: 2006/09/20 19:29:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -486,25 +486,24 @@ 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 ::rtl::OUString& _rNewName ) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); - getDetailView()->elementReplaced(_eType, _rOldName,_rNewName,_rxConn ); + getDetailView()->elementReplaced(_eType, _rOldName, _rNewName ); } // ----------------------------------------------------------------------------- void OApplicationView::clearPages(sal_Bool _bTaskAlso) File [changed]: AppView.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppView.hxx?r1=1.10.14.1&r2=1.10.14.2 Delta lines: +5 -8 ------------------- --- AppView.hxx 20 Sep 2006 11:43:56 -0000 1.10.14.1 +++ AppView.hxx 20 Sep 2006 19:29:05 -0000 1.10.14.2 @@ -4,9 +4,9 @@ * * $RCSfile: AppView.hxx,v $ * - * $Revision: 1.10.14.1 $ + * $Revision: 1.10.14.2 $ * - * last change: $Author: fs $ $Date: 2006/09/20 11:43:56 $ + * last change: $Author: fs $ $Date: 2006/09/20 19:29:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -255,8 +255,7 @@ */ SvLBoxEntry* elementAdded(ElementType _eType ,const ::rtl::OUString& _rName - ,const ::com::sun::star::uno::Any& _rObject - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn = NULL); + ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one @param _eType @@ -272,8 +271,7 @@ */ void elementReplaced(ElementType eType ,const ::rtl::OUString& _rOldName - ,const ::rtl::OUString& _rNewName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn = NULL); + ,const ::rtl::OUString& _rNewName ); /** removes an element from the detail page. @param _eType @@ -284,8 +282,7 @@ If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType - ,const ::rtl::OUString& _rName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn); + ,const ::rtl::OUString& _rName ); /** clears the selection in the icon choice control and calls the handler */ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
