Tag: cws_src680_odbmacros2 User: fs Date: 2008-02-06 08:34:38+0000 Modified: dba/dbaccess/source/ui/browser/brwctrlr.cxx
Log: copying the fix for #i85879# into this CWS: cleanup the toolbar mess in the data source browser File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: brwctrlr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/brwctrlr.cxx?r1=1.102.2.4&r2=1.102.2.5 Delta lines: +18 -22 --------------------- --- brwctrlr.cxx 2008-02-04 13:07:54+0000 1.102.2.4 +++ brwctrlr.cxx 2008-02-06 08:34:36+0000 1.102.2.5 @@ -4,9 +4,9 @@ * * $RCSfile: brwctrlr.cxx,v $ * - * $Revision: 1.102.2.4 $ + * $Revision: 1.102.2.5 $ * - * last change: $Author: fs $ $Date: 2008/02/04 13:07:54 $ + * last change: $Author: fs $ $Date: 2008/02/06 08:34:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -477,6 +477,7 @@ ,m_aAsyncGetCellFocus(LINK(this, SbaXDataBrowserController, OnAsyncGetCellFocus)) ,m_sStateSaveRecord(ModuleRes(RID_STR_SAVE_CURRENT_RECORD)) ,m_sStateUndoRecord(ModuleRes(RID_STR_UNDO_MODIFY_RECORD)) + ,m_sModuleIdentifier( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.DataSourceBrowser" ) ) ) ,m_pLoadThread(NULL) ,m_pFormControllerImpl(NULL) ,m_nPendingLoadFinished(0) @@ -945,6 +946,20 @@ } // ----------------------------------------------------------------------- +void SAL_CALL SbaXDataBrowserController::setIdentifier( const ::rtl::OUString& _Identifier ) throw (RuntimeException) +{ + ::osl::MutexGuard aGuard( m_aMutex ); + m_sModuleIdentifier = _Identifier; +} + +// ----------------------------------------------------------------------- +::rtl::OUString SAL_CALL SbaXDataBrowserController::getIdentifier( ) throw (RuntimeException) +{ + ::osl::MutexGuard aGuard( m_aMutex ); + return m_sModuleIdentifier; +} + +// ----------------------------------------------------------------------- void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) throw ( RuntimeException ) { Reference< XPropertySet > xSource(evt.Source, UNO_QUERY); @@ -2900,25 +2915,6 @@ xFormError->addSQLErrorListener((::com::sun::star::sdb::XSQLErrorListener*)this); } // ----------------------------------------------------------------------------- -void SbaXDataBrowserController::onLoadedMenu(const Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager) -{ - SbaXDataBrowserController_Base::onLoadedMenu( _xLayoutManager ); - - // for task frames, we have our own cut/copy/paste functionality - // 22.05.2002 - 99030 - [EMAIL PROTECTED] - Reference< XFrame > xFrame( getFrame() ); - if ( xFrame.is() && _xLayoutManager.is() ) - { - if ( xFrame->isTop() ) - { - _xLayoutManager->lock(); - _xLayoutManager->createElement( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/copyobjectbar")) ); - _xLayoutManager->unlock(); - _xLayoutManager->doLayout(); - } - } -} -// ----------------------------------------------------------------------------- void SbaXDataBrowserController::addColumnListeners(const Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel) { // ... all the grid columns --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
