Tag: cws_src680_odbmacros2 User: fs Date: 2007-12-18 21:23:51+0000 Modified: dba/dbaccess/source/ui/browser/brwctrlr.cxx dba/dbaccess/source/ui/browser/genericcontroller.cxx
Log: #i49133# some re-factoring 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.1&r2=1.102.2.2 Delta lines: +15 -33 --------------------- --- brwctrlr.cxx 2007-12-13 11:22:06+0000 1.102.2.1 +++ brwctrlr.cxx 2007-12-18 21:23:48+0000 1.102.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: brwctrlr.cxx,v $ * - * $Revision: 1.102.2.1 $ + * $Revision: 1.102.2.2 $ * - * last change: $Author: fs $ $Date: 2007/12/13 11:22:06 $ + * last change: $Author: fs $ $Date: 2007/12/18 21:23:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -427,12 +427,8 @@ //------------------------------------------------------------------ Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes( ) throw (RuntimeException) { - Sequence< Type > aTypes1 = ::comphelper::concatSequences( - OGenericUnoController::getTypes(), - SbaXDataBrowserController_Base::getTypes() - ); return ::comphelper::concatSequences( - aTypes1, + SbaXDataBrowserController_Base::getTypes(), m_pFormControllerImpl->getTypes() ); } @@ -457,13 +453,11 @@ Any SAL_CALL SbaXDataBrowserController::queryInterface(const Type& _rType) throw (RuntimeException) { // check for our additional interfaces - Any aRet = OGenericUnoController::queryInterface(_rType); + Any aRet = SbaXDataBrowserController_Base::queryInterface(_rType); // check for the base controllers interfaces if (!aRet.hasValue()) { - aRet = SbaXDataBrowserController_Base::queryInterface(_rType); - // check for our aggregate (implementing the XFormController) if (!aRet.hasValue()) { @@ -475,22 +469,10 @@ return aRet; } -//------------------------------------------------------------------------------ -void SAL_CALL SbaXDataBrowserController::acquire( ) throw () -{ - OGenericUnoController::acquire(); -} - -//------------------------------------------------------------------------------ -void SAL_CALL SbaXDataBrowserController::release( ) throw () -{ - OGenericUnoController::release(); -} - DBG_NAME(SbaXDataBrowserController) //------------------------------------------------------------------------------ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM) - :OGenericUnoController(_rM) + :SbaXDataBrowserController_Base(_rM) ,m_pClipbordNotifier( NULL ) ,m_aAsyncGetCellFocus(LINK(this, SbaXDataBrowserController, OnAsyncGetCellFocus)) ,m_sStateSaveRecord(ModuleRes(RID_STR_SAVE_CURRENT_RECORD)) @@ -535,7 +517,7 @@ // ----------------------------------------------------------------------- void SbaXDataBrowserController::startFrameListening( const Reference< XFrame >& _rxFrame ) { - OGenericUnoController::startFrameListening( _rxFrame ); + SbaXDataBrowserController_Base::startFrameListening( _rxFrame ); Reference< XFrameActionListener > xAggListener; if ( m_xFormControllerImpl.is() ) @@ -548,7 +530,7 @@ // ----------------------------------------------------------------------- void SbaXDataBrowserController::stopFrameListening( const Reference< XFrame >& _rxFrame ) { - OGenericUnoController::stopFrameListening( _rxFrame ); + SbaXDataBrowserController_Base::stopFrameListening( _rxFrame ); Reference< XFrameActionListener > xAggListener; if ( m_xFormControllerImpl.is() ) @@ -595,7 +577,7 @@ // ----------------------------------------------------------------------------- void SbaXDataBrowserController::describeSupportedFeatures() { - OGenericUnoController::describeSupportedFeatures(); + SbaXDataBrowserController_Base::describeSupportedFeatures(); implDescribeSupportedFeature( ".uno:FormSlots/undoRecord", ID_BROWSER_UNDORECORD, CommandGroup::CONTROLS ); implDescribeSupportedFeature( ".uno:FormController/undoRecord", ID_BROWSER_UNDORECORD, CommandGroup::CONTROLS ); implDescribeSupportedFeature( ".uno:RecUndo", ID_BROWSER_UNDORECORD, CommandGroup::CONTROLS ); @@ -684,7 +666,7 @@ m_pClipbordNotifier->AddRemoveListener( getView(), sal_True ); // this call create the toolbox - OGenericUnoController::Construct(pParent); + SbaXDataBrowserController_Base::Construct(pParent); getBrowserView()->Show(); @@ -958,7 +940,7 @@ if (xInfo->hasPropertyByName(PROPERTY_WIDTH)) disposingColumnModel(Source); } - OGenericUnoController::disposing(Source); + SbaXDataBrowserController_Base::OGenericUnoController::disposing( Source ); } // ----------------------------------------------------------------------- @@ -1135,7 +1117,7 @@ } // the base class - OGenericUnoController::disposing(); + SbaXDataBrowserController_Base::OGenericUnoController::disposing(); if (!PendingLoad()) { @@ -1226,7 +1208,7 @@ { ::osl::MutexGuard aGuard( m_aMutex ); - OGenericUnoController::frameAction( aEvent ); + SbaXDataBrowserController_Base::frameAction( aEvent ); if ( aEvent.Source == getFrame() ) switch ( aEvent.Action ) @@ -1549,7 +1531,7 @@ } break; default: - return OGenericUnoController::GetState(nId); + return SbaXDataBrowserController_Base::GetState(nId); } } catch(const Exception& ) @@ -2204,7 +2186,7 @@ // } // // -// return OGenericUnoController::SaveData(bUI,bForBrowsing); +// return SbaXDataBrowserController_Base::SaveData(bUI,bForBrowsing); //} // // ------------------------------------------------------------------------- @@ -2919,7 +2901,7 @@ // ----------------------------------------------------------------------------- void SbaXDataBrowserController::onLoadedMenu(const Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager) { - OGenericUnoController::onLoadedMenu( _xLayoutManager ); + SbaXDataBrowserController_Base::onLoadedMenu( _xLayoutManager ); // for task frames, we have our own cut/copy/paste functionality // 22.05.2002 - 99030 - [EMAIL PROTECTED] File [changed]: genericcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.81.56.1&r2=1.81.56.2 Delta lines: +46 -54 --------------------- --- genericcontroller.cxx 2007-12-13 11:22:06+0000 1.81.56.1 +++ genericcontroller.cxx 2007-12-18 21:23:48+0000 1.81.56.2 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.cxx,v $ * - * $Revision: 1.81.56.1 $ + * $Revision: 1.81.56.2 $ * - * last change: $Author: fs $ $Date: 2007/12/13 11:22:06 $ + * last change: $Author: fs $ $Date: 2007/12/18 21:23:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -164,7 +164,7 @@ DBG_NAME(OGenericUnoController) // ------------------------------------------------------------------------- OGenericUnoController::OGenericUnoController(const Reference< XMultiServiceFactory >& _rM) - :OGenericUnoController_COMPBASE(m_aMutex) + :OGenericUnoController_Base(m_aMutex) #ifdef DBG_UTIL ,m_bDescribingSupportedFeatures( false ) #endif @@ -186,10 +186,33 @@ } catch(Exception&) { + DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- +OGenericUnoController::OGenericUnoController() + :OGenericUnoController_Base(m_aMutex) +#ifdef DBG_UTIL + ,m_bDescribingSupportedFeatures( false ) +#endif + ,m_aSelectionListeners(m_aMutex) + ,m_aAsyncInvalidateAll(LINK(this, OGenericUnoController, OnAsyncInvalidateAll)) + ,m_aAsyncCloseTask(LINK(this, OGenericUnoController, OnAsyncCloseTask)) + ,m_aCurrentFrame( *this ) + ,m_pView(NULL) + ,m_bPreview(sal_False) + ,m_bReadOnly(sal_False) + ,m_bCurrentlyModified(sal_False) +{ + OSL_ENSURE( false, "OGenericUnoController::OGenericUnoController: illegal call!" ); + // This ctor only exists because the MSVC compiler complained about an unresolved external + // symbol. It should not be used at all. Since using it yields strange runtime problems, + // we simply abort here. + abort(); +} + +// ----------------------------------------------------------------------------- OGenericUnoController::~OGenericUnoController() { @@ -230,7 +253,7 @@ //------------------------------------------------------------------------------ IMPL_LINK(OGenericUnoController, OnAsyncInvalidateAll, void*, EMPTYARG) { - if ( !OGenericUnoController_COMPBASE::rBHelper.bInDispose && !OGenericUnoController_COMPBASE::rBHelper.bDisposed ) + if ( !OGenericUnoController_Base::rBHelper.bInDispose && !OGenericUnoController_Base::rBHelper.bDisposed ) InvalidateFeature_Impl(); return 0L; } @@ -313,49 +336,15 @@ } //------------------------------------------------------------------------------ -Any SAL_CALL OGenericUnoController::queryInterface(const Type& _rType) throw (RuntimeException) -{ - Any aReturn = OGenericUnoController_COMPBASE::queryInterface(_rType); - if (!aReturn.hasValue()) - aReturn = OGenericUnoController_CTRBASE::queryInterface(_rType); - return aReturn; -} - -//------------------------------------------------------------------------------ void SAL_CALL OGenericUnoController::acquire( ) throw () { - OGenericUnoController_COMPBASE::acquire(); + OGenericUnoController_Base::acquire(); } //------------------------------------------------------------------------------ void SAL_CALL OGenericUnoController::release( ) throw () { - OGenericUnoController_COMPBASE::release(); -} - -//------------------------------------------------------------------------------ -Sequence< Type > SAL_CALL OGenericUnoController::getTypes( ) throw (RuntimeException) -{ - return ::comphelper::concatSequences( - OGenericUnoController_COMPBASE::getTypes(), - OGenericUnoController_CTRBASE::getTypes() - ); -} - -//------------------------------------------------------------------------------ -Sequence< sal_Int8 > SAL_CALL OGenericUnoController::getImplementationId( ) throw (RuntimeException) -{ - static ::cppu::OImplementationId * pId = 0; - if (! pId) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if (! pId) - { - static ::cppu::OImplementationId aId; - pId = &aId; - } - } - return pId->getImplementationId(); + OGenericUnoController_Base::release(); } // ------------------------------------------------------------------------- @@ -412,10 +401,12 @@ if ( getView() ) getView()->attachFrame( xFrame ); } + // ----------------------------------------------------------------------------- void OGenericUnoController::updateTitle() { } + // ----------------------------------------------------------------------------- struct CommandCollector : public ::std::unary_function< SupportedFeatures::value_type, void> { @@ -815,10 +806,11 @@ ,m_aFeaturesToInvalidate.end()); } -// ----------------------------------------------------------------------- -void SAL_CALL OGenericUnoController::dispose() throw(RuntimeException) +// ----------------------------------------------------------------------------- +void SAL_CALL OGenericUnoController::dispose( ) throw (RuntimeException) { - OGenericUnoController_COMPBASE::dispose(); + // disambiguate + OGenericUnoController_Base::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------- @@ -854,16 +846,18 @@ m_xServiceFactory = NULL; } -// ----------------------------------------------------------------------- -void OGenericUnoController::addEventListener(const Reference< XEventListener > & aListener) throw(RuntimeException) +// ----------------------------------------------------------------------------- +void SAL_CALL OGenericUnoController::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException) { - OGenericUnoController_COMPBASE::addEventListener(aListener); + // disambiguate + OGenericUnoController_Base::WeakComponentImplHelperBase::addEventListener( xListener ); } -// ----------------------------------------------------------------------- -void OGenericUnoController::removeEventListener(const Reference< XEventListener > & aListener) throw(RuntimeException) +// ----------------------------------------------------------------------------- +void SAL_CALL OGenericUnoController::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException) { - OGenericUnoController_COMPBASE::removeEventListener(aListener); + // disambiguate + OGenericUnoController_Base::WeakComponentImplHelperBase::removeEventListener( xListener ); } //------------------------------------------------------------------------------ @@ -1068,7 +1062,7 @@ // ----------------------------------------------------------------------------- IMPL_LINK(OGenericUnoController, OnAsyncCloseTask, void*, EMPTYARG) { - if ( !OGenericUnoController_COMPBASE::rBHelper.bInDispose ) + if ( !OGenericUnoController_Base::rBHelper.bInDispose ) { try { @@ -1356,10 +1350,9 @@ } // ----------------------------------------------------------------------------- -Reference< XModel > OGenericUnoController::getAssociatedModel() const +Reference< XController > SAL_CALL OGenericUnoController::getXController() { - // default to our very own model - return const_cast< OGenericUnoController* >( this )->getModel(); + return this; } // ----------------------------------------------------------------------------- @@ -1461,5 +1454,4 @@ { m_aSelectionListeners.removeInterface(xListener); } -// ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
