diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 17:43:15 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 17:43:15 +0000 |
| commit | f79fa81c9b8c1527c2b4f63f74529f4c227cb0cb (patch) | |
| tree | 124d6afa70d89a058472488d514a3e5205cf1d5e /sd | |
| parent | 0b7a95daff804e187d3aab403c0bbae1e8d6ac8a (diff) | |
INTEGRATION: CWS sdwarningsbegone (1.15.36); FILE MERGED
2006/11/27 15:15:04 cl 1.15.36.3: #i69285# warning free code changes for sd project
2006/11/27 13:48:12 cl 1.15.36.2: #i69285# warning free code changes for sd project
2006/11/22 12:42:15 cl 1.15.36.1: #i69285# warning free code changes for unxlngi6.pro
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/toolpanel/TaskPaneViewShell.cxx | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx index 369d0c258943..8344356e7c68 100644 --- a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx +++ b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx @@ -4,9 +4,9 @@ * * $RCSfile: TaskPaneViewShell.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: obo $ $Date: 2006-09-16 19:15:05 $ + * last change: $Author: kz $ $Date: 2006-12-12 18:43:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -184,7 +184,7 @@ enum MenuId { MID_UNLOCK_TASK_PANEL = 1, MID_LOCK_TASK_PANEL = 2, MID_CUSTOMIZE = 3, - MID_FIRST_CONTROL = 4, + MID_FIRST_CONTROL = 4 }; /** This control is used for extracting the title string from the resource @@ -332,9 +332,9 @@ TaskPaneViewShell::TaskPaneViewShell ( SetPool (&GetDoc()->GetPool()); if (pFrameViewArgument != NULL) - pFrameView = pFrameViewArgument; + mpFrameView = pFrameViewArgument; else - pFrameView = new FrameView(GetDoc()); + mpFrameView = new FrameView(GetDoc()); GetFrameView()->Connect(); // Hide or delete unused controls that we have inherited from the @@ -390,8 +390,8 @@ void TaskPaneViewShell::ArrangeGUIElements (void) { ViewShell::ArrangeGUIElements(); - Point aOrigin (aViewPos); - Size aSize (aViewSize); + Point aOrigin (maViewPos); + Size aSize (maViewSize); if ( ! mbIsInitialized) { @@ -518,8 +518,12 @@ IMPL_LINK(TaskPaneViewShell, MenuSelectHandler, Menu*, pMenu) pFloat->GetPopupModeFlags() | FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE); } + + // warning free code changes: + // FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE is 0x10000, so cast to USHORT is 0 + // so why was this used anyway? pMenu->SetMenuFlags ( - pMenu->GetMenuFlags() | (USHORT)FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE); + pMenu->GetMenuFlags() /* | (USHORT)FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE */ ); // Add one entry for every tool panel element to individually make // them visible or hide them. @@ -573,7 +577,7 @@ SdPage* TaskPaneViewShell::getCurrentPage(void) const -void TaskPaneViewShell::Execute (SfxRequest& rRequest) +void TaskPaneViewShell::Execute (SfxRequest& ) { } |