diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-26 10:14:08 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-26 10:14:30 +0200 |
commit | 402bb706da7a43ee8c161cab5a5fc4d05b965051 (patch) | |
tree | 1cd831360fca8b889cadf85b4ac87b8039b5909f /filter | |
parent | scripting: modify astyle.options (diff) | |
download | core-402bb706da7a43ee8c161cab5a5fc4d05b965051.tar.gz core-402bb706da7a43ee8c161cab5a5fc4d05b965051.zip |
filter: std::auto_ptr -> std::unique_ptr
Change-Id: Id1d0392e1dbd33de326aa2bd8cbcf8cc03bf7c90
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/graphicfilter/eos2met/eos2met.cxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/eschesdo.cxx | 4 | ||||
-rw-r--r-- | filter/source/svg/svgdialog.hxx | 2 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.hxx | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index 90fb53d52e5d..dac8c3176b82 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -156,7 +156,7 @@ private: sal_uInt32 nWrittenBitmaps; // number of already written Bitmaps sal_uInt32 nActBitmapPercent; // percentage of the next bitmap that's already written - ::std::auto_ptr< VirtualDevice > apDummyVDev; + ::std::unique_ptr< VirtualDevice > apDummyVDev; OutputDevice* pCompDev; com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index bc314622edbb..2e9227042eb7 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -267,9 +267,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, aPropOpt.AddOpt( ESCHER_Prop_wzName, aShapeName ); if ( InteractionInfo* pInteraction = mpHostAppData ? mpHostAppData->GetInteractionInfo():NULL ) { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - const std::auto_ptr< SvMemoryStream >& pMemStrm = pInteraction->getHyperlinkRecord(); - SAL_WNODEPRECATED_DECLARATIONS_POP + const std::unique_ptr< SvMemoryStream >& pMemStrm = pInteraction->getHyperlinkRecord(); if ( pMemStrm.get() ) { pMemStrm->ObjectOwnsMemory( false ); diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 5cc62a7cf3b0..68871a66b19f 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -39,7 +39,7 @@ class SVGDialog : public ::svt::OGenericUnoDialog, { private: - ::std::auto_ptr< ResMgr > mapResMgr; + ::std::unique_ptr< ResMgr > mapResMgr; com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maMediaDescriptor; com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maFilterData; com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxSrcDoc; diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 4190937e8470..6e186689b5da 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -132,7 +132,7 @@ struct SVGShapeDescriptor Color maShapeLineColor; sal_Int32 mnStrokeWidth; SvtGraphicStroke::DashArray maDashArray; - ::std::auto_ptr< Gradient > mapShapeGradient; + ::std::unique_ptr< Gradient > mapShapeGradient; OUString maId; basegfx::B2DLineJoin maLineJoin; @@ -300,7 +300,7 @@ private: sal_Int32 mnCurMaskId; sal_Int32 mnCurPatternId; ::std::stack< SVGAttributeWriter* > maContextStack; - ::std::auto_ptr< SVGShapeDescriptor > mapCurShape; + ::std::unique_ptr< SVGShapeDescriptor > mapCurShape; SVGExport& mrExport; SVGFontExport& mrFontExport; SVGAttributeWriter* mpContext; |