diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 18:07:33 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 18:07:33 +0000 |
| commit | 3e672ceed59e2d437056abed3a45f46b2fe25427 (patch) | |
| tree | 27d310b768c5b75d54b79aae9368645e192004ba | |
| parent | b518bdd40490dfc5dd0cce516241696f7d612076 (diff) | |
INTEGRATION: CWS sdwarningsbegone (1.4.34); FILE MERGED
2006/11/22 15:12:48 cl 1.4.34.2: RESYNC: (1.4-1.5); FILE MERGED
2006/11/22 12:42:24 cl 1.4.34.1: #i69285# warning free code changes for unxlngi6.pro
| -rw-r--r-- | sd/source/ui/view/ToolBarManager.cxx | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 2f3e164c91ca..8aa5493b1441 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ToolBarManager.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2006-11-01 18:05:01 $ + * last change: $Author: kz $ $Date: 2006-12-12 19:07:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -654,7 +654,7 @@ const ::rtl::OUString ToolBarManager::Implementation::msToolBarResourcePrefix( ToolBarManager::Implementation::Implementation ( ViewShellBase& rBase, sd::tools::EventMultiplexer& rMultiplexer, - PaneManager& rPaneManager, + PaneManager&, ViewShellManager& rViewShellManager, ToolBarManager& rToolBarManager) : maMutex(), @@ -1062,7 +1062,7 @@ ToolBarRules& ToolBarManager::Implementation::GetToolBarRules (void) -IMPL_LINK(ToolBarManager::Implementation,UpdateCallback,bool*,pValid) +IMPL_LINK(ToolBarManager::Implementation,UpdateCallback,bool*,EMPTYARG) { mnPendingUpdateCall = 0; if (mnLockCount == 0) @@ -1108,7 +1108,7 @@ IMPL_LINK(ToolBarManager::Implementation,EventMultiplexerCallback, -IMPL_LINK(ToolBarManager::Implementation, SetValidCallback,void*,pDummy) +IMPL_LINK(ToolBarManager::Implementation, SetValidCallback,void*,EMPTYARG) { mnPendingSetValidCall = 0; SetValid(true); @@ -1286,6 +1286,7 @@ void ToolBarRules::MainViewShellChanged (const ViewShell& rMainViewShell) case ::sd::ViewShell::ST_IMPRESS: case ::sd::ViewShell::ST_DRAW: case ::sd::ViewShell::ST_NOTES: + { const DrawViewShell* pDrawViewShell = dynamic_cast<const DrawViewShell*>(&rMainViewShell); if (pDrawViewShell != NULL) @@ -1294,6 +1295,9 @@ void ToolBarRules::MainViewShellChanged (const ViewShell& rMainViewShell) ToolBarManager::TBG_MASTER_MODE, ToolBarManager::msMasterViewToolBar); break; + } + default: + break; } } @@ -1333,6 +1337,8 @@ void ToolBarRules::SelectionHasChanged ( ToolBarManager::TBG_FUNCTION, ToolBarManager::msDrawingObjectToolBar); break; + default: + break; } break; } @@ -1575,8 +1581,8 @@ ToolBarShellList::ShellDescriptor::ShellDescriptor ( ToolBarShellList::ToolBarShellList (void) - : maCurrentList(), - maNewList() +: maNewList() +, maCurrentList() { } |