diff options
author | Oliver Bolte <obo@openoffice.org> | 2005-01-28 15:26:56 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2005-01-28 15:26:56 +0000 |
commit | 9c21fb08430e02520e380f2b4cc082496be18a54 (patch) | |
tree | 281952de91e7d5be40e96155aee81621f7b4411b /sd/source/ui/view/sdwindow.cxx | |
parent | 70111e3c1f5900ae7bf7eeda9335431d984cde08 (diff) |
INTEGRATION: CWS impress20 (1.29.74); FILE MERGED
2004/12/17 11:11:36 bm 1.29.74.3: #i32645# Notify: if scroll command was not executed forward events to base class (which calls parents)
2004/12/10 15:16:44 af 1.29.74.2: Resolved merge problems.
2004/12/01 12:57:13 bm 1.29.74.1: #i32645# handle scroll whell via hierarchical Notify calls instead of ChildWindowListeners
Diffstat (limited to 'sd/source/ui/view/sdwindow.cxx')
-rw-r--r-- | sd/source/ui/view/sdwindow.cxx | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 552de3a34c66..01d638adb6ab 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdwindow.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: kz $ $Date: 2004-10-04 18:47:43 $ + * last change: $Author: obo $ $Date: 2005-01-28 16:26:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -408,6 +408,20 @@ void Window::Command(const CommandEvent& rCEvt) mpViewShell->Command(rCEvt, this); } +long Window::Notify( NotifyEvent& rNEvt ) +{ + long nResult = FALSE; + if ( mpViewShell ) + { + nResult = mpViewShell->Notify(rNEvt, this); + } + if( !nResult ) + ::Window::Notify( rNEvt ); + + return nResult; +} + + /************************************************************************* |* |* RequestHelp event |