diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-25 11:25:09 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-25 11:25:09 +0000 |
| commit | f5f5f50156fad1fd6d611feddf9087b19693760d (patch) | |
| tree | e2d985c626bdc9c4fa89246c83df326461fe5dd1 /svx/source/form/fmview.cxx | |
| parent | 1a99b224dc6e3b6a7a981f2833cfff72bd023b16 (diff) | |
INTEGRATION: CWS dba30d (1.53.72); FILE MERGED
2008/05/28 13:54:44 fs 1.53.72.1: ResetForms removed during #i89229#
Diffstat (limited to 'svx/source/form/fmview.cxx')
| -rw-r--r-- | svx/source/form/fmview.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 50e7c9575bdf..326a6454968c 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fmview.cxx,v $ - * $Revision: 1.53 $ + * $Revision: 1.54 $ * * This file is part of OpenOffice.org. * @@ -170,12 +170,12 @@ void FmFormView::Init() //------------------------------------------------------------------------ FmFormView::~FmFormView() { - pImpl->notifyViewDying(); - pImpl->release(); - - // Bei der Shell abmelden if( pFormShell ) pFormShell->SetView( NULL ); + + pImpl->notifyViewDying(); + pImpl->release(); + pImpl = NULL; } //------------------------------------------------------------------------ @@ -379,8 +379,7 @@ SdrPageView* FmFormView::ShowSdrPage(SdrPage* pPage) else if (pFormShell && pFormShell->IsDesignMode()) { FmXFormShell* pFormShellImpl = pFormShell->GetImpl(); - Reference< ::com::sun::star::container::XIndexAccess > xForms(((FmFormPage*)pPage)->GetForms(), UNO_QUERY); - pFormShellImpl->ResetForms(xForms, sal_True); + pFormShellImpl->UpdateForms( sal_True ); // damit der Formular-Navigator auf den Seitenwechsel reagieren kann pFormShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(SID_FM_FMEXPLORER_CONTROL , sal_True, sal_False); |