diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 13:42:02 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 13:42:02 +0000 |
commit | 93dacb9c626cc2b3295c0857b6bfd737ea20b574 (patch) | |
tree | aa84bc7cf030b7677cf0ae5340143a990eb22800 /sd/source/ui/view/drviews3.cxx | |
parent | INTEGRATION: CWS aw024 (1.40.84); FILE MERGED (diff) | |
download | core-93dacb9c626cc2b3295c0857b6bfd737ea20b574.tar.gz core-93dacb9c626cc2b3295c0857b6bfd737ea20b574.zip |
INTEGRATION: CWS aw024 (1.32.56); FILE MERGED
2006/09/21 23:45:57 aw 1.32.56.8: RESYNC: (1.37-1.38); FILE MERGED
2006/08/03 16:39:48 aw 1.32.56.7: RESYNC: (1.36-1.37); FILE MERGED
2006/05/12 20:55:51 aw 1.32.56.6: RESYNC: (1.35-1.36); FILE MERGED
2006/01/26 20:19:41 aw 1.32.56.5: RESYNC: (1.34-1.35); FILE MERGED
2005/11/18 14:47:31 aw 1.32.56.4: RESYNC: (1.33-1.34); FILE MERGED
2005/09/17 14:10:44 aw 1.32.56.3: RESYNC: (1.32-1.33); FILE MERGED
2005/05/26 11:24:45 aw 1.32.56.2: #i39531#
2005/05/19 12:11:40 aw 1.32.56.1: #i39529#
Diffstat (limited to 'sd/source/ui/view/drviews3.cxx')
-rw-r--r-- | sd/source/ui/view/drviews3.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index a58beab12156..26f96492a5c2 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -4,9 +4,9 @@ * * $RCSfile: drviews3.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: obo $ $Date: 2006-09-16 19:36:39 $ + * last change: $Author: ihi $ $Date: 2006-11-14 14:42:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -210,7 +210,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) default: if ( pDrView->IsTextEdit() ) { - pDrView->EndTextEdit(); + pDrView->SdrEndTextEdit(); } } @@ -828,9 +828,9 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) { Point aOrigin; - if (pDrView->GetPageViewPvNum(0)) + if (pDrView->GetSdrPageView()) { - aOrigin = pDrView->GetPageViewPvNum(0)->GetPageOrigin(); + aOrigin = pDrView->GetSdrPageView()->GetPageOrigin(); } Size aViewSize = GetActiveWindow()->GetViewSize(); @@ -1046,7 +1046,7 @@ void DrawViewShell::GetSnapItemState( SfxItemSet &rSet ) void DrawViewShell::AddWindow (::sd::Window* pWin) { - pDrView->AddWin(pWin); + pDrView->AddWindowToPaintView(pWin); } /************************************************************************* @@ -1057,7 +1057,7 @@ void DrawViewShell::AddWindow (::sd::Window* pWin) void DrawViewShell::RemoveWindow(::sd::Window* pWin) { - pDrView->DelWin(pWin); + pDrView->DeleteWindowFromPaintView(pWin); } } // end of namespace sd |