diff options
| author | Release Engineering <releng@openoffice.org> | 2011-02-18 11:14:19 +0100 |
|---|---|---|
| committer | Release Engineering <releng@openoffice.org> | 2011-02-18 11:14:19 +0100 |
| commit | 811c29f8977bb5991c56d4fcc87d1afa4834517a (patch) | |
| tree | 18e08af40d99dc0d8661c5bd05064236cbd29719 | |
| parent | f0539ca73e451988047d57c61e6a1181489ba6af (diff) | |
| parent | dfcb5b7a715a499b2ca90091e73272f75b58209c (diff) | |
merged DEV300
| -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); |