diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
| commit | 2ee0a0a80684cc334f0fe3fa4fdb4ad444fdf84e (patch) | |
| tree | 717337deed3efe8e67e1901fb7122fb1a2ed5f83 /sd/source/ui/slideshow/slideshow.cxx | |
| parent | ea73702eb1b6a662c430474e06fbe33c1200347c (diff) | |
| parent | 2b800723513199616bb04c6bb377b685c4bde218 (diff) | |
autorecovery: merged changes from m74. Still need to find out how to re-do two patches (to module_hidden_ooo.scp and file_ooo.scp in scp2/source/ooo) which do not apply anymore.
Diffstat (limited to 'sd/source/ui/slideshow/slideshow.cxx')
| -rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 1abcfc960a53..c951f68d9b74 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: slideshow.cxx,v $ - * $Revision: 1.14 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -35,6 +32,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/container/XIndexAccess.hpp> +#include <comphelper/serviceinfohelper.hxx> #include <cppuhelper/bootstrap.hxx> @@ -43,7 +41,7 @@ #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> - +#include <svx/svdpool.hxx> #include <svl/itemprop.hxx> #include <sfx2/viewfrm.hxx> @@ -150,7 +148,7 @@ const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() SlideShow::SlideShow( SdDrawDocument* pDoc ) : SlideshowBase( m_aMutex ) -, maPropSet(ImplGetPresentationPropertyMap()) +, maPropSet(ImplGetPresentationPropertyMap(), SdrObject::GetGlobalDrawObjectItemPool()) , mbIsInStartup(false) , mpDoc( pDoc ) , mpCurrentViewShellBase( 0 ) @@ -277,7 +275,7 @@ OUString SAL_CALL SlideShow::getImplementationName( ) throw(RuntimeException) sal_Bool SAL_CALL SlideShow::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames( ) ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames( ) ); } // -------------------------------------------------------------------- |