diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-01-19 12:02:55 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-01-19 12:02:55 +0000 |
| commit | 43bcadc677e5692df30c1cf69e5a2f8fe3c27072 (patch) | |
| tree | b9095f575703d0ba97876a20640f4cbc6fb672d4 /sd/source/ui/slidesorter/controller/SlsClipboard.cxx | |
| parent | 80e67f7a9c1822e5b557428918bb801dfa279994 (diff) | |
INTEGRATION: CWS impress78 (1.16.46); FILE MERGED
2005/12/08 10:49:17 af 1.16.46.1: #i58768# Disabled Cut for master pages.
Diffstat (limited to 'sd/source/ui/slidesorter/controller/SlsClipboard.cxx')
| -rw-r--r-- | sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index e939e2405fb9..3a1af905bfb3 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -4,9 +4,9 @@ * * $RCSfile: SlsClipboard.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: rt $ $Date: 2005-12-14 17:20:20 $ + * last change: $Author: obo $ $Date: 2006-01-19 13:02:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -112,18 +112,24 @@ void Clipboard::HandleSlotCall (SfxRequest& rRequest) switch (rRequest.GetSlot()) { case SID_CUT: - if(xFunc.is()) - xFunc->DoCut(); - else - DoCut(); + if (mrController.GetModel().GetEditMode() != EM_MASTERPAGE) + { + if(xFunc.is()) + xFunc->DoCut(); + else + DoCut(); + } rRequest.Done(); break; case SID_COPY: - if(xFunc.is()) - xFunc->DoCopy(); - else - DoCopy(); + if (mrController.GetModel().GetEditMode() != EM_MASTERPAGE) + { + if(xFunc.is()) + xFunc->DoCopy(); + else + DoCopy(); + } rRequest.Done(); break; |