diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:07:21 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:07:21 +0000 |
| commit | eba71f016ec33b039a08010b46ec184f25082b11 (patch) | |
| tree | fef5626d5ecd5633db8c88e873d325f6965690e0 /sd/source/ui/view | |
| parent | 51f699d58efcb1cdc23c42e5ff2d4c80459403ca (diff) | |
INTEGRATION: CWS presenterview (1.23.22); FILE MERGED
2008/02/26 09:03:56 af 1.23.22.5: RESYNC: (1.24-1.25); FILE MERGED
2007/07/11 09:11:09 af 1.23.22.4: RESYNC: (1.23-1.24); FILE MERGED
2007/07/10 14:37:27 af 1.23.22.3: #i18486# Converted several members of ViewShellBase to shared_ptrs.
2007/06/19 15:45:55 af 1.23.22.2: #i18486# Code cleanup.
2007/04/26 08:48:06 af 1.23.22.1: #i18486# Resolved resync problems.
Diffstat (limited to 'sd/source/ui/view')
| -rw-r--r-- | sd/source/ui/view/ViewShellImplementation.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index ef0d9b801fa7..028705d8d860 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.25 $ + * $Revision: 1.26 $ * - * last change: $Author: vg $ $Date: 2008-01-28 14:57:02 $ + * last change: $Author: kz $ $Date: 2008-04-03 15:07:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -71,12 +71,7 @@ #include <basic/sbstar.hxx> #include "undo/undoobjects.hxx" -#ifndef _COM_SUN_STAR_DRAWING_FRAMEWORK_XCONTROLLERMANAGER_HPP_ #include <com/sun/star/drawing/framework/XControllerManager.hpp> -#endif -#ifndef _COM_SUN_STAR_DRAWING_FRAMEWORK_XVIEWCONTROLLER_HPP_ -#include <com/sun/star/drawing/framework/XViewController.hpp> -#endif using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; @@ -376,7 +371,6 @@ sal_uInt16 ViewShell::Implementation::GetViewId (void) case ViewShell::ST_OUTLINE: return OUTLINE_FACTORY_ID; - case ViewShell::ST_SLIDE: case ViewShell::ST_SLIDE_SORTER: return SLIDE_SORTER_FACTORY_ID; |