diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-08-17 11:44:18 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-08-17 11:44:18 +0000 |
| commit | 09ca8542e0ba661c4d7a6fe8542ff4d37e974d86 (patch) | |
| tree | 75255cf326cb5c1e8ca66fa489f1ecf3a32d37b9 /slideshow/source/engine/slide | |
| parent | 8dbbc50250b6f4dc285095c0c3573815751cf13b (diff) | |
INTEGRATION: CWS thbpp8b (1.2.10); FILE MERGED
2007/08/05 18:53:51 thb 1.2.10.2: #i80357# Checking for NULL ptr - it's a weak_ptr here, after all
2007/08/03 12:08:19 thb 1.2.10.1: #i80322# Fixing build breaker with stlport5
Diffstat (limited to 'slideshow/source/engine/slide')
| -rw-r--r-- | slideshow/source/engine/slide/layermanager.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index ecf78f64c924..2511a2fab8a9 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -4,9 +4,9 @@ * * $RCSfile: layermanager.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: obo $ $Date: 2007-07-17 14:56:36 $ + * last change: $Author: ihi $ $Date: 2007-08-17 12:44:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -76,7 +76,7 @@ namespace slideshow while( aIter != aEnd ) { LayerSharedPtr pLayer = aIter->mpLayer.lock(); - if( pLayer != pCurrLayer ) + if( pLayer && pLayer != pCurrLayer ) { pCurrLayer = pLayer; pCurrViewLayer = layerFunc(pCurrLayer); @@ -750,8 +750,8 @@ namespace slideshow } void LayerManager::commitLayerChanges( std::size_t nCurrLayerIndex, - LayerShapeSet::iterator aFirstLayerShape, - LayerShapeSet::iterator aEndLayerShapes ) + LayerShapeSet::const_iterator aFirstLayerShape, + LayerShapeSet::const_iterator aEndLayerShapes ) { const bool bLayerExists( maLayers.size() > nCurrLayerIndex ); if( bLayerExists ) |