diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-09-02 07:15:38 +0200 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-09-02 07:15:38 +0200 |
| commit | 3c6b622a6cd10d937e9e5b17fd042a698bfbd00a (patch) | |
| tree | ac3edcb484f684d58fa549eeb970c38fb38b487e /dbaccess/source/ui/app/subcomponentmanager.cxx | |
| parent | dba33h: merge (diff) | |
| download | core-3c6b622a6cd10d937e9e5b17fd042a698bfbd00a.tar.gz core-3c6b622a6cd10d937e9e5b17fd042a698bfbd00a.zip | |
dba33i: #i113506# when loading a sub component which is already open, return the existing component instead of NULL
Diffstat (limited to 'dbaccess/source/ui/app/subcomponentmanager.cxx')
| -rw-r--r-- | dbaccess/source/ui/app/subcomponentmanager.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx index 56fbc30f46e7..9b56120c3ea0 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -529,7 +529,8 @@ namespace dbaui } //------------------------------------------------------------------------------------------------------------------ - bool SubComponentManager::activateSubFrame( const ::rtl::OUString& _rName, const sal_Int32 _nComponentType, const ElementOpenMode _eOpenMode ) const + bool SubComponentManager::activateSubFrame( const ::rtl::OUString& _rName, const sal_Int32 _nComponentType, + const ElementOpenMode _eOpenMode, Reference< XComponent >& o_rComponent ) const { ::osl::MutexGuard aGuard( m_pData->getMutex() ); @@ -546,6 +547,13 @@ namespace dbaui const Reference< XTopWindow > xTopWindow( xFrame->getContainerWindow(), UNO_QUERY_THROW ); xTopWindow->toFront(); + if ( pos->xModel.is() ) + o_rComponent = pos->xModel.get(); + else if ( pos->xController.is() ) + o_rComponent = pos->xController.get(); + else + o_rComponent = pos->xFrame.get(); + return true; } |