diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 13:47:55 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 13:47:55 +0000 |
| commit | 5e8a6a1e979b05c32950b6784175d5580aae0e67 (patch) | |
| tree | 2e5f1e36fc10c0d9a1175011727daa72852798dd /sd/source/ui/view/viewshel.cxx | |
| parent | 581947bff12a6f39d0427a4d5e4812b16efb0e4c (diff) | |
INTEGRATION: CWS aw024 (1.56.4); FILE MERGED
2006/11/10 05:12:46 aw 1.56.4.6: RESYNC: (1.59-1.60); FILE MERGED
2006/09/21 23:51:19 aw 1.56.4.5: RESYNC: (1.58-1.59); FILE MERGED
2006/08/03 16:42:01 aw 1.56.4.4: RESYNC: (1.57-1.58); FILE MERGED
2006/07/07 16:04:57 aw 1.56.4.3: adaptions after resync SRC680m171->SRC680m174
2006/05/12 20:59:04 aw 1.56.4.2: RESYNC: (1.56-1.57); FILE MERGED
2006/02/02 14:11:36 aw 1.56.4.1: adaption to m154 after resync
Diffstat (limited to 'sd/source/ui/view/viewshel.cxx')
| -rw-r--r-- | sd/source/ui/view/viewshel.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index f3660c16cf04..ad013a40305f 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -4,9 +4,9 @@ * * $RCSfile: viewshel.cxx,v $ * - * $Revision: 1.60 $ + * $Revision: 1.61 $ * - * last change: $Author: vg $ $Date: 2006-11-01 18:05:37 $ + * last change: $Author: ihi $ $Date: 2006-11-14 14:47:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -389,7 +389,7 @@ void ViewShell::Exit (void) sd::View* pView = GetView(); if (pView!=NULL && pView->IsTextEdit()) { - pView->EndTextEdit(); + pView->SdrEndTextEdit(); pView->UnmarkAll(); } @@ -452,7 +452,7 @@ void ViewShell::Activate(BOOL bIsMDIActivate) if (pView) { - pView->ShowMarkHdl(NULL); + pView->ShowMarkHdl(); } } @@ -516,7 +516,7 @@ void ViewShell::Deactivate(BOOL bIsMDIActivate) if (pView) { - pView->HideMarkHdl(NULL); + pView->HideMarkHdl(); } } |