diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-12-06 14:14:11 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-12-06 14:14:11 +0100 |
| commit | 2e43a8bdb921877f62796915928623b5d344145d (patch) | |
| tree | 000147f37c045e5f10d3699eac4b727306d1ca91 | |
| parent | 85b346e583c622f06f55cea775ab821588b96d26 (diff) | |
gridsort: give the UnoControl(Model/Base) classes a ctor taking a service factory, so we have access to the factory
which created us, and don't need to resort to the process'es service factory
| -rw-r--r-- | dbaccess/source/ui/uno/ColumnControl.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/uno/ColumnControl.hxx | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index f471b33a9..961b7a0ce 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -61,7 +61,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; OColumnControl::OColumnControl(const Reference<XMultiServiceFactory>& _rxFactory) -: m_xORB(_rxFactory) + :UnoControl( _rxFactory ) { } // ----------------------------------------------------------------------------- @@ -87,7 +87,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit pParentWin = pParent->GetWindow(); } - OColumnPeer* pPeer = new OColumnPeer(pParentWin,m_xORB); + OColumnPeer* pPeer = new OColumnPeer( pParentWin, maContext.getLegacyServiceFactory() ); OSL_ENSURE(pPeer != NULL, "FmXGridControl::createPeer : imp_CreatePeer didn't return a peer !"); setPeer( pPeer ); diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx index b013208d0..243004e59 100644 --- a/dbaccess/source/ui/uno/ColumnControl.hxx +++ b/dbaccess/source/ui/uno/ColumnControl.hxx @@ -38,7 +38,6 @@ namespace dbaui { class OColumnControl : public UnoControl { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xORB; public: OColumnControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); |