strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS mav19 (1.13.18); FILE MERGED

Browse source 
2006/01/17 10:14:07 mav 1.13.18.5: #i56586# use correct operation
2006/01/17 10:01:16 mav 1.13.18.4: #i56586# allow to identify the objects that need size after loading
2005/12/08 15:27:04 mav 1.13.18.3: #i52224# handle STAMPIT correctly
2005/11/17 18:17:03 mav 1.13.18.2: RESYNC: (1.13-1.14); FILE MERGED
2005/11/16 10:03:28 mav 1.13.18.1: #i52224# handle object size and resizing correctly
This commit is contained in:
Kurt Zenker 2006-02-01 18:06:01 +00:00
parent 5671cd1d0f
commit f6a5a045dc
1 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
embeddedobj/source/msole/oleembed.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: oleembed.cxx,v $
*
* $Revision: 1.15 $
* $Revision: 1.16 $
*
* last change: $Author: obo $ $Date: 2006-01-20 09:51:56 $
* last change: $Author: kz $ $Date: 2006-02-01 19:06:01 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -62,6 +62,10 @@
#ifndef _COM_SUN_STAR_EMBED_STATECHANGEINPROGRESSEXCEPTION_HPP_
#include <com/sun/star/embed/StateChangeInProgressException.hpp>
#endif
#ifndef _COM_SUN_STAR_EMBED_EMBEDMISC_HPP_
#include <com/sun/star/embed/EmbedMisc.hpp>
#endif
#ifndef _COM_SUN_STAR_IO_XSEEKABLE_HPP_
#include <com/sun/star/io/XSeekable.hpp>
@ -223,7 +227,7 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
{
aGuard.clear();
try {
m_pOleComponent->SetExtent( m_aCachedSize, m_nCachedAspect );
m_pOleComponent->SetExtent( m_aSizeToSet, m_nAspectToSet );
m_bHasSizeToSet = sal_False;
}
catch( uno::Exception& ) {}
@ -250,7 +254,7 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
{
aGuard.clear();
try {
m_pOleComponent->SetExtent( m_aCachedSize, m_nCachedAspect );
m_pOleComponent->SetExtent( m_aSizeToSet, m_nAspectToSet );
m_bHasSizeToSet = sal_False;
}
catch( uno::Exception& ) {}
@ -380,10 +384,27 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
if ( !m_pOleComponent )
throw uno::RuntimeException();
// ==== the STAMPIT related solution =============================
m_aVerbExecutionController.StartControlExecution();
// ===============================================================
m_pOleComponent->ExecuteVerb( nVerbID );
// ==== the STAMPIT related solution =============================
sal_Bool bModifiedOnExecution = m_aVerbExecutionController.EndControlExecution_WasModified();
// this workaround is implemented for STAMPIT object
// if object was modified during verb execution it is saved here
if ( bModifiedOnExecution && m_pOleComponent->IsDirty() )
SaveObject_Impl();
// ===============================================================
}
catch( uno::Exception& )
{
// ==== the STAMPIT related solution =============================
m_aVerbExecutionController.EndControlExecution_WasModified();
// ===============================================================
aGuard.clear();
StateChangeNotification_Impl( sal_False, nOldState, m_nObjectState );
throw;
@ -552,9 +573,11 @@ sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64 nAspect )
throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object must be in running state!\n" ),
uno::Reference< uno::XInterface >( reinterpret_cast< ::cppu::OWeakObject* >(this) ) );
sal_Int64 nResult = 0;
#ifdef WNT
if ( m_bGotStatus && m_nStatusAspect == nAspect )
return m_nStatus;
nResult = m_nStatus;
else if ( m_pOleComponent )
{
// OLE should allow to get status even in loaded state
@ -564,16 +587,12 @@ sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64 nAspect )
m_nStatus = m_pOleComponent->GetMiscStatus( nAspect );
m_nStatusAspect = nAspect;
m_bGotStatus = sal_True;
return m_nStatus;
nResult = m_nStatus;
}
else
#endif
{
return 0;
// TODO/LATER: not sure that returning of a default value is better
// throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Illegal call!\n" ),
// uno::Reference< uno::XInterface >( reinterpret_cast< ::cppu::OWeakObject* >(this) ) );
}
// this implementation needs size to be provided after object loading/creating to work in optimal way
return ( nResult | embed::EmbedMisc::EMBED_NEEDSSIZEONLOAD );
}
//----------------------------------------------