[Libreoffice-commits] core.git: filter/source include/filter

[Stephan Bergmann]

 filter/source/graphicfilter/eos2met/eos2met.cxx |    2 +-
 filter/source/msfilter/eschesdo.cxx             |    4 +---
 filter/source/svg/svgdialog.hxx                 |    2 +-
 filter/source/svg/svgwriter.hxx                 |    4 ++--
 include/filter/msfilter/escherex.hxx            |   10 +++-------
 include/filter/msfilter/mstoolbar.hxx           |    2 +-
 6 files changed, 9 insertions(+), 15 deletions(-)

New commits:
commit 402bb706da7a43ee8c161cab5a5fc4d05b965051
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Sep 26 10:14:08 2014 +0200

    filter: std::auto_ptr -> std::unique_ptr
    
    Change-Id: Id1d0392e1dbd33de326aa2bd8cbcf8cc03bf7c90

diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 90fb53d..dac8c31 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 bc31462..2e92270 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 5cc62a7..68871a6 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 4190937..6e18668 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;
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 1b86971..29de8ab 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -1415,9 +1415,7 @@ public:
 class InteractionInfo
 {
     bool mbHasInteraction;
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    std::auto_ptr<SvMemoryStream>       mpHyperlinkRecord;
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    std::unique_ptr<SvMemoryStream>       mpHyperlinkRecord;
     InteractionInfo();
 
 public:
@@ -1426,9 +1424,7 @@ public:
         mpHyperlinkRecord.reset( pStream );
     }
     bool    hasInteraction() { return mbHasInteraction; }
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    const std::auto_ptr< SvMemoryStream >&  getHyperlinkRecord() { return mpHyperlinkRecord; }
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    const std::unique_ptr< SvMemoryStream >&  getHyperlinkRecord() { return mpHyperlinkRecord; }
 };
 
 class EscherExHostAppData
@@ -1567,7 +1563,7 @@ class ImplEscherExSdr;
 class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable
 {
     protected:
-        typedef ::std::auto_ptr< ImplEscherExSdr > ImplEscherExSdrPtr;
+        typedef ::std::unique_ptr< ImplEscherExSdr > ImplEscherExSdrPtr;
 
         EscherExGlobalRef           mxGlobal;
         ImplEscherExSdrPtr          mpImplEscherExSdr;
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index 8dbea1b..e71e873 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -44,7 +44,7 @@ class MSFILTER_DLLPUBLIC CustomToolBarImportHelper
         css::uno::Reference< css::graphic::XGraphic > image;
     };
     std::vector< iconcontrolitem > iconcommands;
-    std::auto_ptr< MSOCommandConvertor > pMSOCmdConvertor;
+    std::unique_ptr< MSOCommandConvertor > pMSOCmdConvertor;
     css::uno::Reference< css::ui::XUIConfigurationManagerSupplier > m_xCfgSupp;
     css::uno::Reference< css::ui::XUIConfigurationManager > m_xAppCfgMgr;
     SfxObjectShell& mrDocSh;