INTEGRATION: CWS presfixes12 (1.40.12); FILE MERGED

2007/04/30 10:09:44 thb 1.40.12.2: RESYNC: (1.40-1.42); FILE MERGED
2007/04/16 15:20:22 thb 1.40.12.1: #i75315# Reading hidden config item SlideshowRespectZOrder in sd, and passing it on to slideshow component
This commit is contained in:
Oliver Bolte 2007-07-17 13:30:22 +00:00
parent 0d48c78165
commit 64048f0df3

View file

@ -4,9 +4,9 @@
*
* $RCSfile: slideshowimpl.cxx,v $
*
* $Revision: 1.44 $
* $Revision: 1.45 $
*
* last change: $Author: kz $ $Date: 2007-05-10 09:44:28 $
* last change: $Author: obo $ $Date: 2007-07-17 14:30:22 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -914,6 +914,15 @@ bool SlideshowImpl::startShow( PresentationSettings* pPresSettings )
OUString( RTL_CONSTASCII_USTRINGPARAM("ImageAnimationsAllowed") ),
-1, Any( maPresSettings.mbAnimationAllowed != sal_False ),
beans::PropertyState_DIRECT_VALUE ) );
const sal_Bool bZOrderEnabled(
SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsSlideshowRespectZOrder() );
aProperties.push_back(
beans::PropertyValue(
OUString( RTL_CONSTASCII_USTRINGPARAM("DisableAnimationZOrder") ),
-1, Any( bZOrderEnabled == sal_False ),
beans::PropertyState_DIRECT_VALUE ) );
/*
aProperties.push_back(
beans::PropertyValue(