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

INTEGRATION: CWS impress98 (1.18.56); FILE MERGED

Browse Source 
2006/06/26 23:33:34 cl 1.18.56.2: RESYNC: (1.18-1.19); FILE MERGED
2006/06/23 12:19:43 cl 1.18.56.1: #137421# check if pFrame has valid ViewShell
This commit is contained in:
Oliver Bolte
2006-07-10 10:29:23 +00:00
parent bb3a7fedd7
commit 8db97e4fcb
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sfx2/source/view/ipclient.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: ipclient.cxx,v $ * $RCSfile: ipclient.cxx,v $
* *
* $Revision: 1.19 $ * $Revision: 1.20 $
* *
* last change: $Author: hr $ $Date: 2006-06-19 22:38:08 $ * last change: $Author: obo $ $Date: 2006-07-10 11:29:23 $
* *
* 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.
@@ -973,9 +973,12 @@ SfxInPlaceClient* SfxInPlaceClient::GetClient( SfxObjectShell* pDoc, const com::
{ {
for ( SfxViewFrame* pFrame = SfxViewFrame::GetFirst(pDoc); pFrame; pFrame=SfxViewFrame::GetNext(*pFrame,pDoc) ) for ( SfxViewFrame* pFrame = SfxViewFrame::GetFirst(pDoc); pFrame; pFrame=SfxViewFrame::GetNext(*pFrame,pDoc) )
{ {
SfxInPlaceClient* pClient = pFrame->GetViewShell()->FindIPClient( xObject, NULL ); if( pFrame->GetViewShell() )
if ( pClient ) {
return pClient; SfxInPlaceClient* pClient = pFrame->GetViewShell()->FindIPClient( xObject, NULL );
if ( pClient )
return pClient;
}
} }
return NULL; return NULL;