diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-28 05:54:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-28 05:54:46 +0000 |
| commit | 3e85651b8d86f4bf06e782e635a73567e0744f25 (patch) | |
| tree | 49ecba6986fe8e3894652de8cc7a14a3e42c935d /svx | |
| parent | 512c546b150324e7cad6175908610ae2ab6ee48c (diff) | |
INTEGRATION: CWS impress153_DEV300 (1.79.42); FILE MERGED
2008/08/20 18:58:27 fs 1.79.42.1: #i92864# changed signature of view(Dea/A)ctivated
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmshell.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index a42f34e0ab13..cc325a2122a6 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fmshell.cxx,v $ - * $Revision: 1.80 $ + * $Revision: 1.81 $ * * This file is part of OpenOffice.org. * @@ -343,7 +343,7 @@ TYPEINIT1(FmFormShell,SfxShell) //------------------------------------------------------------------------ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView ) :SfxShell(_pParent) - ,m_pImpl(new FmXFormShell(this, _pParent->GetViewFrame())) + ,m_pImpl(new FmXFormShell(*this, _pParent->GetViewFrame())) ,m_pFormView( pView ) ,m_pFormModel( NULL ) ,m_pParentShell(_pParent) @@ -1324,7 +1324,7 @@ void FmFormShell::SetView( FmFormView* _pView ) if ( m_pFormView ) { if ( IsActive() ) - GetImpl()->viewDeactivated( m_pFormView ); + GetImpl()->viewDeactivated( *m_pFormView ); m_pFormView->SetFormShell( NULL ); m_pFormView = NULL; @@ -1345,7 +1345,7 @@ void FmFormShell::SetView( FmFormView* _pView ) // to the former. // FS - 30.06.99 - 67308 if ( IsActive() ) - GetImpl()->viewActivated( m_pFormView ); + GetImpl()->viewActivated( *m_pFormView ); } //------------------------------------------------------------------------ @@ -1379,7 +1379,7 @@ void FmFormShell::Activate(sal_Bool bMDI) SfxShell::Activate(bMDI); if ( m_pFormView ) - GetImpl()->viewActivated( m_pFormView, sal_True ); + GetImpl()->viewActivated( *m_pFormView, sal_True ); } //------------------------------------------------------------------------ @@ -1388,7 +1388,7 @@ void FmFormShell::Deactivate(sal_Bool bMDI) SfxShell::Deactivate(bMDI); if ( m_pFormView ) - GetImpl()->viewDeactivated( m_pFormView, sal_False ); + GetImpl()->viewDeactivated( *m_pFormView, sal_False ); } //------------------------------------------------------------------------ |