diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-25 20:54:56 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-25 20:54:56 +0100 |
| commit | dbbd1aae55766ffd0fb5fe14f712ece7ab691014 (patch) | |
| tree | 1d5dcaa38da97d4585caf63045b8396aab4577e6 /forms/source/solar/component | |
| parent | 143e8326931e0751caf3428eec0d8542229dd063 (diff) | |
| parent | acb0bbd76e63c13e2601f71bee219a89debc8457 (diff) | |
gridsort: pulled and merged DEV300m98
Diffstat (limited to 'forms/source/solar/component')
| -rw-r--r-- | forms/source/solar/component/navbarcontrol.cxx | 4 | ||||
| -rw-r--r-- | forms/source/solar/component/navbarcontrol.hxx | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index d31727cff125..4e9b4c494fc4 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -106,7 +106,7 @@ namespace frm DBG_NAME( ONavigationBarControl ) //------------------------------------------------------------------ ONavigationBarControl::ONavigationBarControl( const Reference< XMultiServiceFactory >& _rxORB ) - :m_xORB( _rxORB ) + :UnoControl( _rxORB ) { DBG_CTOR( ONavigationBarControl, NULL ); } @@ -181,7 +181,7 @@ namespace frm } // create the peer - ONavigationBarPeer* pPeer = ONavigationBarPeer::Create( m_xORB, pParentWin, getModel() ); + ONavigationBarPeer* pPeer = ONavigationBarPeer::Create( maContext.getLegacyServiceFactory(), pParentWin, getModel() ); DBG_ASSERT( pPeer, "ONavigationBarControl::createPeer: invalid peer returned!" ); if ( pPeer ) // by definition, the returned component is aquired once diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx index 0040d5d4e6ad..877aa55aaba2 100644 --- a/forms/source/solar/component/navbarcontrol.hxx +++ b/forms/source/solar/component/navbarcontrol.hxx @@ -56,10 +56,6 @@ namespace frm :public UnoControl ,public ONavigationBarControl_Base { - private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - m_xORB; - public: ONavigationBarControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB |