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

INTEGRATION: CWS fwk88 (1.22.4); FILE MERGED

Browse Source 
2008/05/27 15:30:34 mav 1.22.4.1: #i86367# integrate the patch
This commit is contained in:
Rüdiger Timm 2008-06-20 06:08:04 +00:00
parent b883ed6c7c
commit 734cb6d07c
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
embeddedobj/source/msole/oleembed.cxx
View File

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: oleembed.cxx,v $ * $RCSfile: oleembed.cxx,v $
* $Revision: 1.22 $ * $Revision: 1.23 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@ -60,10 +60,10 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
#ifdef WNT
//---------------------------------------------- //----------------------------------------------
void OleEmbeddedObject::SwitchComponentToRunningState_Impl() void OleEmbeddedObject::SwitchComponentToRunningState_Impl()
{ {
#ifdef WNT
if ( m_pOleComponent ) if ( m_pOleComponent )
{ {
try try
@ -82,7 +82,6 @@ void OleEmbeddedObject::SwitchComponentToRunningState_Impl()
} }
} }
else else
#endif
{ {
throw embed::UnreachableStateException(); throw embed::UnreachableStateException();
} }
@ -119,7 +118,7 @@ uno::Sequence< sal_Int32 > OleEmbeddedObject::GetIntermediateVerbsSequence_Impl(
return uno::Sequence< sal_Int32 >(); return uno::Sequence< sal_Int32 >();
} }
#endif
//---------------------------------------------- //----------------------------------------------
void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState ) void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
throw ( embed::UnreachableStateException, throw ( embed::UnreachableStateException,
@ -202,7 +201,6 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
StateChangeNotification_Impl( sal_False, nOldState, m_nObjectState ); StateChangeNotification_Impl( sal_False, nOldState, m_nObjectState );
aGuard.reset(); aGuard.reset();
#ifdef WNT
if ( m_pOleComponent && m_bHasSizeToSet ) if ( m_pOleComponent && m_bHasSizeToSet )
{ {
aGuard.clear(); aGuard.clear();
@ -213,7 +211,6 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
catch( uno::Exception& ) {} catch( uno::Exception& ) {}
aGuard.reset(); aGuard.reset();
} }
#endif
if ( m_nObjectState == nNewState ) if ( m_nObjectState == nNewState )
return; return;
@ -228,7 +225,6 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
m_pOleComponent->ExecuteVerb( embed::EmbedVerbs::MS_OLEVERB_OPEN ); m_pOleComponent->ExecuteVerb( embed::EmbedVerbs::MS_OLEVERB_OPEN );
aGuard.reset(); aGuard.reset();
#ifdef WNT
// some objects do not allow to set the size even in running state // some objects do not allow to set the size even in running state
if ( m_pOleComponent && m_bHasSizeToSet ) if ( m_pOleComponent && m_bHasSizeToSet )
{ {
@ -240,7 +236,6 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
catch( uno::Exception& ) {} catch( uno::Exception& ) {}
aGuard.reset(); aGuard.reset();
} }
#endif
m_nObjectState = nNewState; m_nObjectState = nNewState;
} }