diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-03-08 09:56:56 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-03-08 09:56:56 +0100 |
| commit | c78f979010fe079a6e484d139144098571902e05 (patch) | |
| tree | 7e2a72dbd23c974efe63ddbad23664e6852d2f20 /dbaccess | |
| parent | 16236f9da6583ccca892aca5000098080f300a75 (diff) | |
| parent | 1f1794f5d112fa931852f8cc8bc09bf01d2c3d95 (diff) | |
dba34d: pulled and merged latest changes from CWS dba34c
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/prj/build.lst | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/uno/ColumnControl.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/uno/ColumnControl.hxx | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/dbaccess/prj/build.lst b/dbaccess/prj/build.lst index 10227f111e60..ca2fa71856e7 100644 --- a/dbaccess/prj/build.lst +++ b/dbaccess/prj/build.lst @@ -1,4 +1,4 @@ -ba dbaccess : l10n BOOST:boost connectivity svx stoc qadevOOo xmlscript LIBXSLT:libxslt test NULL +ba dbaccess : L10N:l10n BOOST:boost connectivity svx stoc qadevOOo xmlscript LIBXSLT:libxslt test NULL ba dbaccess usr1 - all ba_mkout NULL ba dbaccess\inc nmake - all ba_inc NULL ba dbaccess\source\ui\inc nmake - all ba_uiinc ba_inc NULL 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); |