diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-03 09:41:02 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-03 09:41:02 +0100 |
| commit | a8afeebd5035168cfd999bf01d15da37cd751a76 (patch) | |
| tree | e1ea0e78170c496de9d3fecb10d7a7b5e7a643d7 /dbaccess | |
| parent | b98b964dc2735ca4c42a3905ef5eddcddba411c1 (diff) | |
| parent | 49c236153e36ebf61b5464bb25132efbfa465ba2 (diff) | |
pulled and merged DEV300.m99
Diffstat (limited to 'dbaccess')
| -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 6d9d1eba083a..53e6f5907401 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 866eba99b18c..4d2a7de9829d 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); |