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

INTEGRATION: CWS fwk46 (1.4.6); FILE MERGED

Browse Source 
2006/09/14 12:30:40 mav 1.4.6.3: #i64376# fix UI-deactivation call
2006/08/21 06:37:52 mav 1.4.6.2: #i64376# let the replacement image be updated
2006/08/18 12:33:20 mav 1.4.6.1: #i64905# fix reentrance problem
This commit is contained in:
Kurt Zenker
2006-10-06 09:38:09 +00:00
parent 374911c677
commit a2e3cc6267
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
embedserv/source/embed/ed_iinplace.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: ed_iinplace.cxx,v $ * $RCSfile: ed_iinplace.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: hr $ $Date: 2006-06-20 05:39:52 $ * last change: $Author: kz $ $Date: 2006-10-06 10:38:09 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -58,13 +58,36 @@ STDMETHODIMP EmbedDocument_Impl::ContextSensitiveHelp(BOOL)
STDMETHODIMP EmbedDocument_Impl::InPlaceDeactivate(void) STDMETHODIMP EmbedDocument_Impl::InPlaceDeactivate(void)
{ {
// no locking is used since the OLE must use the same thread always
if ( m_bIsInVerbHandling )
return E_UNEXPECTED;
BooleanGuard_Impl aGuard( m_bIsInVerbHandling );
m_pDocHolder->InPlaceDeactivate(); m_pDocHolder->InPlaceDeactivate();
// the inplace object needs the notification after the storing ( on deactivating )
// if it happens before the storing the replacement might not be updated
notify();
return NOERROR; return NOERROR;
} }
STDMETHODIMP EmbedDocument_Impl::UIDeactivate(void) STDMETHODIMP EmbedDocument_Impl::UIDeactivate(void)
{ {
// no locking is used since the OLE must use the same thread always
if ( m_bIsInVerbHandling )
return E_UNEXPECTED;
BooleanGuard_Impl aGuard( m_bIsInVerbHandling );
m_pDocHolder->UIDeactivate(); m_pDocHolder->UIDeactivate();
// the inplace object needs the notification after the storing ( on deactivating )
// if it happens before the storing the replacement might not be updated
notify();
return NOERROR; return NOERROR;
} }