summaryrefslogtreecommitdiff
path: root/oox/inc
diff options
context:
space:
mode:
Diffstat (limited to 'oox/inc')
-rw-r--r--oox/inc/oox/vml/vmldrawing.hxx2
-rw-r--r--oox/inc/oox/vml/vmlshape.hxx4
2 files changed, 6 insertions, 0 deletions
diff --git a/oox/inc/oox/vml/vmldrawing.hxx b/oox/inc/oox/vml/vmldrawing.hxx
index 91d9c1abdcfb..2b6ef0e17fdc 100644
--- a/oox/inc/oox/vml/vmldrawing.hxx
+++ b/oox/inc/oox/vml/vmldrawing.hxx
@@ -193,8 +193,10 @@ 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::map< ::rtl::OUString, OleObjectInfo > OleObjectInfoMap;
typedef ::std::map< ::rtl::OUString, ControlInfo > ControlInfoMap;
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index a99654b8a367..65683f722716 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -172,8 +172,10 @@ 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
::rtl::OUString maType; /// Shape template with default properties.
PointVector maPoints; /// Points for the polyline shape.
@@ -369,7 +371,9 @@ protected:
const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef ::std::auto_ptr< ShapeContainer > ShapeContainerPtr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
ShapeContainerPtr mxChildren; /// Shapes and templates that are part of this group.
};