inline use-once typedefs

Change-Id: I5c3ffc03c26b3428f1f336e6ecba7838a1cf1157
Reviewed-on: https://gerrit.libreoffice.org/46764
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 6 insertions, 9 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;
diff --git a/slideshow/source/inc/basenode.hxx b/slideshow/source/inc/basenode.hxx
index 9798aa11a171..96291176ff55 100644
--- a/slideshow/source/inc/basenode.hxx
+++ b/slideshow/source/inc/basenode.hxx
@@ -186,9 +186,7 @@ private:
 private:
     SlideShowContext                                   maContext;
 
-    typedef ::std::vector< AnimationNodeSharedPtr >    ListenerVector;
-
-    ListenerVector                                     maDeactivatingListeners;
+    ::std::vector< AnimationNodeSharedPtr >            maDeactivatingListeners;
     css::uno::Reference< css::animations::XAnimationNode > mxAnimationNode;
     ::std::shared_ptr< BaseContainerNode >           mpParent;
     ::std::shared_ptr< BaseNode >                    mpSelf;
diff --git a/slideshow/source/inc/shapeimporter.hxx b/slideshow/source/inc/shapeimporter.hxx
index e1fba6fa7683..5c0afa917b5c 100644
--- a/slideshow/source/inc/shapeimporter.hxx
+++ b/slideshow/source/inc/shapeimporter.hxx
@@ -122,13 +122,12 @@ private:
             : mpGroupShape(), mxShapes(xShapes),
               mnCount(xShapes->getCount()), mnPos(0) {}
     };
-    typedef ::std::stack<XShapesEntry> XShapesStack;
 
     css::uno::Reference<css::drawing::XDrawPage> mxPage;
     css::uno::Reference<css::drawing::XDrawPagesSupplier> mxPagesSupplier;
     const SlideShowContext&                   mrContext;
     PolyPolygonVector                         maPolygons;
-    XShapesStack                              maShapesStack;
+    ::std::stack<XShapesEntry>                maShapesStack;
     double                                    mnAscendingPrio;
     bool                                      mbConvertingMasterPage;
 };