diff options
Diffstat (limited to 'slideshow/source/engine')
| -rw-r--r-- | slideshow/source/engine/slide/layer.hxx | 1 | ||||
| -rw-r--r-- | slideshow/source/engine/slide/layermanager.hxx | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx index 25dddde4f477..68792ee44884 100644 --- a/slideshow/source/engine/slide/layer.hxx +++ b/slideshow/source/engine/slide/layer.hxx @@ -257,7 +257,6 @@ namespace slideshow typedef ::std::shared_ptr< Layer > LayerSharedPtr; typedef ::std::weak_ptr< Layer > LayerWeakPtr; - typedef ::std::vector< LayerSharedPtr > LayerVector; } } diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx index 44e391fe5c7d..f9ba7da23feb 100644 --- a/slideshow/source/engine/slide/layermanager.hxx +++ b/slideshow/source/engine/slide/layermanager.hxx @@ -240,7 +240,6 @@ namespace slideshow */ private: typedef ::std::map< ShapeSharedPtr, LayerWeakPtr, ShapeComparator > LayerShapeMap; - typedef ::std::set< ShapeSharedPtr > ShapeUpdateSet; /// Adds shape area to containing layer's damage area @@ -306,7 +305,8 @@ namespace slideshow const UnoViewContainer& mrViews; /// All layers of this object. Vector owns the layers - LayerVector maLayers; + ::std::vector< LayerSharedPtr > + maLayers; /** Contains all shapes with their XShape reference as the key */ @@ -328,7 +328,8 @@ namespace slideshow has bNeedsUpdate set to true. We maintain this redundant information for faster update processing. */ - ShapeUpdateSet maUpdateShapes; + ::std::set< ShapeSharedPtr > + maUpdateShapes; /// Number of shape sprites currently active on this LayerManager sal_Int32 mnActiveSprites; |