tdf#96099 Remove various smart pointer typedefs

Change-Id: I76843139e43ca1c158a977e24d210d5af93e4d0f
Reviewed-on: https://gerrit.libreoffice.org/26014
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

2 files changed, 5 insertions, 10 deletions

diff --git a/include/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx
index ad1462a812eb..9ef5fc28e02f 100644
--- a/include/oox/vml/vmldrawing.hxx
+++ b/include/oox/vml/vmldrawing.hxx
@@ -182,17 +182,15 @@ public:
 
 private:
     typedef ::std::vector< sal_Int32 >                      BlockIdVector;
-    typedef ::std::unique_ptr< ::oox::ole::EmbeddedForm >   EmbeddedFormPtr;
-    typedef ::std::unique_ptr< ShapeContainer >             ShapeContainerPtr;
     typedef ::std::map< OUString, OleObjectInfo >    OleObjectInfoMap;
     typedef ::std::map< OUString, ControlInfo >      ControlInfoMap;
 
     ::oox::core::XmlFilterBase& mrFilter;   ///< Filter object that imports/exports the VML drawing.
     css::uno::Reference< css::drawing::XDrawPage >
                         mxDrawPage;         ///< UNO draw page used to insert the shapes.
-    mutable EmbeddedFormPtr mxCtrlForm;     ///< The control form used to process embedded controls.
+    mutable std::unique_ptr<::oox::ole::EmbeddedForm> mxCtrlForm;     ///< The control form used to process embedded controls.
     mutable BlockIdVector maBlockIds;       ///< Block identifiers used by this drawing.
-    ShapeContainerPtr   mxShapes;           ///< All shapes and shape templates.
+    std::unique_ptr<ShapeContainer>   mxShapes;           ///< All shapes and shape templates.
     OleObjectInfoMap    maOleObjects;       ///< Info about all embedded OLE objects, mapped by shape id.
     ControlInfoMap      maControls;         ///< Info about all embedded form controls, mapped by control name.
     const DrawingType   meType;             ///< Application type containing the drawing.
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index 93f0943bcfe1..b7f3e19a87be 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -192,13 +192,11 @@ struct ClientData
 struct ShapeModel
 {
     typedef ::std::vector< css::awt::Point >   PointVector;
-    typedef ::std::unique_ptr< TextBox >                    TextBoxPtr;
-    typedef ::std::unique_ptr< ClientData >                 ClientDataPtr;
 
     OUString     maType;             ///< Shape template with default properties.
     PointVector         maPoints;           ///< Points for the polyline shape.
-    TextBoxPtr          mxTextBox;          ///< Text contents and properties.
-    ClientDataPtr       mxClientData;       ///< Excel specific client data.
+    std::unique_ptr<TextBox>          mxTextBox;          ///< Text contents and properties.
+    std::unique_ptr<ClientData>       mxClientData;       ///< Excel specific client data.
     OUString     maLegacyDiagramPath;///< Legacy Diagram Fragment Path
     OUString     maFrom;             ///< Start point for line shape.
     OUString     maTo;               ///< End point for line shape.
@@ -423,8 +421,7 @@ protected:
                             const css::awt::Rectangle& rShapeRect ) const override;
 
 private:
-    typedef ::std::unique_ptr< ShapeContainer > ShapeContainerPtr;
-    ShapeContainerPtr   mxChildren;         ///< Shapes and templates that are part of this group.
+    std::unique_ptr<ShapeContainer>   mxChildren;         ///< Shapes and templates that are part of this group.
 };