diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-12-14 16:27:02 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-12-14 16:27:02 +0000 |
| commit | 4446e63b71112be0b22ddb70cc65354d5131d06c (patch) | |
| tree | a1cd65ed157e350df6896ea5a7358e48ee0b93c3 /sd/source/ui/view/drviews3.cxx | |
| parent | INTEGRATION: CWS impressfunctions (1.41.38); FILE MERGED (diff) | |
| download | core-4446e63b71112be0b22ddb70cc65354d5131d06c.tar.gz core-4446e63b71112be0b22ddb70cc65354d5131d06c.zip | |
INTEGRATION: CWS impressfunctions (1.34.12); FILE MERGED
2005/10/28 10:58:26 cl 1.34.12.1: #125341# reworked FuPoor classes to use refcounting
Diffstat (limited to 'sd/source/ui/view/drviews3.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews3.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 85162a092339..ff6656c964b5 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.34 $ + * $Revision: 1.35 $ * - * last change: $Author: obo $ $Date: 2005-10-11 08:19:27 $ + * last change: $Author: rt $ $Date: 2005-12-14 17:27:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -187,8 +187,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) { // waehrend einer Diashow wird nichts ausser dem Seitenwechsel und dem // Sprung zur Bookmark ausgefuehrt! - if (pFuActual && - pFuActual->GetSlotID() == SID_PRESENTATION && + if( HasCurrentFunction(SID_PRESENTATION) && rReq.GetSlot() != SID_SWITCHPAGE && rReq.GetSlot() != SID_JUMPTOMARK) return; @@ -273,7 +272,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) SwitchPage(nSelectedPage); - if (pFuActual && pFuActual->GetSlotID() == SID_BEZIER_EDIT) + if(HasCurrentFunction(SID_BEZIER_EDIT)) GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); Invalidate(); @@ -603,8 +602,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) void DrawViewShell::ExecRuler(SfxRequest& rReq) { // waehrend einer Diashow wird nichts ausgefuehrt! - if (pFuActual && - pFuActual->GetSlotID() == SID_PRESENTATION) + if(HasCurrentFunction(SID_PRESENTATION)) return; CheckLineTo (rReq); @@ -979,8 +977,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) void DrawViewShell::ExecStatusBar(SfxRequest& rReq) { // waehrend einer Diashow wird nichts ausgefuehrt! - if (pFuActual && - pFuActual->GetSlotID() == SID_PRESENTATION) + if(HasCurrentFunction(SID_PRESENTATION)) return; CheckLineTo (rReq); |