-------- Original Message --------
Subject: allcvs Digest 21 Apr 2004 22:54:55 -0000 Issue 18687
Date: 21 Apr 2004 22:54:55 -0000
From: allcvs-digest-help@sc-solload1.sp.collab.net
Reply-To: allfeatures@sc-solload1.sp.collab.net
To: allcvs@sc-solload1.sp.collab.net
allcvs Digest 21 Apr 2004 22:54:55 -0000 Issue 18687
Topics (messages 235618 through 235619):
[graphics-cvs] CVS update [cws_src680_presentationengine01]:
/graphics/sd/source/ui/view/
235618 by: thb.openoffice.org
[look-cvs] CVS update: /look/www/overrides/templates/
235619 by: guy.sc-solload1.sp.collab.net
Administrivia:
To subscribe to the digest, e-mail:
allcvs-digest-subscribe@sc-solload1.sp.collab.net
To unsubscribe from the digest, e-mail:
allcvs-digest-unsubscribe@sc-solload1.sp.collab.net
To post to the list, e-mail:
allcvs@sc-solload1.sp.collab.net
----------------------------------------------------------------------
-----
Reply-To: dev@graphics.openoffice.org
Date: 12 Apr 2004 15:17:07 -0000
Message-ID: <20040412151707.6989.qmail@openoffice.org>
From: thb@openoffice.org
To: cvs@graphics.openoffice.org
Subject: [graphics-cvs] CVS update [cws_src680_presentationengine01]:
/graphics/sd/source/ui/view/
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
Tag: cws_src680_presentationengine01
User: thb
Date: 04/04/12 08:17:07
Modified:
/graphics/sd/source/ui/view/
presvish.cxx, makefile.mk, drviewse.cxx
Log:
#110496# Adaptions after canvas01 merge
File Changes:
Directory: /graphics/sd/source/ui/view/
=======================================
File [changed]: presvish.cxx
Url:
http://graphics.openoffice.org/source/browse/graphics/sd/source/ui/view/
presvish.cxx?r1=1.15&r2=1.15.10.1
Delta lines: +46 -5
--------------------
--- presvish.cxx 20 Jan 2004 12:52:21 -0000 1.15
+++ presvish.cxx 12 Apr 2004 15:17:04 -0000 1.15.10.1
@@ -2,9 +2,9 @@
*
* $RCSfile: presvish.cxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.15.10.1 $
*
- * last change: $Author: obo $ $Date: 2004/01/20 12:52:21 $
+ * last change: $Author: thb $ $Date: 2004/04/12 15:17:04 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -100,10 +100,29 @@
#include "FactoryIds.hxx"
#endif
+// #110496#
+#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
+#include <toolkit/helper/vclunohelper.hxx>
+#endif
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
+#endif
+
+#ifndef _COM_SUN_STAR_PRESENTATION_XSLIDESHOW_HPP_
+#include <com/sun/star/presentation/XSlideShow.hpp>
+#endif
+#ifndef _COM_SUN_STAR_DRAWING_XDRAWPAGESSUPPLIER_HPP_
+#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
+#endif
+
+
#define PresentationViewShell
using namespace sd;
#include "sdslots.hxx"
+using namespace ::drafts::com::sun::star;
+using namespace ::com::sun::star;
+
namespace sd {
// -------------------
@@ -258,8 +277,30 @@
pShell->GetViewFrame()->GetDispatcher()->Execute( SID_SHOWPOPUPS,
SFX_CALLMODE_SYNCHRON, &aShowItem,
&aId, 0L );
pShell->GetViewFrame()->Show();
- pShell->pFuSlideShow = new FuSlideShow( pShell, pShell->pWindow,
pShell->pDrView, pShell->GetDoc(), rReq );
- pShell->GetActiveWindow()->GrabFocus();
+
+ // pShell->pFuSlideShow = new FuSlideShow( pShell, pShell->pWindow,
pShell->pDrView, pShell->GetDoc(), rReq );
+ // pShell->GetActiveWindow()->GrabFocus();
+
+ // #110496#
+ uno::Reference< lang::XMultiServiceFactory > xFactory(
::comphelper::getProcessServiceFactory() );
+
+ if( xFactory.is() )
+ {
+ uno::Reference< presentation::XSlideShow > xSlideShow(
+ xFactory->createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.
SlideShow")) ),
+ uno::UNO_QUERY );
+
+ if( xSlideShow.is() )
+ {
+ xSlideShow->performFullscreenShow(
+ uno::Reference< drawing::XDrawPagesSupplier
(pDoc->getUnoModel(),
+
uno::UNO_QUERY),
+ VCLUnoHelper::GetInterface( pWorkWindow ),
+ 0,
+ 10,
+ sal_True );
+ }
+ }
}
} // end of namespace sd
File [changed]: makefile.mk
Url:
http://graphics.openoffice.org/source/browse/graphics/sd/source/ui/view/
makefile.mk?r1=1.10&r2=1.10.10.1
Delta lines: +5 -4
-------------------
--- makefile.mk 20 Jan 2004 12:51:10 -0000 1.10
+++ makefile.mk 12 Apr 2004 15:17:05 -0000 1.10.10.1
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.10.10.1 $
#
-# last change: $Author: obo $ $Date: 2004/01/20 12:51:10 $
+# last change: $Author: thb $ $Date: 2004/04/12 15:17:05 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -83,6 +83,7 @@
$(SLO)$/drviews8.obj \
$(SLO)$/drviewsa.obj \
$(SLO)$/outlnvsh.obj \
+ $(SLO)$/presvish.obj \
$(SLO)$/slidvish.obj
EXCEPTIONSNOOPTFILES=\
@@ -125,8 +126,8 @@
$(SLO)$/slidview.obj \
$(SLO)$/outlnvsh.obj \
$(SLO)$/outlnvs2.obj \
- $(SLO)$/presvish.obj \
$(SLO)$/prvwshll.obj \
+ $(SLO)$/presvish.obj \
$(SLO)$/outlview.obj \
$(SLO)$/tabcontr.obj \
$(SLO)$/layertab.obj \
File [changed]: drviewse.cxx
Url:
http://graphics.openoffice.org/source/browse/graphics/sd/source/ui/view/
drviewse.cxx?r1=1.36&r2=1.36.10.1
Delta lines: +46 -7
--------------------
--- drviewse.cxx 20 Jan 2004 12:47:57 -0000 1.36
+++ drviewse.cxx 12 Apr 2004 15:17:05 -0000 1.36.10.1
@@ -2,9 +2,9 @@
*
* $RCSfile: drviewse.cxx,v $
*
- * $Revision: 1.36 $
+ * $Revision: 1.36.10.1 $
*
- * last change: $Author: obo $ $Date: 2004/01/20 12:47:57 $
+ * last change: $Author: thb $ $Date: 2004/04/12 15:17:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -231,6 +231,22 @@
#include <svx/dataaccessdescriptor.hxx>
#endif
+// #110496#
+#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
+#include <toolkit/helper/vclunohelper.hxx>
+#endif
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
+#endif
+
+#ifndef _COM_SUN_STAR_PRESENTATION_XSLIDESHOW_HPP_
+#include <com/sun/star/presentation/XSlideShow.hpp>
+#endif
+#ifndef _COM_SUN_STAR_DRAWING_XDRAWPAGESSUPPLIER_HPP_
+#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
+#endif
+
+
using namespace ::rtl;
using namespace ::com::sun::star;
@@ -792,10 +808,33 @@
else
{