diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 12:25:01 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 12:25:01 +0000 |
| commit | a9e9cd9783906c10660a934345c31682d191f8c2 (patch) | |
| tree | 91239ef052349ea5f495d596a746e849a7270a69 /svx/source/form | |
| parent | 3ceaf31bc3d2b765272e65c32fb181e15c0e3f01 (diff) | |
INTEGRATION: CWS aw024 (1.61.34); FILE MERGED
2006/09/21 18:57:05 aw 1.61.34.8: RESYNC: (1.67-1.68); FILE MERGED
2006/08/03 15:19:38 aw 1.61.34.7: RESYNC: (1.66-1.67); FILE MERGED
2006/07/04 12:45:37 aw 1.61.34.6: RESYNC: (1.65-1.66); FILE MERGED
2005/11/18 16:53:32 aw 1.61.34.5: RESYNC: (1.64-1.65); FILE MERGED
2005/09/18 03:54:19 aw 1.61.34.4: RESYNC: (1.63-1.64); FILE MERGED
2005/07/22 10:50:19 aw 1.61.34.3: RESYNC: (1.61-1.63); FILE MERGED
2005/05/26 11:27:59 aw 1.61.34.2: #i39531#
2005/05/19 12:31:17 aw 1.61.34.1: #i39529#
Diffstat (limited to 'svx/source/form')
| -rw-r--r-- | svx/source/form/fmshell.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index c03265a3cf25..e7646f41ddf4 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fmshell.cxx,v $ * - * $Revision: 1.68 $ + * $Revision: 1.69 $ * - * last change: $Author: obo $ $Date: 2006-09-17 05:09:08 $ + * last change: $Author: ihi $ $Date: 2006-11-14 13:25:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -555,10 +555,10 @@ sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing) if (GetImpl()->HasAnyPendingCursorAction()) GetImpl()->CancelAnyPendingCursorAction(); - SdrPageView* pCurPageView = m_pFormView->GetPageViewPvNum(0); + SdrPageView* pCurPageView = m_pFormView->GetSdrPageView(); // sal_uInt16 nPos = pCurPageView ? pCurPageView->GetWinList().Find((OutputDevice*)m_pFormView->GetActualOutDev()) : SDRPAGEVIEWWIN_NOTFOUND; - SdrPageViewWindow* pWindow = pCurPageView ? pCurPageView->FindWindow(*((OutputDevice*)m_pFormView->GetActualOutDev())) : 0L; + SdrPageWindow* pWindow = pCurPageView ? pCurPageView->FindPageWindow(*((OutputDevice*)m_pFormView->GetActualOutDev())) : 0L; if(pWindow) { @@ -1238,7 +1238,7 @@ void FmFormShell::GetState(SfxItemSet &rSet) if (m_pFormView) { // Ist der ::com::sun::star::drawing::Layer gelocked, so mssen die Slots disabled werden. #36897 - SdrPageView* pPV = m_pFormView->GetPageViewPvNum(0); + SdrPageView* pPV = m_pFormView->GetSdrPageView(); if (pPV != NULL) bLayerLocked = pPV->IsLayerLocked(m_pFormView->GetActiveLayer()); } @@ -1543,8 +1543,8 @@ void FmFormShell::GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich) FmFormPage* FmFormShell::GetCurPage() const { FmFormPage* pP = NULL; - if (m_pFormView && m_pFormView->GetPageViewPvNum(0)) - pP = PTR_CAST(FmFormPage,m_pFormView->GetPageViewPvNum(0)->GetPage()); + if (m_pFormView && m_pFormView->GetSdrPageView()) + pP = PTR_CAST(FmFormPage,m_pFormView->GetSdrPageView()->GetPage()); return pP; } |