mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS fwk29 (1.32.6); FILE MERGED

Browse Source 
2006/01/31 15:32:40 as 1.32.6.4: RESYNC: (1.33-1.34); FILE MERGED
solve merge conflicts
2006/01/10 10:46:16 as 1.32.6.3: #i59272# remove frame from desktop tree ALWAYS
2006/01/06 13:43:14 as 1.32.6.2: RESYNC: (1.32-1.33); FILE MERGED
2006/01/06 07:16:08 as 1.32.6.1: #i59272# views of DB are not part of the desktop tree any longer
This commit is contained in:
Rüdiger Timm
2006-02-07 09:19:11 +00:00
parent d0c5c160c0
commit 7aec971807
1 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
dbaccess/source/core/dataaccess/documentdefinition.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: documentdefinition.cxx,v $
*
* $Revision: 1.34 $
* $Revision: 1.35 $
*
* last change: $Author: kz $ $Date: 2006-01-03 16:14:52 $
* last change: $Author: rt $ $Date: 2006-02-07 10:19:11 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -576,7 +576,7 @@ void SAL_CALL ODocumentDefinition::disposing()
::osl::MutexGuard aGuard(m_aMutex);
closeObject();
::comphelper::disposeComponent(m_xListener);
m_xFrameLoader = NULL;
m_xDesktop = NULL;
}
// -----------------------------------------------------------------------------
IMPLEMENT_TYPEPROVIDER3(ODocumentDefinition,OContentHelper,OPropertyStateContainer,ODocumentDefinition_Base);
@@ -642,6 +642,16 @@ namespace
}
}
// -----------------------------------------------------------------------------
void ODocumentDefinition::impl_removeFrameFromDesktop_throw( const Reference< XFrame >& _rxFrame )
{
if ( !m_xDesktop.is() )
m_xDesktop.set( m_xORB->createInstance( SERVICE_FRAME_DESKTOP ), UNO_QUERY_THROW );
Reference< XFrames > xFrames( m_xDesktop->getFrames(), UNO_QUERY_THROW );
xFrames->remove( _rxFrame );
}
// -----------------------------------------------------------------------------
void ODocumentDefinition::impl_onActivateEmbeddedObject( bool _bOpenedInDesignMode )
{
@@ -651,51 +661,34 @@ void ODocumentDefinition::impl_onActivateEmbeddedObject( bool _bOpenedInDesignMo
Reference< XController > xController( xModel.is() ? xModel->getCurrentController() : Reference< XController >() );
if ( !xController.is() )
return;
Reference< XFrame > xFrame( xController->getFrame() );
if ( m_xListener.is() )
{
// simply raise the window to top
if ( xFrame.is() )
{
Reference< XTopWindow > xTopWindow( xFrame->getContainerWindow(), UNO_QUERY_THROW );
xTopWindow->toFront();
}
}
else
{
if ( !m_xListener.is() )
// it's the first time the embedded object has been activated
//
if ( !m_xFrameLoader.is() )
m_xFrameLoader.set( m_xORB->createInstance( SERVICE_FRAME_DESKTOP ), UNO_QUERY_THROW );
/*
// remove the frame from the desktop's frame collection because we need full control of it.
Reference< XFramesSupplier > xSup( m_xFrameLoader, UNO_QUERY_THROW );
Reference< XFrames > xFrames( xSup->getFrames(), UNO_QUERY_THROW );
xFrames->remove( xFrame );
*/
// create an OEmbedObjectHolder
m_xListener = new OEmbedObjectHolder(m_xEmbeddedObject,this);
// ensure that we ourself are kept alive as long as the embedded object's frame is
// opened
LifetimeCoupler::couple( *this, Reference< XComponent >( xFrame, UNO_QUERY_THROW ) );
Reference< XFrame > xFrame( xController->getFrame() );
// raise the window to top (especially necessary if this is not the first activation)
if ( xFrame.is() )
{
Reference< XTopWindow > xTopWindow( xFrame->getContainerWindow(), UNO_QUERY_THROW );
xTopWindow->toFront();
}
// ensure that we ourself are kept alive as long as the embedded object's frame is
// opened
LifetimeCoupler::couple( *this, Reference< XComponent >( xFrame, UNO_QUERY_THROW ) );
// init the edit view
if ( _bOpenedInDesignMode )
impl_initObjectEditView( xController );
// remove the frame from the desktop's frame collection because we need full control of it.
impl_removeFrameFromDesktop_throw( xFrame );
}
catch( const RuntimeException& e )
catch( const RuntimeException& )
{
#if OSL_DEBUG_LEVEL > 0
::rtl::OString sMessage( "ODocumentDefinition::impl_onActivateEmbeddedObject: caught an exception!\n" );
sMessage += "message:\n";
sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );
OSL_ENSURE( false, sMessage );
#else
e; // make compiler happy
#endif
DBG_UNHANDLED_EXCEPTION();
}
}