diff options
author | Noel Grandin <noel@peralex.com> | 2013-03-20 09:29:30 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-04-08 13:53:03 +0200 |
commit | 86fdce60115014ddfae05993ef43686c9dbd6004 (patch) | |
tree | d50705d5f93fec079e4d676cd2a5a9c50783c6f3 /framework/source/uielement | |
parent | 34da7fbcc643ad209290c6da456dbfb17aeb9ac0 (diff) |
fdo#46808, Convert svt::ToolboxController to XComponentContext
.. and all of it's friends
Change-Id: I408d9308d1d1a4f8ed0055ac5f4042d729c44d1e
Diffstat (limited to 'framework/source/uielement')
13 files changed, 75 insertions, 64 deletions
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 216f31a66b9b..d15e58e6393d 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -322,7 +322,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue { ::cppu::OWeakObject* pController = 0; - pController = ToolBarMerger::CreateController( m_xServiceManager, m_xFrame, m_pToolBar, aURL, nId, nWidth, aControlType ); + pController = ToolBarMerger::CreateController( xComponentContext, m_xFrame, m_pToolBar, aURL, nId, nWidth, aControlType ); xController = Reference< XStatusListener >( pController, UNO_QUERY ); } diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index 6c1c8c145b33..cd827d7eebcb 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "com/sun/star/util/XMacroExpander.hpp" #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/beans/XPropertySet.hpp" @@ -55,14 +56,14 @@ namespace framework { ButtonToolbarController::ButtonToolbarController( - const uno::Reference< lang::XMultiServiceFactory >& rServiceManager, + const uno::Reference< uno::XComponentContext >& rxContext, ToolBox* pToolBar, const OUString& aCommand ) : cppu::OWeakObject(), m_bInitialized( sal_False ), m_bDisposed( sal_False ), m_aCommandURL( aCommand ), - m_xServiceManager( rServiceManager ), + m_xContext( rxContext ), m_pToolbar( pToolBar ) { } @@ -130,7 +131,10 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException else if ( aPropValue.Name == "CommandURL" ) aPropValue.Value >>= m_aCommandURL; else if ( aPropValue.Name == "ServiceManager" ) - m_xServiceManager.set(aPropValue.Value,UNO_QUERY); + { + Reference<XMultiServiceFactory> xServiceManager(aPropValue.Value,UNO_QUERY); + m_xContext = comphelper::getComponentContext(xServiceManager); + } } } } @@ -146,7 +150,7 @@ void SAL_CALL ButtonToolbarController::dispose() throw (::com::sun::star::uno::R if ( m_bDisposed ) throw DisposedException(); - m_xServiceManager.clear(); + m_xContext.clear(); m_xURLTransformer.clear(); m_xFrame.clear(); m_pToolbar = 0; @@ -220,12 +224,12 @@ throw (::com::sun::star::uno::RuntimeException) if ( m_bInitialized && m_xFrame.is() && - m_xServiceManager.is() && + m_xContext.is() && !m_aCommandURL.isEmpty() ) { if ( !m_xURLTransformer.is() ) { - m_xURLTransformer = util::URLTransformer::create( ::comphelper::getComponentContext(m_xServiceManager) ); + m_xURLTransformer = util::URLTransformer::create( m_xContext ); } xFrame = m_xFrame; diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 3757f7adc977..ceb614c0ed2f 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -140,13 +140,13 @@ long ComboBoxControl::PreNotify( NotifyEvent& rNEvt ) // ------------------------------------------------------------------ ComboboxToolbarController::ComboboxToolbarController( - const Reference< XMultiServiceFactory >& rServiceManager, - const Reference< XFrame >& rFrame, - ToolBox* pToolbar, - sal_uInt16 nID, - sal_Int32 nWidth, - const OUString& aCommand ) : - ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) + const Reference< XComponentContext >& rxContext, + const Reference< XFrame >& rFrame, + ToolBox* pToolbar, + sal_uInt16 nID, + sal_Int32 nWidth, + const OUString& aCommand ) : + ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ) , m_pComboBox( 0 ) { m_pComboBox = new ComboBoxControl( m_pToolbar, WB_DROPDOWN, this ); diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 499e1b47e146..d5960f8f9b68 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -53,17 +53,17 @@ namespace framework // ------------------------------------------------------------------ ComplexToolbarController::ComplexToolbarController( - const Reference< XMultiServiceFactory >& rServiceManager, - const Reference< XFrame >& rFrame, - ToolBox* pToolbar, - sal_uInt16 nID, - const OUString& aCommand ) : - svt::ToolboxController( rServiceManager, rFrame, aCommand ) + const Reference< XComponentContext >& rxContext, + const Reference< XFrame >& rFrame, + ToolBox* pToolbar, + sal_uInt16 nID, + const OUString& aCommand ) : + svt::ToolboxController( rxContext, rFrame, aCommand ) , m_pToolbar( pToolbar ) , m_nID( nID ) , m_bMadeInvisible( sal_False ) { - m_xURLTransformer.set( URLTransformer::create(::comphelper::getComponentContext(m_xServiceManager)) ); + m_xURLTransformer.set( URLTransformer::create(m_xContext) ); } // ------------------------------------------------------------------ @@ -115,7 +115,6 @@ throw ( RuntimeException ) if ( m_bInitialized && m_xFrame.is() && - m_xServiceManager.is() && !m_aCommandURL.isEmpty() ) { xURLTransformer = m_xURLTransformer; @@ -301,7 +300,7 @@ uno::Reference< frame::XDispatch > ComplexToolbarController::getDispatchFromComm { uno::Reference< frame::XDispatch > xDispatch; - if ( m_bInitialized && m_xFrame.is() && m_xServiceManager.is() && !aCommand.isEmpty() ) + if ( m_bInitialized && m_xFrame.is() && !aCommand.isEmpty() ) { URLToDispatchMap::const_iterator pIter = m_aListenerMap.find( aCommand ); if ( pIter != m_aListenerMap.end() ) diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index ac746a76924c..69b52f2f2516 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -122,13 +122,13 @@ long ListBoxControl::PreNotify( NotifyEvent& rNEvt ) // ------------------------------------------------------------------ DropdownToolbarController::DropdownToolbarController( - const Reference< XMultiServiceFactory >& rServiceManager, + const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, ToolBox* pToolbar, sal_uInt16 nID, sal_Int32 nWidth, const OUString& aCommand ) : - ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) + ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ) , m_pListBoxControl( 0 ) { m_pListBoxControl = new ListBoxControl( m_pToolbar, WB_DROPDOWN|WB_AUTOHSCROLL|WB_BORDER, this ); diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index ba3ae7eb871d..53afe0f28674 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -121,13 +121,13 @@ long EditControl::PreNotify( NotifyEvent& rNEvt ) // ------------------------------------------------------------------ EditToolbarController::EditToolbarController( - const Reference< XMultiServiceFactory >& rServiceManager, + const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, ToolBox* pToolbar, sal_uInt16 nID, sal_Int32 nWidth, const OUString& aCommand ) : - ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) + ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ) , m_pEditControl( 0 ) { m_pEditControl = new EditControl( m_pToolbar, WB_BORDER, this ); diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index a021b33471fe..6d44e91b4cae 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -101,12 +101,12 @@ struct ExecuteInfo ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; }; -GenericToolbarController::GenericToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, +GenericToolbarController::GenericToolbarController( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, ToolBox* pToolbar, - sal_uInt16 nID, + sal_uInt16 nID, const OUString& aCommand ) : - svt::ToolboxController( rServiceManager, rFrame, aCommand ) + svt::ToolboxController( rxContext, rFrame, aCommand ) , m_pToolbar( pToolbar ) , m_nID( nID ) , m_bEnumCommand( isEnumCommand( aCommand )) @@ -147,10 +147,9 @@ throw ( RuntimeException ) if ( m_bInitialized && m_xFrame.is() && - m_xServiceManager.is() && !m_aCommandURL.isEmpty() ) { - xURLTransformer = URLTransformer::create(::comphelper::getComponentContext(m_xServiceManager)); + xURLTransformer = URLTransformer::create(m_xContext); aCommandURL = m_aCommandURL; URLToDispatchMap::iterator pIter = m_aListenerMap.find( m_aCommandURL ); @@ -297,7 +296,17 @@ IMPL_STATIC_LINK_NOINSTANCE( GenericToolbarController, ExecuteHdl_Impl, ExecuteI return 0; } -MenuToolbarController::MenuToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, const OUString& aCommand, const OUString& aModuleIdentifier, const Reference< XIndexAccess >& xMenuDesc ) : GenericToolbarController( rServiceManager, rFrame, pToolBar, nID, aCommand ), m_xMenuDesc( xMenuDesc ), pMenu( NULL ), m_aModuleIdentifier( aModuleIdentifier ) +MenuToolbarController::MenuToolbarController( const Reference< XComponentContext >& rxContext, + const Reference< XFrame >& rFrame, + ToolBox* pToolBar, + sal_uInt16 nID, + const OUString& aCommand, + const OUString& aModuleIdentifier, + const Reference< XIndexAccess >& xMenuDesc ) + : GenericToolbarController( rxContext, rFrame, pToolBar, nID, aCommand ), + m_xMenuDesc( xMenuDesc ), + pMenu( NULL ), + m_aModuleIdentifier( aModuleIdentifier ) { } @@ -345,9 +354,9 @@ MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::Runtime if ( !pMenu ) { Reference< XDispatchProvider > xDispatch; - Reference< XURLTransformer > xURLTransformer = URLTransformer::create(::comphelper::getComponentContext(m_xServiceManager)); + Reference< XURLTransformer > xURLTransformer = URLTransformer::create( m_xContext ); pMenu = new Toolbarmenu(); - m_xMenuManager.set( new MenuBarManager( m_xServiceManager, m_xFrame, xURLTransformer, xDispatch, m_aModuleIdentifier, pMenu, sal_True, sal_True ) ); + m_xMenuManager.set( new MenuBarManager( Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW), m_xFrame, xURLTransformer, xDispatch, m_aModuleIdentifier, pMenu, sal_True, sal_True ) ); if ( m_xMenuManager.is() ) { MenuBarManager* pMgr = dynamic_cast< MenuBarManager* >( m_xMenuManager.get() ); diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index e790afda932d..2b01e9297ecd 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -99,12 +99,12 @@ static void SubstituteVariables( OUString& aURL ) // ------------------------------------------------------------------ ImageButtonToolbarController::ImageButtonToolbarController( - const Reference< XMultiServiceFactory >& rServiceManager, + const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, ToolBox* pToolbar, sal_uInt16 nID, const OUString& aCommand ) : - ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) + ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ) { sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx index e22e79f44625..80fbdc3a845e 100644 --- a/framework/source/uielement/popupmenucontroller.cxx +++ b/framework/source/uielement/popupmenucontroller.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star::beans; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( PopupMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE_2 ( PopupMenuController , OWeakObject , OUString( "com.sun.star.frame.ToolbarController" ) , OUString( "com.sun.star.comp.framework.PopupMenuController" ) @@ -62,8 +62,8 @@ class PopupMenuControllerImpl // class PopupMenuController //======================================================================== -PopupMenuController::PopupMenuController( const Reference< lang::XMultiServiceFactory >& rServiceManager ) -: svt::ToolboxController( rServiceManager, Reference< frame::XFrame >(), OUString() ) +PopupMenuController::PopupMenuController( const Reference< uno::XComponentContext >& rxContext ) +: svt::ToolboxController( rxContext, Reference< frame::XFrame >(), OUString() ) { } @@ -156,10 +156,7 @@ void SAL_CALL PopupMenuController::doubleClick() throw (RuntimeException) bool PopupMenuController::CreatePopupMenuController() throw (Exception) { - Reference< XComponentContext > xComponentContext( - comphelper::getComponentContext( getServiceManager() ) ); - - Reference< XToolbarControllerFactory > xPopupMenuControllerRegistration = PopupMenuControllerFactory::create( xComponentContext ); + Reference< XToolbarControllerFactory > xPopupMenuControllerRegistration = PopupMenuControllerFactory::create( m_xContext ); Sequence< Any > aSeq( 2 ); PropertyValue aPropValue; @@ -171,7 +168,7 @@ bool PopupMenuController::CreatePopupMenuController() throw (Exception) aPropValue.Value <<= m_xFrame; aSeq[1] <<= aPropValue; - Reference< XPopupMenuController > xPopupMenuController( xPopupMenuControllerRegistration->createInstanceWithArgumentsAndContext( getCommandURL(), aSeq, xComponentContext ), UNO_QUERY ); + Reference< XPopupMenuController > xPopupMenuController( xPopupMenuControllerRegistration->createInstanceWithArgumentsAndContext( getCommandURL(), aSeq, m_xContext ), UNO_QUERY ); if ( xPopupMenuController.is() ) { mxPopupMenuController = xPopupMenuController; @@ -204,7 +201,8 @@ Reference< awt::XWindow > SAL_CALL PopupMenuController::createPopupWindow() thro if( !mxPopupMenu.is() ) { - mxPopupMenu = Reference< awt::XPopupMenu >( getServiceManager()->createInstance( DECLARE_ASCII( "stardiv.Toolkit.VCLXPopupMenu" ) ), UNO_QUERY_THROW ); + mxPopupMenu = Reference< awt::XPopupMenu >( + m_xContext->getServiceManager()->createInstanceWithContext("stardiv.Toolkit.VCLXPopupMenu", m_xContext), UNO_QUERY_THROW ); mxPopupMenuController->setPopupMenu( mxPopupMenu ); } else diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index 4b295bf6458b..9da2523b2743 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -175,13 +175,13 @@ long SpinfieldControl::PreNotify( NotifyEvent& rNEvt ) // ------------------------------------------------------------------ SpinfieldToolbarController::SpinfieldToolbarController( - const Reference< XMultiServiceFactory >& rServiceManager, + const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, ToolBox* pToolbar, sal_uInt16 nID, sal_Int32 nWidth, const OUString& aCommand ) : - ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) + ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ) , m_bFloat( false ) , m_bMaxSet( false ) , m_bMinSet( false ) diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index 619e37aa30f1..dfa24230d05b 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -57,13 +57,13 @@ namespace framework // ------------------------------------------------------------------ ToggleButtonToolbarController::ToggleButtonToolbarController( - const Reference< XMultiServiceFactory >& rServiceManager, + const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, ToolBox* pToolbar, sal_uInt16 nID, Style eStyle, const OUString& aCommand ) : - ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ), + ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ), m_eStyle( eStyle ) { if ( eStyle == STYLE_DROPDOWNBUTTON ) diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 58cc63824790..d2cb76972e97 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -970,7 +970,7 @@ void ToolBarManager::CreateControllers() OUString aControlType = static_cast< AddonsParams* >( m_pToolBar->GetItemData( nId ))->aControlType; Reference< XStatusListener > xStatusListener( - ToolBarMerger::CreateController( m_xServiceManager, + ToolBarMerger::CreateController( comphelper::getComponentContext(m_xServiceManager), m_xFrame, m_pToolBar, aCommandURL, @@ -986,7 +986,7 @@ void ToolBarManager::CreateControllers() if ( it == m_aMenuMap.end() ) { xController = Reference< XStatusListener >( - new GenericToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL )); + new GenericToolbarController( comphelper::getComponentContext(m_xServiceManager), m_xFrame, m_pToolBar, nId, aCommandURL )); // Accessibility support: Set toggle button role for specific commands sal_Int32 nProps = RetrievePropertiesFromCommand( aCommandURL ); @@ -995,7 +995,7 @@ void ToolBarManager::CreateControllers() } else xController = Reference< XStatusListener >( - new MenuToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL, m_aModuleIdentifier, m_aMenuMap[ nId ] )); + new MenuToolbarController( comphelper::getComponentContext(m_xServiceManager), m_xFrame, m_pToolBar, nId, aCommandURL, m_aModuleIdentifier, m_aMenuMap[ nId ] )); } } else if ( pController ) diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index 9d714711d421..f11155addbbc 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -23,6 +23,7 @@ #include <framework/imageproducer.hxx> #include <svtools/miscopt.hxx> +#include <comphelper/processfactory.hxx> namespace framework { @@ -649,8 +650,8 @@ bool ToolBarMerger::RemoveItems( false. */ ::cppu::OWeakObject* ToolBarMerger::CreateController( - uno::Reference< lang::XMultiServiceFactory > xSMGR, - uno::Reference< frame::XFrame > xFrame, + const uno::Reference< uno::XComponentContext >& rxContext, + const uno::Reference< frame::XFrame > & xFrame, ToolBox* pToolbar, const OUString& rCommandURL, sal_uInt16 nId, @@ -660,25 +661,25 @@ bool ToolBarMerger::RemoveItems( ::cppu::OWeakObject* pResult( 0 ); if ( rControlType.equalsAsciiL( TOOLBARCONTROLLER_BUTTON, TOOLBARCONTROLLER_BUTTON_LEN )) - pResult = new ButtonToolbarController( xSMGR, pToolbar, rCommandURL ); + pResult = new ButtonToolbarController( rxContext, pToolbar, rCommandURL ); else if ( rControlType.equalsAsciiL( TOOLBARCONTROLLER_COMBOBOX, TOOLBARCONTROLLER_COMBOBOX_LEN )) - pResult = new ComboboxToolbarController( xSMGR, xFrame, pToolbar, nId, nWidth, rCommandURL ); + pResult = new ComboboxToolbarController( rxContext, xFrame, pToolbar, nId, nWidth, rCommandURL ); else if ( rControlType.equalsAsciiL( TOOLBARCONTROLLER_EDIT, TOOLBARCONTROLLER_EDIT_LEN )) - pResult = new EditToolbarController( xSMGR, xFrame, pToolbar, nId, nWidth, rCommandURL ); + pResult = new EditToolbarController( rxContext, xFrame, pToolbar, nId, nWidth, rCommandURL ); else if ( rControlType.equalsAsciiL( TOOLBARCONTROLLER_SPINFIELD, TOOLBARCONTROLLER_SPINFIELD_LEN )) - pResult = new SpinfieldToolbarController( xSMGR, xFrame, pToolbar, nId, nWidth, rCommandURL ); + pResult = new SpinfieldToolbarController( rxContext, xFrame, pToolbar, nId, nWidth, rCommandURL ); else if ( rControlType.equalsAsciiL( TOOLBARCONTROLLER_IMGBUTTON, TOOLBARCONTROLLER_IMGBUTTON_LEN )) - pResult = new ImageButtonToolbarController( xSMGR, xFrame, pToolbar, nId, rCommandURL ); + pResult = new ImageButtonToolbarController( rxContext, xFrame, pToolbar, nId, rCommandURL ); else if ( rControlType.equalsAsciiL( TOOLBARCONTROLLER_DROPDOWNBOX, TOOLBARCONTROLLER_DROPDOWNBOX_LEN )) - pResult = new DropdownToolbarController( xSMGR, xFrame, pToolbar, nId, nWidth, rCommandURL ); + pResult = new DropdownToolbarController( rxContext, xFrame, pToolbar, nId, nWidth, rCommandURL ); else if ( rControlType.equalsAsciiL( TOOLBARCONTROLLER_DROPDOWNBTN, TOOLBARCONTROLLER_DROPDOWNBTN_LEN )) - pResult = new ToggleButtonToolbarController( xSMGR, xFrame, pToolbar, nId, + pResult = new ToggleButtonToolbarController( rxContext, xFrame, pToolbar, nId, ToggleButtonToolbarController::STYLE_DROPDOWNBUTTON, rCommandURL ); else if ( rControlType.equalsAsciiL( TOOLBARCONTROLLER_TOGGLEDDBTN, TOOLBARCONTROLLER_TOGGLEDDBTN_LEN )) - pResult = new ToggleButtonToolbarController( xSMGR, xFrame, pToolbar, nId, + pResult = new ToggleButtonToolbarController( rxContext, xFrame, pToolbar, nId, ToggleButtonToolbarController::STYLE_TOGGLE_DROPDOWNBUTTON, rCommandURL ); else - pResult = new GenericToolbarController( xSMGR, xFrame, pToolbar, nId, rCommandURL ); + pResult = new GenericToolbarController( rxContext, xFrame, pToolbar, nId, rCommandURL ); return pResult; } |