reportdesign: std::auto_ptr -> std::unique_ptr

Change-Id: If387245dd587d4191589fcf93c02f1ca12654456

24 files changed, 50 insertions, 95 deletions

diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index 3a5910cf273a..9b4f6de8bac6 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -40,7 +40,7 @@ namespace rptui
                                         >
         , public SfxListener
     {
-        const ::std::auto_ptr<OXUndoEnvironmentImpl> m_pImpl;
+        const ::std::unique_ptr<OXUndoEnvironmentImpl> m_pImpl;
 
         OXUndoEnvironment(const OXUndoEnvironment&);
         OXUndoEnvironment& operator=(const OXUndoEnvironment&);
diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx b/reportdesign/source/core/inc/ReportUndoFactory.hxx
index 1ddffcbb2d7d..4dc37db82a33 100644
--- a/reportdesign/source/core/inc/ReportUndoFactory.hxx
+++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx
@@ -28,7 +28,7 @@ namespace rptui
     class OReportUndoFactory : public SdrUndoFactory
     {
         OModuleClient       m_aModuleClient;
-        ::std::auto_ptr<SdrUndoFactory> m_pUndoFactory;
+        ::std::unique_ptr<SdrUndoFactory> m_pUndoFactory;
 
         OReportUndoFactory(const OReportUndoFactory&);
         OReportUndoFactory& operator=(const OReportUndoFactory&);
diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx
index 63f9ebf0c19b..0c8c08300c4f 100644
--- a/reportdesign/source/core/inc/Shape.hxx
+++ b/reportdesign/source/core/inc/Shape.hxx
@@ -44,7 +44,7 @@ namespace reportdesign
                     public ShapePropertySet
     {
         friend class OShapeHelper;
-        ::std::auto_ptr< ::comphelper::OPropertyArrayAggregationHelper> m_pAggHelper;
+        ::std::unique_ptr< ::comphelper::OPropertyArrayAggregationHelper> m_pAggHelper;
         OReportControlModel                                             m_aProps;
         com::sun::star::drawing::HomogenMatrix3                         m_Transformation;
         sal_Int32                                                       m_nZOrder;
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index b200d0b928a7..0bf3db9786c6 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -1469,9 +1469,7 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa
     rtl::Reference< XMLShapeExport > xShapeExport = GetShapeExport();
     xShapeExport->seekShapes(_xSection.get());
     const sal_Int32 nCount = _xSection->getCount();
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr<SvXMLElementExport> pParagraphContent;
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    ::std::unique_ptr<SvXMLElementExport> pParagraphContent;
     if ( _bAddParagraph )
         pParagraphContent.reset(new SvXMLElementExport(*this,XML_NAMESPACE_TEXT, XML_P, true, false));
 
@@ -1482,9 +1480,7 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa
         uno::Reference< XShape > xShape(_xSection->getByIndex(i),uno::UNO_QUERY);
         if ( xShape.is() )
         {
-            SAL_WNODEPRECATED_DECLARATIONS_PUSH
-            ::std::auto_ptr<SvXMLElementExport> pSubDocument;
-            SAL_WNODEPRECATED_DECLARATIONS_POP
+            ::std::unique_ptr<SvXMLElementExport> pSubDocument;
             uno::Reference< frame::XModel> xModel(xShape->getPropertyValue("Model"),uno::UNO_QUERY);
             if ( xModel.is() ) // special handling for chart object
             {
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index 8916e43a376f..de94fcd988e4 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -110,8 +110,8 @@ public:
     typedef ::std::map< Reference<XPropertySet> ,TGrid >            TSectionsGrid;
     typedef ::std::map< Reference<XGroup> ,Reference<XFunction> >   TGroupFunctionMap;
 private:
-    ::std::auto_ptr< TStringPair >                  m_aAutoIncrement;
-    ::std::auto_ptr< TDelimiter >                   m_aDelimiter;
+    ::std::unique_ptr< TStringPair >                m_aAutoIncrement;
+    ::std::unique_ptr< TDelimiter >                 m_aDelimiter;
     ::std::vector< Any >                            m_aDataSourceSettings;
     TSectionsGrid                                   m_aSectionsGrid;
 
diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx
index e36506a6f0ae..e9281e24488a 100644
--- a/reportdesign/source/filter/xml/xmlHelper.hxx
+++ b/reportdesign/source/filter/xml/xmlHelper.hxx
@@ -44,8 +44,8 @@ namespace rptxml
         OPropertyHandlerFactory(const OPropertyHandlerFactory&);
         void operator =(const OPropertyHandlerFactory&);
     protected:
-        mutable ::std::auto_ptr<XMLConstantsPropertyHandler>    m_pDisplayHandler;
-        mutable ::std::auto_ptr<XMLPropertyHandler>             m_pTextAlignHandler;
+        mutable ::std::unique_ptr<XMLConstantsPropertyHandler>    m_pDisplayHandler;
+        mutable ::std::unique_ptr<XMLPropertyHandler>             m_pTextAlignHandler;
     public:
         OPropertyHandlerFactory();
         virtual ~OPropertyHandlerFactory();
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index 05bfd4b4d34c..193279a31300 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -210,9 +210,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const
     else if ( _sName == "rpt:master-detail-field" )
     {
         const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr<SvXMLTokenMap> pMasterElemTokenMap( OXMLHelper::GetSubDocumentElemTokenMap());
-        SAL_WNODEPRECATED_DECLARATIONS_POP
+        ::std::unique_ptr<SvXMLTokenMap> pMasterElemTokenMap( OXMLHelper::GetSubDocumentElemTokenMap());
         try
         {
             OUString sMasterField,sDetailField;
@@ -258,9 +256,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const
     {
         bool bHasCategories = true;
         const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr<SvXMLTokenMap> pMasterElemTokenMap( OXMLHelper::GetSubDocumentElemTokenMap());
-        SAL_WNODEPRECATED_DECLARATIONS_POP
+        ::std::unique_ptr<SvXMLTokenMap> pMasterElemTokenMap( OXMLHelper::GetSubDocumentElemTokenMap());
         for(sal_Int16 i = 0; i < nLength; ++i)
         {
             OUString sLocalName;
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
index cc987dfd4d12..d50dcecd5491 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
@@ -89,9 +89,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >        m_xModel;
     ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDatabaseDataProvider >   m_xDatabaseDataProvider;
 
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr<SvXMLTokenMap>                                                      m_pReportElemTokenMap;
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    ::std::unique_ptr<SvXMLTokenMap>                                                    m_pReportElemTokenMap;
 };
 
 } // namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index eb843b74e7cf..2347e0b22cf7 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -76,21 +76,19 @@ private:
     com::sun::star::uno::Any                        m_aViewSettings;
     Reference< XComponent >                         m_xSrcDoc;
 
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    mutable ::std::auto_ptr<SvXMLTokenMap>          m_pDocElemTokenMap;
-    mutable ::std::auto_ptr<SvXMLTokenMap>          m_pReportElemTokenMap;
-    mutable ::std::auto_ptr<SvXMLTokenMap>          m_pGroupsElemTokenMap;
-    mutable ::std::auto_ptr<SvXMLTokenMap>          m_pGroupElemTokenMap;
-    mutable ::std::auto_ptr<SvXMLTokenMap>          m_pSectionElemTokenMap;
-    mutable ::std::auto_ptr<SvXMLTokenMap>          m_pComponentElemTokenMap;
-    mutable ::std::auto_ptr<SvXMLTokenMap>          m_pElemTokenMap;
-    mutable ::std::auto_ptr<SvXMLTokenMap>          m_pControlElemTokenMap;
-    mutable ::std::auto_ptr<SvXMLTokenMap>          m_pFunctionElemTokenMap;
-    mutable ::std::auto_ptr<SvXMLTokenMap>          m_pSubDocumentElemTokenMap;
-    mutable ::std::auto_ptr<SvXMLTokenMap>          m_pFormatElemTokenMap;
-    mutable ::std::auto_ptr<SvXMLTokenMap>          m_pColumnTokenMap;
-    mutable ::std::auto_ptr<SvXMLTokenMap>          m_pCellElemTokenMap;
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    mutable ::std::unique_ptr<SvXMLTokenMap>        m_pDocElemTokenMap;
+    mutable ::std::unique_ptr<SvXMLTokenMap>        m_pReportElemTokenMap;
+    mutable ::std::unique_ptr<SvXMLTokenMap>        m_pGroupsElemTokenMap;
+    mutable ::std::unique_ptr<SvXMLTokenMap>        m_pGroupElemTokenMap;
+    mutable ::std::unique_ptr<SvXMLTokenMap>        m_pSectionElemTokenMap;
+    mutable ::std::unique_ptr<SvXMLTokenMap>        m_pComponentElemTokenMap;
+    mutable ::std::unique_ptr<SvXMLTokenMap>        m_pElemTokenMap;
+    mutable ::std::unique_ptr<SvXMLTokenMap>        m_pControlElemTokenMap;
+    mutable ::std::unique_ptr<SvXMLTokenMap>        m_pFunctionElemTokenMap;
+    mutable ::std::unique_ptr<SvXMLTokenMap>        m_pSubDocumentElemTokenMap;
+    mutable ::std::unique_ptr<SvXMLTokenMap>        m_pFormatElemTokenMap;
+    mutable ::std::unique_ptr<SvXMLTokenMap>        m_pColumnTokenMap;
+    mutable ::std::unique_ptr<SvXMLTokenMap>        m_pCellElemTokenMap;
 
     rtl::Reference < XMLPropertyHandlerFactory >      m_xPropHdlFactory;
     rtl::Reference < XMLPropertySetMapper >           m_xCellStylesPropertySetMapper;
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 6b485f5554bf..127e19125cd6 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -880,7 +880,7 @@ public:
 
     uno::Reference< report::XReportDefinition>  m_xReport;
     ::rptui::OReportController&                 m_rController;
-    ::std::auto_ptr<NavigatorTree>              m_pNavigatorTree;
+    ::std::unique_ptr<NavigatorTree>            m_pNavigatorTree;
 };
 
 ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pParent)
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index b598cd4d8cc9..14e08d3fb4aa 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -56,7 +56,7 @@ class  OAddFieldWindow  :public FloatingWindow
 
     ToolBox                                                                     m_aActions;
 
-    ::std::auto_ptr<OAddFieldWindowListBox>                                     m_pListBox;
+    ::std::unique_ptr<OAddFieldWindowListBox>                                   m_pListBox;
     FixedLine                                                                   m_aFixedLine;
     FixedText                                                                   m_aHelpText;
 
diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx
index 17da78eadee0..5bd1624ffe90 100644
--- a/reportdesign/source/ui/inc/DataProviderHandler.hxx
+++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx
@@ -112,9 +112,7 @@ namespace rptui
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >        m_xMasterDetails;
         /// type converter, needed on various occasions
         ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter >                m_xTypeConverter;
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr< OPropertyInfoService >                                                     m_pInfoService;
-        SAL_WNODEPRECATED_DECLARATIONS_POP
+        ::std::unique_ptr< OPropertyInfoService >                                                   m_pInfoService;
     };
 
 } // namespace rptui
diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx
index 234c338a4488..fffe7d1922be 100644
--- a/reportdesign/source/ui/inc/DefaultInspection.hxx
+++ b/reportdesign/source/ui/inc/DefaultInspection.hxx
@@ -51,7 +51,7 @@ namespace rptui
         sal_Int32                                                                               m_nMinHelpTextLines;
         sal_Int32                                                                               m_nMaxHelpTextLines;
         /// access to property meta data
-        ::std::auto_ptr< OPropertyInfoService >                                                 m_pInfoService;
+        ::std::unique_ptr< OPropertyInfoService >                                               m_pInfoService;
 
         DefaultComponentInspectorModel(const DefaultComponentInspectorModel&);
         DefaultComponentInspectorModel& operator=(const DefaultComponentInspectorModel&);
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index 386c2771a130..2c1ae5419129 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -299,9 +299,7 @@ namespace rptui
         /// type converter, needed on various occasions
         ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter >        m_xTypeConverter;
         /// access to property meta data
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr< OPropertyInfoService >                                             m_pInfoService;
-        SAL_WNODEPRECATED_DECLARATIONS_POP
+        ::std::unique_ptr< OPropertyInfoService >                                           m_pInfoService;
         mutable OUString                                                             m_sDefaultFunction;
         mutable OUString                                                             m_sScope;
         sal_uInt32                                                                          m_nDataFieldType;
diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx
index 66b67de16a03..3d6ad6a19f01 100644
--- a/reportdesign/source/ui/inc/Navigator.hxx
+++ b/reportdesign/source/ui/inc/Navigator.hxx
@@ -29,7 +29,7 @@ namespace rptui
     class ONavigator :  public FloatingWindow
     {
         OModuleClient       m_aModuleClient;
-        ::std::auto_ptr<ONavigatorImpl> m_pImpl;
+        ::std::unique_ptr<ONavigatorImpl> m_pImpl;
         ONavigator(const ONavigator&);
         void operator =(const ONavigator&);
     public:
diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
index 8086d58cc838..850216468405 100644
--- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx
+++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
@@ -98,9 +98,7 @@ namespace rptui
         ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >  m_xFormComponentHandler; /// delegatee
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >               m_xReportComponent; /// inspectee
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >               m_xFormComponent; /// inspectee
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr< OPropertyInfoService >                                             m_pInfoService;
-        SAL_WNODEPRECATED_DECLARATIONS_POP
+        ::std::unique_ptr< OPropertyInfoService >                                           m_pInfoService;
     };
 
 } // namespace rptui
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
index 48821dd187d4..a1a1207790eb 100644
--- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
@@ -47,7 +47,7 @@ namespace rptui
                                         >
     {
 
-        const ::std::auto_ptr<OXReportControllerObserverImpl> m_pImpl;
+        const ::std::unique_ptr<OXReportControllerObserverImpl> m_pImpl;
 
         FormattedFieldBeautifier m_aFormattedFieldBeautifier;
         FixedTextColor           m_aFixedTextColor;
diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx
index 14da5b1b5e6e..075e56fa2f3c 100644
--- a/reportdesign/source/ui/inc/ReportSection.hxx
+++ b/reportdesign/source/ui/inc/ReportSection.hxx
@@ -46,7 +46,7 @@ namespace rptui
         OReportPage*                        m_pPage;
         OSectionView*                       m_pView;
         OSectionWindow*                     m_pParent;
-        ::std::auto_ptr<DlgEdFunc>          m_pFunc;
+        ::std::unique_ptr<DlgEdFunc>        m_pFunc;
         ::boost::shared_ptr<OReportModel>   m_pModel;
         ::rtl::Reference< comphelper::OPropertyChangeMultiplexer>                           m_pMulti;
         ::rtl::Reference< comphelper::OPropertyChangeMultiplexer>                           m_pReportListener;
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index 02439686dc44..0af524b81b75 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -50,7 +50,7 @@ namespace rptui
         OScrollWindowHelper*    m_pParent;
         OViewsWindow            m_aViewsWindow;
         ::rtl::Reference< comphelper::OPropertyChangeMultiplexer>   m_pReportListener;
-        ::std::auto_ptr<DlgEdFactory>
+        ::std::unique_ptr<DlgEdFactory>
                                 m_pObjFac;
 
         void ImplInitSettings();
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index db2f37bc873d..2a908306e23a 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -276,9 +276,7 @@ namespace
                 const SfxPoolItem* pItem = _rItemSet.GetItem(aIt->nWID);
                 if ( pItem )
                 {
-                    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-                    ::std::auto_ptr<SfxPoolItem> pClone(pItem->Clone());
-                    SAL_WNODEPRECATED_DECLARATIONS_POP
+                    ::std::unique_ptr<SfxPoolItem> pClone(pItem->Clone());
                     pClone->PutValue(_xShape->getPropertyValue(aIt->sName), aIt->nMemberId);
                     _rItemSet.Put(*pClone, aIt->nWID);
                 }
@@ -649,10 +647,8 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
         { SID_ATTR_CHAR_CTL_WEIGHT, SFX_ITEM_POOLABLE }
     };
     vcl::Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow );
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr<FontList> pFontList(new FontList( pParent ));
+    ::std::unique_ptr<FontList> pFontList(new FontList( pParent ));
     XColorListRef pColorList( XColorList::CreateStdColorList() );
-    SAL_WNODEPRECATED_DECLARATIONS_POP
     SfxPoolItem* pDefaults[] =
     {
         new SvxFontItem(ITEMID_FONT),
@@ -713,9 +709,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
     bool bSuccess = false;
     try
     {
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr<SfxItemSet> pDescriptor( new SfxItemSet( *pPool, pRanges ) );
-        SAL_WNODEPRECATED_DECLARATIONS_POP
+        ::std::unique_ptr<SfxItemSet> pDescriptor( new SfxItemSet( *pPool, pRanges ) );
         lcl_CharPropertiesToItems( _rxReportControlFormat, *pDescriptor );
 
         {   // want the dialog to be destroyed before our set
@@ -758,16 +752,12 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R
     try
     {
         SfxItemPool& rItemPool = pModel->GetItemPool();
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr<SfxItemSet> pDescriptor( new SfxItemSet( rItemPool, rItemPool.GetFirstWhich(),rItemPool.GetLastWhich() ) );
-        SAL_WNODEPRECATED_DECLARATIONS_POP
+        ::std::unique_ptr<SfxItemSet> pDescriptor( new SfxItemSet( rItemPool, rItemPool.GetFirstWhich(),rItemPool.GetLastWhich() ) );
         lcl_fillShapeToItems(_xShape,*pDescriptor);
 
         {   // want the dialog to be destroyed before our set
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-            SAL_WNODEPRECATED_DECLARATIONS_PUSH
-            ::std::auto_ptr<AbstractSvxAreaTabDialog> pDialog(pFact->CreateSvxAreaTabDialog( pParent,pDescriptor.get(),pModel.get(), true ));
-            SAL_WNODEPRECATED_DECLARATIONS_POP
+            ::std::unique_ptr<AbstractSvxAreaTabDialog> pDialog(pFact->CreateSvxAreaTabDialog( pParent,pDescriptor.get(),pModel.get(), true ));
             if ( RET_OK == pDialog->Execute() )
             {
                 bSuccess = true;
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 2659914ad393..b9df2babf467 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -132,9 +132,7 @@ ODesignView::~ODesignView()
     if ( m_pPropWin )
     {
         notifySystemWindow(this,m_pPropWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr<vcl::Window> aTemp2(m_pPropWin);
-        SAL_WNODEPRECATED_DECLARATIONS_POP
+        ::std::unique_ptr<vcl::Window> aTemp2(m_pPropWin);
         m_pPropWin = NULL;
     }
     if ( m_pAddField )
@@ -142,9 +140,7 @@ ODesignView::~ODesignView()
         SvtViewOptions aDlgOpt( E_WINDOW, OUString( UID_RPT_RPT_APP_VIEW ) );
         aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US));
         notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr<vcl::Window> aTemp2(m_pAddField);
-        SAL_WNODEPRECATED_DECLARATIONS_POP
+        ::std::unique_ptr<vcl::Window> aTemp2(m_pAddField);
         m_pAddField = NULL;
     }
     if ( m_pReportExplorer )
@@ -152,15 +148,11 @@ ODesignView::~ODesignView()
         SvtViewOptions aDlgOpt(E_WINDOW, OStringToOUString(m_pReportExplorer->GetHelpId(), RTL_TEXTENCODING_UTF8));
         aDlgOpt.SetWindowState(OStringToOUString(m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US));
         notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr<vcl::Window> aTemp2(m_pReportExplorer);
-        SAL_WNODEPRECATED_DECLARATIONS_POP
+        ::std::unique_ptr<vcl::Window> aTemp2(m_pReportExplorer);
         m_pReportExplorer = NULL;
     }
     {
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr<vcl::Window> aTemp2(m_pTaskPane);
-        SAL_WNODEPRECATED_DECLARATIONS_POP
+        ::std::unique_ptr<vcl::Window> aTemp2(m_pTaskPane);
         m_pTaskPane = NULL;
     }
 }
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 3aded47f3db2..3259d777ee2b 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -329,9 +329,7 @@ void OReportController::disposing()
     {
         SvtViewOptions aDlgOpt(E_WINDOW, OStringToOUString(m_pGroupsFloater->GetHelpId(), RTL_TEXTENCODING_UTF8));
         aDlgOpt.SetWindowState(OStringToOUString(m_pGroupsFloater->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US));
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr<FloatingWindow> aTemp(m_pGroupsFloater);
-        SAL_WNODEPRECATED_DECLARATIONS_POP
+        ::std::unique_ptr<FloatingWindow> aTemp(m_pGroupsFloater);
         m_pGroupsFloater = NULL;
     }
 
@@ -2411,9 +2409,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
 
     try
     {
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr<SfxItemSet> pDescriptor(new SfxItemSet(*pPool, pRanges));
-        SAL_WNODEPRECATED_DECLARATIONS_POP
+        ::std::unique_ptr<SfxItemSet> pDescriptor(new SfxItemSet(*pPool, pRanges));
         // fill it
         if ( _xSection.is() )
             pDescriptor->Put(SvxBrushItem(::Color(_xSection->getBackColor()),RPTUI_ID_BRUSH));
@@ -4216,17 +4212,13 @@ void OReportController::openZoomDialog()
         pPool->FreezeIdRanges();                        // the same
         try
         {
-            SAL_WNODEPRECATED_DECLARATIONS_PUSH
-            ::std::auto_ptr<SfxItemSet> pDescriptor(new SfxItemSet(*pPool, pRanges));
-            SAL_WNODEPRECATED_DECLARATIONS_POP
+            ::std::unique_ptr<SfxItemSet> pDescriptor(new SfxItemSet(*pPool, pRanges));
             // fill it
             SvxZoomItem aZoomItem( m_eZoomType, m_nZoomValue, SID_ATTR_ZOOM );
             aZoomItem.SetValueSet(SVX_ZOOM_ENABLE_100|SVX_ZOOM_ENABLE_WHOLEPAGE|SVX_ZOOM_ENABLE_PAGEWIDTH);
             pDescriptor->Put(aZoomItem);
 
-            SAL_WNODEPRECATED_DECLARATIONS_PUSH
-            ::std::auto_ptr<AbstractSvxZoomDialog> pDlg( pFact->CreateSvxZoomDialog(NULL, *pDescriptor.get()) );
-            SAL_WNODEPRECATED_DECLARATIONS_POP
+            ::std::unique_ptr<AbstractSvxZoomDialog> pDlg( pFact->CreateSvxZoomDialog(NULL, *pDescriptor.get()) );
             pDlg->SetLimits( 20, 400 );
             bool bCancel = ( RET_CANCEL == pDlg->Execute() );
 
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index b90145c24335..8aca901f567b 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -82,7 +82,6 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re
 ,m_pPage(NULL)
 ,m_pView(NULL)
 ,m_pParent(_pParent)
-,m_pFunc(NULL)
 ,m_pMulti(NULL)
 ,m_pReportListener(NULL)
 ,m_xSection(_xSection)
@@ -122,7 +121,7 @@ OReportSection::~OReportSection()
     m_pFunc.reset();
 
     {
-        ::std::auto_ptr<OSectionView> aTemp( m_pView);
+        ::std::unique_ptr<OSectionView> aTemp( m_pView);
         if ( m_pView )
             m_pView->EndListening( *m_pModel );
         m_pView = NULL;
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index bb6f92fa10ec..05a8311985f1 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -288,7 +288,7 @@ uno::Sequence< Reference<uno::XInterface> > PropBrw::CreateCompPropSet(const Sdr
     {
         SdrObject* pCurrent = _rMarkList.GetMark(i)->GetMarkedSdrObj();
 
-        ::std::auto_ptr<SdrObjListIter> pGroupIterator;
+        ::std::unique_ptr<SdrObjListIter> pGroupIterator;
         if (pCurrent->IsGroupObject())
         {
             pGroupIterator.reset(new SdrObjListIter(*pCurrent->GetSubList()));