diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 17:23:00 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 17:23:00 +0000 |
| commit | 3ee9bb692a34efa16cf4c43886f04e3843da01e5 (patch) | |
| tree | 73346bd2f15f3249613f6e7c3b9609fcd5c5462b /sd/source/ui/slidesorter/controller/SlsClipboard.cxx | |
| parent | ccdded5b4046c613bd52fffc5ff13f91ffe8fde3 (diff) | |
INTEGRATION: CWS sdwarningsbegone (1.20.34); FILE MERGED
2006/11/22 15:09:52 cl 1.20.34.2: RESYNC: (1.20-1.22); FILE MERGED
2006/11/22 12:42:11 cl 1.20.34.1: #i69285# warning free code changes for unxlngi6.pro
Diffstat (limited to 'sd/source/ui/slidesorter/controller/SlsClipboard.cxx')
| -rw-r--r-- | sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 90397f7279c3..9077f71314ba 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.22 $ + * $Revision: 1.23 $ * - * last change: $Author: ihi $ $Date: 2006-11-14 14:35:46 $ + * last change: $Author: kz $ $Date: 2006-12-12 18:23:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -183,7 +183,7 @@ void Clipboard::DoCut (::Window* pWindow) -void Clipboard::DoDelete (::Window* pWindow) +void Clipboard::DoDelete (::Window* ) { if (mrController.GetModel().GetPageCount() > 1) { @@ -364,7 +364,6 @@ void Clipboard::CreateSlideTransferable ( bool bDrag) { List aBookmarkList; - SdPage* pPage = NULL; // Insert all selected pages into a bookmark list and remember them in // maPagesToRemove for possible later removal. @@ -434,7 +433,7 @@ void Clipboard::CreateSlideTransferable ( void Clipboard::StartDrag ( - const Point& rDragPoint, + const Point&, ::Window* pWindow) { maPagesToRemove.clear(); @@ -509,7 +508,6 @@ sal_Int8 Clipboard::AcceptDrop ( { case DT_PAGE: { - const SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag; // Accept a drop. nResult = rEvent.mnAction; @@ -535,6 +533,8 @@ sal_Int8 Clipboard::AcceptDrop ( nPage, nLayer); break; + default: + break; } return nResult; @@ -620,6 +620,8 @@ sal_Int8 Clipboard::ExecuteDrop ( nPage, nLayer); break; + default: + break; } return nResult; @@ -628,7 +630,7 @@ sal_Int8 Clipboard::ExecuteDrop ( -USHORT Clipboard::DetermineInsertPosition (const SdTransferable& rTransferable) +USHORT Clipboard::DetermineInsertPosition (const SdTransferable& ) { USHORT nInsertPosition = SDRPAGE_NOTFOUND; |