From da0e902ab4b397b90264866c705a2b66412c3d6e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 27 Mar 2013 16:20:37 +0200 Subject: fdo#46808, convert svx::DbGridControl to XComponentContext --- dbaccess/source/ui/browser/brwview.cxx | 2 +- dbaccess/source/ui/browser/sbagrid.cxx | 26 ++++++++++++-------------- dbaccess/source/ui/inc/sbagrid.hxx | 6 +++--- svx/inc/svx/fmgridcl.hxx | 2 +- svx/inc/svx/fmgridif.hxx | 10 +++++----- svx/inc/svx/gridctrl.hxx | 10 +++++----- svx/source/fmcomp/fmgridcl.cxx | 8 ++++---- svx/source/fmcomp/fmgridif.cxx | 18 +++++++++--------- svx/source/fmcomp/gridcell.cxx | 4 ++-- svx/source/fmcomp/gridctrl.cxx | 6 +++--- 10 files changed, 45 insertions(+), 47 deletions(-) diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index acdaecbdad03..fa47c37ba7e5 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -93,7 +93,7 @@ void UnoDataBrowserView::Construct(const Reference< ::com::sun::star::awt::XCont m_xMe = VCLUnoHelper::CreateControlContainer(this); // create the (UNO-) control - m_xGrid = new SbaXGridControl(Reference(getORB()->getServiceManager(), UNO_QUERY_THROW) ); + m_xGrid = new SbaXGridControl( getORB() ); OSL_ENSURE(m_xGrid.is(), "UnoDataBrowserView::Construct : could not create a grid control !"); // in design mode (for the moment) m_xGrid->setDesignMode(sal_True); diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 3aac74583833..973aeca2602f 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -118,7 +118,7 @@ extern "C" void SAL_CALL createRegistryInfo_SbaXGridControl() // ------------------------------------------------------------------------- Reference< XInterface > SAL_CALL SbaXGridControl::Create(const Reference& _rxFactory) { - return *(new SbaXGridControl(_rxFactory)); + return *(new SbaXGridControl( comphelper::getComponentContext(_rxFactory) )); } //------------------------------------------------------------------ @@ -151,7 +151,7 @@ Sequence< OUString> SbaXGridControl::getSupportedServiceNames_Static(void) throw } DBG_NAME(SbaXGridControl ); //--------------------------------------------------------------------------------------- -SbaXGridControl::SbaXGridControl(const Reference< XMultiServiceFactory >& _rM) +SbaXGridControl::SbaXGridControl(const Reference< XComponentContext >& _rM) : FmXGridControl(_rM) { DBG_CTOR(SbaXGridControl ,NULL); @@ -166,7 +166,7 @@ SbaXGridControl::~SbaXGridControl() //--------------------------------------------------------------------------------------- FmXGridPeer* SbaXGridControl::imp_CreatePeer(Window* pParent) { - FmXGridPeer* pReturn = new SbaXGridPeer(m_xServiceFactory); + FmXGridPeer* pReturn = new SbaXGridPeer(m_xContext); // translate properties into WinBits WinBits nStyle = WB_TABSTOP; @@ -328,7 +328,7 @@ void SAL_CALL SbaXGridControl::dispose(void) throw( RuntimeException ) //======================================================================================= DBG_NAME(SbaXGridPeer ) //--------------------------------------------------------------------------------------- -SbaXGridPeer::SbaXGridPeer(const Reference< XMultiServiceFactory >& _rM) +SbaXGridPeer::SbaXGridPeer(const Reference< XComponentContext >& _rM) : FmXGridPeer(_rM) ,m_aStatusListeners(m_aMutex) { @@ -606,7 +606,7 @@ SbaXGridPeer* SbaXGridPeer::getImplementation(const Reference< XInterface >& _rx //--------------------------------------------------------------------------------------- FmGridControl* SbaXGridPeer::imp_CreateControl(Window* pParent, WinBits nStyle) { - return new SbaGridControl(m_xServiceFactory, pParent, this, nStyle); + return new SbaGridControl( m_xContext, pParent, this, nStyle); } //================================================================== @@ -772,7 +772,7 @@ void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM //================================================================== DBG_NAME(SbaGridControl ); //--------------------------------------------------------------------------------------- -SbaGridControl::SbaGridControl(Reference< XMultiServiceFactory > _rM, +SbaGridControl::SbaGridControl(Reference< XComponentContext > _rM, Window* pParent, FmXGridPeer* _pPeer, WinBits nBits) :FmGridControl(_rM,pParent, _pPeer, nBits) ,m_pMasterListener(NULL) @@ -836,7 +836,7 @@ void SbaGridControl::PreExecuteRowContextMenu(sal_uInt16 nRow, PopupMenu& rMenu) //------------------------------------------------------------------------------ SvNumberFormatter* SbaGridControl::GetDatasourceFormatter() { - Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = ::dbtools::getNumberFormats(::dbtools::getConnection(Reference< XRowSet > (getDataSource(),UNO_QUERY)), sal_True, comphelper::getComponentContext(getServiceManager())); + Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = ::dbtools::getNumberFormats(::dbtools::getConnection(Reference< XRowSet > (getDataSource(),UNO_QUERY)), sal_True, getContext()); SvNumberFormatsSupplierObj* pSupplierImpl = SvNumberFormatsSupplierObj::getImplementation( xSupplier ); if ( !pSupplierImpl ) @@ -958,10 +958,8 @@ void SbaGridControl::SetBrowserAttrs() Sequence< Any > aDialogArgs(1); aDialogArgs[0] <<= aArg; - Reference< XInterface > xDialog = getServiceManager()->createInstanceWithArguments( - OUString("com.sun.star.form.ControlFontDialog"), - aDialogArgs - ); + Reference< XComponentContext > xContext = getContext(); + Reference< XInterface > xDialog = xContext->getServiceManager()->createInstanceWithArgumentsAndContext("com.sun.star.form.ControlFontDialog", aDialogArgs, xContext); if (!xDialog.is()) { ShowServiceNotAvailableError(this, OUString("com.sun.star.form.ControlFontDialog"), sal_True); @@ -1304,7 +1302,7 @@ void SbaGridControl::implTransferSelectedRows( sal_Int16 nRowPos, bool _bTrueIfC Reference< XResultSet> xRowSetClone; try { - ODataClipboard* pTransfer = new ODataClipboard( xForm, aSelectedRows, bSelectionBookmarks, comphelper::getComponentContext(getServiceManager()) ); + ODataClipboard* pTransfer = new ODataClipboard( xForm, aSelectedRows, bSelectionBookmarks, getContext() ); Reference< XTransferable > xEnsureDelete = pTransfer; if ( _bTrueIfClipboardFalseIfDrag ) @@ -1555,7 +1553,7 @@ IMPL_LINK(SbaGridControl, AsynchDropEvent, void*, /*EMPTY_ARG*/) if ( !bCountFinal ) setDataSource(NULL); // deattach from grid control Reference< XResultSetUpdate > xResultSetUpdate(xDataSource,UNO_QUERY); - ODatabaseImportExport* pImExport = new ORowSetImportExport(this,xResultSetUpdate,m_aDataDescriptor, comphelper::getComponentContext(getServiceManager())); + ODatabaseImportExport* pImExport = new ORowSetImportExport(this,xResultSetUpdate,m_aDataDescriptor, getContext()); Reference xHolder = pImExport; Hide(); try @@ -1574,7 +1572,7 @@ IMPL_LINK(SbaGridControl, AsynchDropEvent, void*, /*EMPTY_ARG*/) { AfterDrop(); Show(); - ::dbaui::showError(::dbtools::SQLExceptionInfo(e),this,comphelper::getComponentContext(getServiceManager())); + ::dbaui::showError( ::dbtools::SQLExceptionInfo(e), this, getContext() ); } catch(const Exception& ) { diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 57ad9e71fe34..d930cc08cf86 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -66,7 +66,7 @@ namespace dbaui StatusMultiplexerArray m_aStatusMultiplexer; public: - SbaXGridControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); + SbaXGridControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); virtual ~SbaXGridControl(); // UNO @@ -111,7 +111,7 @@ namespace dbaui ::cppu::OMultiTypeInterfaceContainerHelperVar< ::com::sun::star::util::URL,SbaURLHash , SbaURLCompare> m_aStatusListeners; public: - SbaXGridPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); + SbaXGridPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); virtual ~SbaXGridPeer(); // UNO @@ -246,7 +246,7 @@ namespace dbaui sal_uInt16 GetCurrentActionColumn() const { return m_nCurrentActionColId; } public: - SbaGridControl(::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >,Window* pParent, FmXGridPeer* _pPeer, WinBits nBits = WB_TABSTOP); + SbaGridControl(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >,Window* pParent, FmXGridPeer* _pPeer, WinBits nBits = WB_TABSTOP); virtual ~SbaGridControl(); virtual void Command( const CommandEvent& rCEvt ); diff --git a/svx/inc/svx/fmgridcl.hxx b/svx/inc/svx/fmgridcl.hxx index c3f631363b2b..b0d225ccef24 100644 --- a/svx/inc/svx/fmgridcl.hxx +++ b/svx/inc/svx/fmgridcl.hxx @@ -105,7 +105,7 @@ class SVX_DLLPUBLIC FmGridControl : public DbGridControl public: FmGridControl( - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&, Window* pParent, FmXGridPeer* _pPeer, WinBits nBits); diff --git a/svx/inc/svx/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx index 156d5b96dd45..7a1951d4dea0 100644 --- a/svx/inc/svx/fmgridif.hxx +++ b/svx/inc/svx/fmgridif.hxx @@ -218,10 +218,10 @@ protected: sal_uInt16 m_nPeerCreationLevel; sal_Bool m_bInDraw; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; public: - FmXGridControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); + FmXGridControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); virtual ~FmXGridControl(); // UNO connection @@ -367,11 +367,11 @@ class SVX_DLLPUBLIC FmXGridPeer :public VCLXWindow GridListenerDelegator* m_pGridListener; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; - ::osl::Mutex m_aMutex; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + ::osl::Mutex m_aMutex; public: - FmXGridPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); + FmXGridPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); ~FmXGridPeer(); // spaeter Constructor, immer nach dem realen Constructor zu rufen ! diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx index d308a9217eaa..9a146353950d 100644 --- a/svx/inc/svx/gridctrl.hxx +++ b/svx/inc/svx/gridctrl.hxx @@ -221,8 +221,8 @@ private: Link m_aMasterStateProvider; Link m_aMasterSlotExecutor; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; DbGridColumns m_aColumns; // Column description NavigationBar m_aBar; @@ -365,7 +365,7 @@ protected: public: DbGridControl( - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >, + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >, Window* pParent, WinBits nBits = WB_BORDER); @@ -496,8 +496,8 @@ public: */ void ForceHideScrollbars( sal_Bool _bForce ); - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - getServiceManager() const { return m_xServiceFactory; } + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + getContext() const { return m_xContext; } /// returns if the text of the given cell can be copied into the clipboard sal_Bool canCopyCellText(sal_Int32 _nRow, sal_Int16 _nColId); diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index b3c259deda8b..a864db34a1c2 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -285,8 +285,8 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) try { OUString sSignificantSource( sDatasouce.isEmpty() ? sDatabaseLocation : sDatasouce ); - xConnection = OStaticDataAccessTools().getConnection_withFeedback(sSignificantSource, OUString(),OUString(), - comphelper::getComponentContext( static_cast(GetParent())->getServiceManager() )); + xConnection = OStaticDataAccessTools().getConnection_withFeedback(sSignificantSource, OUString(), OUString(), + static_cast(GetParent())->getContext() ); } catch(NoSuchElementException&) { // allowed, means sDatasouce isn't a valid data source name .... @@ -1017,11 +1017,11 @@ void FmGridHeader::Command(const CommandEvent& rEvt) //------------------------------------------------------------------------------ FmGridControl::FmGridControl( - Reference< ::com::sun::star::lang::XMultiServiceFactory > _rxFactory, + const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, Window* pParent, FmXGridPeer* _pPeer, WinBits nBits) - :DbGridControl(_rxFactory, pParent, nBits) + :DbGridControl(_rxContext, pParent, nBits) ,m_pPeer(_pPeer) ,m_nCurrentSelectedColumn(-1) ,m_nMarkedColumnId(BROWSER_INVALIDID) diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index d202afc15b8a..53781d2c04fc 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -351,11 +351,11 @@ void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _even //------------------------------------------------------------------ Reference< XInterface > SAL_CALL FmXGridControl_NewInstance_Impl(const Reference< XMultiServiceFactory>& _rxFactory) { - return *(new FmXGridControl(_rxFactory)); + return *(new FmXGridControl( comphelper::getComponentContext(_rxFactory) )); } DBG_NAME(FmXGridControl ) //------------------------------------------------------------------------------ -FmXGridControl::FmXGridControl(const Reference< XMultiServiceFactory >& _rxFactory) +FmXGridControl::FmXGridControl(const Reference< XComponentContext >& _rxContext) :UnoControl() ,m_aModifyListeners(*this, GetMutex()) ,m_aUpdateListeners(*this, GetMutex()) @@ -364,7 +364,7 @@ FmXGridControl::FmXGridControl(const Reference< XMultiServiceFactory >& _rxFacto ,m_aGridControlListeners(*this, GetMutex()) ,m_nPeerCreationLevel(0) ,m_bInDraw(sal_False) - ,m_xServiceFactory(_rxFactory) + ,m_xContext(_rxContext) { DBG_CTOR(FmXGridControl ,NULL); } @@ -475,7 +475,7 @@ sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< ::com::sun::star::aw //------------------------------------------------------------------------------ FmXGridPeer* FmXGridControl::imp_CreatePeer(Window* pParent) { - FmXGridPeer* pReturn = new FmXGridPeer(m_xServiceFactory); + FmXGridPeer* pReturn = new FmXGridPeer(m_xContext); // translate properties into WinBits WinBits nStyle = WB_TABSTOP; @@ -1057,7 +1057,7 @@ void FmXGridPeer::GridListenerDelegator::columnChanged() //------------------------------------------------------------------ Reference< XInterface > FmXGridPeer_CreateInstance(const Reference< XMultiServiceFactory>& _rxFactory) { - FmXGridPeer* pNewObject = new FmXGridPeer(_rxFactory); + FmXGridPeer* pNewObject = new FmXGridPeer( comphelper::getComponentContext(_rxFactory) ); pNewObject->Create(NULL, WB_TABSTOP); return *pNewObject; } @@ -1122,7 +1122,7 @@ namespace fmgridif using namespace fmgridif; //------------------------------------------------------------------ -FmXGridPeer::FmXGridPeer(const Reference< XMultiServiceFactory >& _rxFactory) +FmXGridPeer::FmXGridPeer(const Reference< XComponentContext >& _rxContext) :m_aModifyListeners(m_aMutex) ,m_aUpdateListeners(m_aMutex) ,m_aContainerListeners(m_aMutex) @@ -1134,7 +1134,7 @@ FmXGridPeer::FmXGridPeer(const Reference< XMultiServiceFactory >& _rxFactory) ,m_pStateCache(NULL) ,m_pDispatchers(NULL) ,m_pGridListener(NULL) - ,m_xServiceFactory(_rxFactory) + ,m_xContext(_rxContext) { // Create must be called after this constructure m_pGridListener = new GridListenerDelegator( this ); @@ -1143,7 +1143,7 @@ FmXGridPeer::FmXGridPeer(const Reference< XMultiServiceFactory >& _rxFactory) //------------------------------------------------------------------------------ FmGridControl* FmXGridPeer::imp_CreateControl(Window* pParent, WinBits nStyle) { - return new FmGridControl(m_xServiceFactory, pParent, this, nStyle); + return new FmGridControl(m_xContext, pParent, this, nStyle); } //------------------------------------------------------------------------------ @@ -1826,7 +1826,7 @@ void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeExcep if (::comphelper::getBOOL(aHidden)) pGrid->HideColumn(pCol->GetId()); - FormControlFactory( m_xServiceFactory ).initializeTextFieldLineEnds( xNewColumn ); + FormControlFactory( m_xContext ).initializeTextFieldLineEnds( xNewColumn ); } //------------------------------------------------------------------------------ diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index dae1f8ddd0f7..f7dcf1144d1b 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -178,7 +178,7 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< ::com::s DbCellControl* pCellControl = NULL; if (m_rParent.IsFilterMode()) { - pCellControl = new DbFilterField(comphelper::getComponentContext(m_rParent.getServiceManager()),*this); + pCellControl = new DbFilterField(m_rParent.getContext(),*this); } else { @@ -191,7 +191,7 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< ::com::s case TYPE_DATEFIELD: pCellControl = new DbDateField(*this); break; case TYPE_LISTBOX: pCellControl = new DbListBox(*this); break; case TYPE_NUMERICFIELD: pCellControl = new DbNumericField(*this); break; - case TYPE_PATTERNFIELD: pCellControl = new DbPatternField( *this, ::comphelper::ComponentContext( m_rParent.getServiceManager() ) ); break; + case TYPE_PATTERNFIELD: pCellControl = new DbPatternField( *this, m_rParent.getContext() ); break; case TYPE_TEXTFIELD: pCellControl = new DbTextField(*this); break; case TYPE_TIMEFIELD: pCellControl = new DbTimeField(*this); break; case TYPE_FORMATTEDFIELD: pCellControl = new DbFormattedField(*this); break; diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 64bf73436454..83358a73284c 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -904,11 +904,11 @@ void DbGridRow::SetState(CursorWrapper* pCur, sal_Bool bPaintCursor) DBG_NAME(DbGridControl); //------------------------------------------------------------------------------ DbGridControl::DbGridControl( - Reference< XMultiServiceFactory > _rxFactory, + Reference< XComponentContext > _rxContext, Window* pParent, WinBits nBits) :DbGridControl_Base(pParent, EBBF_NONE, nBits, DEFAULT_BROWSE_MODE ) - ,m_xServiceFactory(_rxFactory) + ,m_xContext(_rxContext) ,m_aBar(this) ,m_nAsynAdjustEvent(0) ,m_pDataSourcePropMultiplexer(NULL) @@ -1448,7 +1448,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt if (xSupplier.is()) { m_xFormatter = Reference< ::com::sun::star::util::XNumberFormatter >( - ::com::sun::star::util::NumberFormatter::create(comphelper::getComponentContext(m_xServiceFactory)), + ::com::sun::star::util::NumberFormatter::create(m_xContext), UNO_QUERY); m_xFormatter->attachNumberFormatsSupplier(xSupplier); -- cgit v1.2.3