diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 14:59:57 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 14:59:57 +0000 |
| commit | 66c38f7a970c046dd3edec03f71f84462cbd97e4 (patch) | |
| tree | defc809524abf00c655143d964879363db15146a | |
| parent | 9f2bc692bbd0c4dfcb9778b160e1dbd7bf9333db (diff) | |
INTEGRATION: CWS sb59 (1.67.58); FILE MERGED
2006/08/16 09:31:27 sb 1.67.58.1: #i67487# Made code warning-free (wntmsci10).
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 15be95f9ef29..e1c6cc5afcb2 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -4,9 +4,9 @@ * * $RCSfile: viewsh.cxx,v $ * - * $Revision: 1.68 $ + * $Revision: 1.69 $ * - * last change: $Author: obo $ $Date: 2006-09-17 16:51:52 $ + * last change: $Author: obo $ $Date: 2006-10-12 15:59:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -851,9 +851,7 @@ SfxViewShell::SfxViewShell : SfxShell(this) ,pImp( new SfxViewShell_Impl ) -#if !SFX_VIEWSH_INCLUDES_CLIENTSH_HXX ,pIPClientList( 0 ) -#endif ,pFrame(pViewFrame) ,pSubShell(0) ,pWindow(0) @@ -871,7 +869,7 @@ SfxViewShell::SfxViewShell // SFX_CREATE_MODE_EMBEDDED==pFrame->GetObjectShell()->GetCreateMode() && // SFX_VIEW_OBJECTSIZE_EMBEDDED == (nFlags & SFX_VIEW_OBJECTSIZE_EMBEDDED); pImp->bCanPrint = SFX_VIEW_CAN_PRINT == (nFlags & SFX_VIEW_CAN_PRINT); - pImp->bFrameSetImpl = nFlags & SFX_VIEW_IMPLEMENTED_AS_FRAMESET; + pImp->bFrameSetImpl = (nFlags & SFX_VIEW_IMPLEMENTED_AS_FRAMESET) != 0; pImp->bHasPrintOptions = SFX_VIEW_HAS_PRINTOPTIONS == (nFlags & SFX_VIEW_HAS_PRINTOPTIONS); pImp->bPlugInsActive = TRUE; @@ -1626,10 +1624,11 @@ void Change( Menu* pMenu, SfxViewShell* pView ) { if ( aCmd.CompareToAscii(".uno:", 5) == 0 ) { - SfxShell *pShell=0; - USHORT nIdx; - for (nIdx=0; (pShell=pDisp->GetShell(nIdx)); nIdx++) + for (USHORT nIdx=0;;) { + SfxShell *pShell=pDisp->GetShell(nIdx++); + if (pShell == NULL) + break; const SfxInterface *pIFace = pShell->GetInterface(); const SfxSlot* pSlot = pIFace->GetSlot( aCmd ); if ( pSlot ) |