[Libreoffice-commits] core.git: include/oox

[Stephan Bergmann]

 include/oox/core/recordparser.hxx  |    2 +-
 include/oox/core/xmlfilterbase.hxx |    2 +-
 include/oox/vml/vmldrawing.hxx     |    6 ++----
 include/oox/vml/vmlshape.hxx       |   10 +++-------
 4 files changed, 7 insertions(+), 13 deletions(-)

New commits:
commit e3ee8c68d580cd0782b9ae9497f3584a046f0404
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Sep 26 17:19:03 2014 +0200

    oox: std::auto_ptr -> std::unique_ptr
    
    Change-Id: I35d3cc04eb9bbc8b4446bc501ba35e058c1aa34a

diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx
index f3d1243..8d97af4 100644
--- a/include/oox/core/recordparser.hxx
+++ b/include/oox/core/recordparser.hxx
@@ -73,7 +73,7 @@ private:
     RecordInputSource   maSource;
     ::rtl::Reference< FragmentHandler > mxHandler;
     ::rtl::Reference< prv::Locator > mxLocator;
-    ::std::auto_ptr< prv::ContextStack > mxStack;
+    ::std::unique_ptr< prv::ContextStack > mxStack;
     RecordInfoMap       maStartMap;
     RecordInfoMap       maEndMap;
 };
diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx
index c4aaff1..a8c950e 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -252,7 +252,7 @@ private:
                             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const SAL_OVERRIDE;
 
 private:
-    ::std::auto_ptr< XmlFilterBaseImpl > mxImpl;
+    ::std::unique_ptr< XmlFilterBaseImpl > mxImpl;
     sal_Int32 mnRelId;
     sal_Int32 mnMaxDocId;
 };
diff --git a/include/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx
index c6c53fd..1fbdf23 100644
--- a/include/oox/vml/vmldrawing.hxx
+++ b/include/oox/vml/vmldrawing.hxx
@@ -185,10 +185,8 @@ public:
 
 private:
     typedef ::std::vector< sal_Int32 >                      BlockIdVector;
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    typedef ::std::auto_ptr< ::oox::ole::EmbeddedForm >     EmbeddedFormPtr;
-    typedef ::std::auto_ptr< ShapeContainer >               ShapeContainerPtr;
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    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;
 
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index 832d3be..6cc180c 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -192,10 +192,8 @@ struct ClientData
 struct ShapeModel
 {
     typedef ::std::vector< ::com::sun::star::awt::Point >   PointVector;
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    typedef ::std::auto_ptr< TextBox >                      TextBoxPtr;
-    typedef ::std::auto_ptr< ClientData >                   ClientDataPtr;
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    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.
@@ -435,9 +433,7 @@ protected:
                             const ::com::sun::star::awt::Rectangle& rShapeRect ) const SAL_OVERRIDE;
 
 private:
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    typedef ::std::auto_ptr< ShapeContainer > ShapeContainerPtr;
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    typedef ::std::unique_ptr< ShapeContainer > ShapeContainerPtr;
     ShapeContainerPtr   mxChildren;         ///< Shapes and templates that are part of this group.
 };