diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 18:09:04 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 18:09:04 +0000 |
| commit | a1ae2fae02659a0afad4ec5eb15a261515d7eee3 (patch) | |
| tree | 42b844a11872e5243f10e975430d32f5bceaa6ae | |
| parent | 411ef4349436c40a7278f4b2a1e05e785777a413 (diff) | |
INTEGRATION: CWS sdwarningsbegone (1.20.36); FILE MERGED
2006/11/22 15:13:09 cl 1.20.36.2: RESYNC: (1.20-1.21); FILE MERGED
2006/11/22 12:42:25 cl 1.20.36.1: #i69285# warning free code changes for unxlngi6.pro
| -rw-r--r-- | sd/source/ui/view/ViewShellImplementation.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index cdafe8cd7695..5f4e94a619bd 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ViewShellImplementation.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: hr $ $Date: 2006-10-24 13:37:42 $ + * last change: $Author: kz $ $Date: 2006-12-12 19:09:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,7 +42,6 @@ #include "sdresid.hxx" #include "glob.hrc" #include "app.hrc" -#include "new_foil.hrc" #include "strings.hrc" #include "strings.hrc" #include "helpids.h" @@ -116,9 +115,9 @@ ViewShell::Implementation::Implementation (ViewShell& rViewShell) mbIsMainViewShell(false), mbIsInitialized(false), mbArrangeActive(false), + mpSubShellFactory(), mpUpdateLockForMouse(), - mrViewShell(rViewShell), - mpSubShellFactory() + mrViewShell(rViewShell) { } @@ -161,9 +160,6 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( AutoLayout aNewAutoLayout; - // #95981# - AutoLayout aOldAutoLayout; - BOOL bBVisible; BOOL bBObjsVisible; const SfxItemSet* pArgs = rRequest.GetArgs(); @@ -418,7 +414,7 @@ ViewShell::Implementation::ToolBarManagerLock::ToolBarManagerLock (ToolBarManage -IMPL_LINK(ViewShell::Implementation::ToolBarManagerLock,TimeoutCallback,Timer*,pTimer) +IMPL_LINK(ViewShell::Implementation::ToolBarManagerLock,TimeoutCallback,Timer*,EMPTYARG) { // If possible then release the lock now. Otherwise start the timer // and try again later. |