just silence the auto_ptr deprecations in isolation

22 files changed, 105 insertions, 3 deletions

diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx
index eb43cb984f76..1951185b679f 100644
--- a/chart2/source/controller/inc/AxisItemConverter.hxx
+++ b/chart2/source/controller/inc/AxisItemConverter.hxx
@@ -48,6 +48,7 @@ namespace wrapper
 class AxisItemConverter : public ::comphelper::ItemConverter
 {
 public:
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     AxisItemConverter(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet > & rPropertySet,
@@ -59,6 +60,7 @@ public:
         ExplicitIncrementData * pIncrement = NULL,
         ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
             ::std::auto_ptr< ::com::sun::star::awt::Size >() );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     virtual ~AxisItemConverter();
 
     virtual void FillItemSet( SfxItemSet & rOutItemSet ) const;
diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
index 51b91c0dd3dd..79284670efa3 100644
--- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
@@ -48,6 +48,7 @@ public:
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet > & rPropertySet,
         SfxItemPool& rItemPool );
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     CharacterPropertyItemConverter(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet > & rPropertySet,
@@ -57,6 +58,7 @@ public:
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet > & rRefSizePropSet =
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     virtual ~CharacterPropertyItemConverter();
 
 protected:
@@ -72,7 +74,9 @@ protected:
         ::com::sun::star::beans::XPropertySet >  GetRefSizePropertySet() const;
 
 private:
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ::com::sun::star::awt::Size > m_pRefSize;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     ::rtl::OUString                                m_aRefSizePropertyName;
     ::com::sun::star::uno::Reference<
         ::com::sun::star::beans::XPropertySet >    m_xRefSizePropSet;
diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx
index 9f9d6174289d..b334de12f5ba 100644
--- a/chart2/source/controller/inc/DataPointItemConverter.hxx
+++ b/chart2/source/controller/inc/DataPointItemConverter.hxx
@@ -51,6 +51,7 @@ class DataPointItemConverter :
         public ::comphelper::ItemConverter
 {
 public:
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     DataPointItemConverter(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::frame::XModel > & xChartModel,
@@ -75,6 +76,7 @@ public:
         bool bOverwriteLabelsForAttributedDataPointsAlso=false,
         sal_Int32 nNumberFormat=0,
         sal_Int32 nPercentNumberFormat=0);
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     virtual ~DataPointItemConverter();
 
diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx
index 9ec794aed482..3f5a07db1696 100644
--- a/chart2/source/controller/inc/LegendItemConverter.hxx
+++ b/chart2/source/controller/inc/LegendItemConverter.hxx
@@ -46,6 +46,7 @@ class LegendItemConverter :
         public ::comphelper::ItemConverter
 {
 public:
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     LegendItemConverter(
         const ::com::sun::star::uno::Reference<
         ::com::sun::star::beans::XPropertySet > & rPropertySet,
@@ -55,6 +56,7 @@ public:
             ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
         ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
             ::std::auto_ptr< ::com::sun::star::awt::Size >() );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     virtual ~LegendItemConverter();
 
     virtual void FillItemSet( SfxItemSet & rOutItemSet ) const;
diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx
index a4f08c697525..d42231c45f69 100644
--- a/chart2/source/controller/inc/MultipleChartConverters.hxx
+++ b/chart2/source/controller/inc/MultipleChartConverters.hxx
@@ -44,6 +44,7 @@ namespace wrapper
 class AllAxisItemConverter : public ::comphelper::MultipleItemConverter
 {
 public:
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     AllAxisItemConverter(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::frame::XModel > & xChartModel,
@@ -53,6 +54,7 @@ public:
             ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
         ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
             ::std::auto_ptr< ::com::sun::star::awt::Size >() );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     virtual ~AllAxisItemConverter();
 
 protected:
@@ -78,6 +80,7 @@ protected:
 class AllDataLabelItemConverter : public ::comphelper::MultipleItemConverter
 {
 public:
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     AllDataLabelItemConverter(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::frame::XModel > & xChartModel,
@@ -87,6 +90,7 @@ public:
             ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
         ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
             ::std::auto_ptr< ::com::sun::star::awt::Size >() );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     virtual ~AllDataLabelItemConverter();
 
 protected:
@@ -96,6 +100,7 @@ protected:
 class AllTitleItemConverter : public ::comphelper::MultipleItemConverter
 {
 public:
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     AllTitleItemConverter(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::frame::XModel > & xChartModel,
@@ -105,6 +110,7 @@ public:
             ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
         ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
             ::std::auto_ptr< ::com::sun::star::awt::Size >() );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     virtual ~AllTitleItemConverter();
 
 protected:
diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
index 799189ff1017..323bfe108038 100644
--- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
@@ -50,6 +50,7 @@ class RegressionEquationItemConverter :
         public ::comphelper::ItemConverter
 {
 public:
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     RegressionEquationItemConverter(
         const ::com::sun::star::uno::Reference<
         ::com::sun::star::beans::XPropertySet > & rPropertySet,
@@ -59,6 +60,7 @@ public:
             ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
         ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
             ::std::auto_ptr< ::com::sun::star::awt::Size >() );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     virtual ~RegressionEquationItemConverter();
 
     virtual void FillItemSet( SfxItemSet & rOutItemSet ) const;
diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx
index 6e29af8243b8..fc2ff605dfe5 100644
--- a/chart2/source/controller/inc/TitleDialogData.hxx
+++ b/chart2/source/controller/inc/TitleDialogData.hxx
@@ -48,10 +48,14 @@ struct TitleDialogData
     ::com::sun::star::uno::Sequence< sal_Bool > aPossibilityList;
     ::com::sun::star::uno::Sequence< sal_Bool > aExistenceList;
     ::com::sun::star::uno::Sequence< rtl::OUString > aTextList;
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ReferenceSizeProvider >    apReferenceSizeProvider;
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     TitleDialogData( ::std::auto_ptr< ReferenceSizeProvider > apRefSizeProvider =
                      ::std::auto_ptr< ReferenceSizeProvider >( 0 ));
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     void readFromModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel );
     /* return true if anything has changed;
diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx
index cb149ffdd43f..bb26683619dc 100644
--- a/chart2/source/controller/inc/TitleItemConverter.hxx
+++ b/chart2/source/controller/inc/TitleItemConverter.hxx
@@ -46,6 +46,7 @@ class TitleItemConverter :
         public ::comphelper::ItemConverter
 {
 public:
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     TitleItemConverter(
         const ::com::sun::star::uno::Reference<
         ::com::sun::star::beans::XPropertySet > & rPropertySet,
@@ -55,6 +56,7 @@ public:
             ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
         ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
             ::std::auto_ptr< ::com::sun::star::awt::Size >() );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     virtual ~TitleItemConverter();
 
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index ac45b985aad1..f6a740e3d53c 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -89,7 +89,9 @@ private:
     bool m_bIsClosable;
     sal_Int32 m_nOnePageOnlyIndex;//if nOnePageOnlyIndex is an index of an exsisting page starting with 0, then only this page is displayed without next/previous and roadmap
     ChartTypeTemplateProvider*   m_pTemplateProvider;
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< DialogModel > m_apDialogModel;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     WizardState m_nFirstState;
     WizardState m_nLastState;
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index f2ad9b27939b..449ca565fd33 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -88,6 +88,7 @@ namespace chart
 namespace wrapper
 {
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 AxisItemConverter::AxisItemConverter(
     const Reference< beans::XPropertySet > & rPropertySet,
     SfxItemPool& rItemPool,
@@ -118,6 +119,7 @@ AxisItemConverter::AxisItemConverter(
     m_xAxis.set( Reference< chart2::XAxis >( rPropertySet, uno::UNO_QUERY ) );
     OSL_ASSERT( m_xAxis.is());
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 AxisItemConverter::~AxisItemConverter()
 {
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index 4597499f7032..386a2e6c2214 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -88,6 +88,7 @@ CharacterPropertyItemConverter::CharacterPropertyItemConverter(
         ItemConverter( rPropertySet, rItemPool )
 {}
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 CharacterPropertyItemConverter::CharacterPropertyItemConverter(
     const uno::Reference< beans::XPropertySet > & rPropertySet,
     SfxItemPool& rItemPool,
@@ -99,6 +100,7 @@ CharacterPropertyItemConverter::CharacterPropertyItemConverter(
         m_aRefSizePropertyName( rRefSizePropertyName ),
         m_xRefSizePropSet( rRefSizePropSet.is() ? rRefSizePropSet : rPropertySet )
 {}
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 CharacterPropertyItemConverter::~CharacterPropertyItemConverter()
 {}
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 1c494c94de31..18d8b5abd298 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -208,6 +208,7 @@ namespace chart
 namespace wrapper
 {
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 DataPointItemConverter::DataPointItemConverter(
     const uno::Reference< frame::XModel > & xChartModel,
     const uno::Reference< uno::XComponentContext > & xContext,
@@ -256,6 +257,7 @@ DataPointItemConverter::DataPointItemConverter(
 
     m_bForbidPercentValue = AxisType::CATEGORY != ChartTypeHelper::getAxisType( xChartType, 0 );
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 DataPointItemConverter::~DataPointItemConverter()
 {
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index 75f2254c2218..43b7fd3b07a3 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -51,6 +51,7 @@ namespace chart
 namespace wrapper
 {
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 LegendItemConverter::LegendItemConverter(
     const ::com::sun::star::uno::Reference<
     ::com::sun::star::beans::XPropertySet > & rPropertySet,
@@ -67,6 +68,7 @@ LegendItemConverter::LegendItemConverter(
                                  rPropertySet, rItemPool, pRefSize,
                                  C2U( "ReferencePageSize" ) ));
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 LegendItemConverter::~LegendItemConverter()
 {
diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
index 46d5269793de..7ab399dedbe1 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
@@ -55,6 +55,7 @@ namespace wrapper
 
 //-----------------------------------------------------------------------------
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 AllAxisItemConverter::AllAxisItemConverter(
     const uno::Reference< frame::XModel > & xChartModel,
     SfxItemPool& rItemPool,
@@ -79,6 +80,7 @@ AllAxisItemConverter::AllAxisItemConverter(
                                          uno::Reference< chart2::XChartDocument >( xChartModel, uno::UNO_QUERY ), 0, 0 ) );
     }
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 AllAxisItemConverter::~AllAxisItemConverter()
 {
@@ -121,7 +123,7 @@ const sal_uInt16 * AllGridItemConverter::GetWhichPairs() const
 }
 
 //-----------------------------------------------------------------------------
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 AllDataLabelItemConverter::AllDataLabelItemConverter(
     const uno::Reference< frame::XModel > & xChartModel,
     SfxItemPool& rItemPool,
@@ -157,6 +159,7 @@ AllDataLabelItemConverter::AllDataLabelItemConverter(
                                          ));
     }
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 AllDataLabelItemConverter::~AllDataLabelItemConverter()
 {
@@ -169,7 +172,7 @@ const sal_uInt16 * AllDataLabelItemConverter::GetWhichPairs() const
 }
 
 //-----------------------------------------------------------------------------
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 AllTitleItemConverter::AllTitleItemConverter(
     const uno::Reference< frame::XModel > & xChartModel,
     SfxItemPool& rItemPool,
@@ -191,6 +194,7 @@ AllTitleItemConverter::AllTitleItemConverter(
                                      xObjectProperties, rItemPool, rDrawModel, xNamedPropertyContainerFactory, pSingleRefSize ));
     }
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 AllTitleItemConverter::~AllTitleItemConverter()
 {
diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
index 0244bc6cba92..12290d78812a 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
@@ -60,6 +60,7 @@ namespace chart
 namespace wrapper
 {
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 RegressionEquationItemConverter::RegressionEquationItemConverter(
     const ::com::sun::star::uno::Reference<
     ::com::sun::star::beans::XPropertySet > & rPropertySet,
@@ -76,8 +77,8 @@ RegressionEquationItemConverter::RegressionEquationItemConverter(
 
     m_aConverters.push_back( new CharacterPropertyItemConverter(
                                  rPropertySet, rItemPool, pRefSize, C2U("ReferencePageSize")));
-
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 RegressionEquationItemConverter::~RegressionEquationItemConverter()
 {
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index 2dd9d8730055..f6cb3c8ed5ac 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -68,11 +68,13 @@ namespace wrapper
 class FormattedStringsConverter : public ::comphelper::MultipleItemConverter
 {
 public:
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     FormattedStringsConverter(
         const uno::Sequence< uno::Reference< chart2::XFormattedString > > & aStrings,
         SfxItemPool & rItemPool,
         ::std::auto_ptr< awt::Size > pRefSize,
         const uno::Reference< beans::XPropertySet > & xParentProp );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     virtual ~FormattedStringsConverter();
 
 protected:
@@ -81,6 +83,7 @@ protected:
 
 // ----------------------------------------
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 FormattedStringsConverter::FormattedStringsConverter(
     const uno::Sequence< uno::Reference< chart2::XFormattedString > > & aStrings,
     SfxItemPool & rItemPool,
@@ -105,6 +108,7 @@ FormattedStringsConverter::FormattedStringsConverter(
         }
     }
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 FormattedStringsConverter::~FormattedStringsConverter()
 {
@@ -117,6 +121,7 @@ const sal_uInt16 * FormattedStringsConverter::GetWhichPairs() const
 
 // ========================================
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 TitleItemConverter::TitleItemConverter(
     const ::com::sun::star::uno::Reference<
     ::com::sun::star::beans::XPropertySet > & rPropertySet,
@@ -144,6 +149,7 @@ TitleItemConverter::TitleItemConverter(
         }
     }
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 TitleItemConverter::~TitleItemConverter()
 {
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index a84dccbaa2ef..6de3c53bdefe 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -85,6 +85,7 @@ using ::rtl::OUString;
 namespace
 {
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::comphelper::ItemConverter* createItemConverter(
     const ::rtl::OUString & aObjectCID
     , const uno::Reference< frame::XModel > & xChartModel
@@ -331,6 +332,7 @@ namespace
     }
     return pItemConverter;
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 rtl::OUString lcl_getTitleCIDForCommand( const ::rtl::OString& rDispatchCommand, const uno::Reference< frame::XModel > & xChartModel )
 {
@@ -752,6 +754,7 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl:
 
         awt::Size aPageSize( ChartModelHelper::getPageSize(getModel()) );
 
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr< ReferenceSizeProvider > pRefSizeProv(
             impl_createReferenceSizeProvider());
         ::std::auto_ptr< ::comphelper::ItemConverter > apItemConverter(
@@ -760,6 +763,7 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl:
                                  &aNumberFormatterWrapper,
                                  ExplicitValueProvider::getExplicitValueProvider(m_xChartView),
                                  pRefSizeProv ));
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         if(!apItemConverter.get())
             return bRet;
 
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 22418d3bce86..6ac32197406c 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -161,6 +161,7 @@ bool lcl_deleteDataCurve(
 namespace chart
 {
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr< ReferenceSizeProvider > ChartController::impl_createReferenceSizeProvider()
 {
     awt::Size aPageSize( ChartModelHelper::getPageSize( getModel() ) );
@@ -169,11 +170,14 @@ namespace chart
         new ReferenceSizeProvider( aPageSize,
             Reference< chart2::XChartDocument >( getModel(), uno::UNO_QUERY )));
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 void ChartController::impl_adaptDataSeriesAutoResize()
 {
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ReferenceSizeProvider > apRefSizeProvider(
         impl_createReferenceSizeProvider());
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     if( apRefSizeProvider.get())
         apRefSizeProvider->setValuesAtAllDataSeries();
 }
@@ -248,7 +252,9 @@ void ChartController::executeDispatch_ScaleText()
         String( SchResId( STR_ACTION_SCALE_TEXT )),
         m_xUndoManager );
     ControllerLockGuard aCtlLockGuard( getModel() );
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ReferenceSizeProvider > apRefSizeProv( impl_createReferenceSizeProvider());
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     OSL_ASSERT( apRefSizeProv.get());
     if( apRefSizeProv.get())
         apRefSizeProv->toggleAutoResizeState();
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 111982dbf2d2..51cb01697e08 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -556,12 +556,16 @@ void VCartesianAxis::createAllTickInfos( ::std::vector< ::std::vector< TickInfo
         VAxisBase::createAllTickInfos(rAllTickInfos);
 }
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr< TickIter > VCartesianAxis::createLabelTickIterator( sal_Int32 nTextLevel )
 {
     if( nTextLevel>=0 && nTextLevel < static_cast< sal_Int32 >(m_aAllTickInfos.size()) )
         return ::std::auto_ptr< TickIter >( new PureTickIter( m_aAllTickInfos[nTextLevel] ) );
     return ::std::auto_ptr< TickIter >();
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
+
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr< TickIter > VCartesianAxis::createMaximumLabelTickIterator( sal_Int32 nTextLevel )
 {
     if( isComplexCategoryAxis() || isDateAxis() )
@@ -581,6 +585,7 @@ void VCartesianAxis::createAllTickInfos( ::std::vector< ::std::vector< TickInfo
     }
     return ::std::auto_ptr< TickIter >();
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 sal_Int32 VCartesianAxis::getTextLevelCount() const
 {
@@ -1330,7 +1335,9 @@ void VCartesianAxis::doStaggeringOfLabels( const AxisLabelProperties& rAxisLabel
         B2DVector aCummulatedLabelsDistance(0,0);
         for( sal_Int32 nTextLevel=0; nTextLevel<nTextLevelCount; nTextLevel++ )
         {
+            SAL_WNODEPRECATED_DECLARATIONS_PUSH
             ::std::auto_ptr< TickIter > apTickIter = createLabelTickIterator( nTextLevel );
+            SAL_WNODEPRECATED_DECLARATIONS_POP
             if(apTickIter.get())
             {
                 double fRotationAngleDegree = m_aAxisLabelProperties.fRotationAngleDegree;
@@ -1368,7 +1375,9 @@ void VCartesianAxis::createLabels()
     //create labels
     if( m_aAxisProperties.m_bDisplayLabels )
     {
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         std::auto_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() );
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
         if( !pTickFactory2D )
             return;
@@ -1387,7 +1396,9 @@ void VCartesianAxis::createLabels()
         sal_Int32 nScreenDistanceBetweenTicks = -1;
         for( sal_Int32 nTextLevel=0; nTextLevel<nTextLevelCount; nTextLevel++ )
         {
+            SAL_WNODEPRECATED_DECLARATIONS_PUSH
             ::std::auto_ptr< TickIter > apTickIter = createLabelTickIterator( nTextLevel );
+            SAL_WNODEPRECATED_DECLARATIONS_POP
             if(apTickIter.get())
             {
                 if(nTextLevel==0)
@@ -1434,7 +1445,9 @@ void VCartesianAxis::createMaximumLabels()
     //create labels
     if( m_aAxisProperties.m_bDisplayLabels )
     {
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         std::auto_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() );
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
         if( !pTickFactory2D )
             return;
@@ -1454,7 +1467,9 @@ void VCartesianAxis::createMaximumLabels()
         sal_Int32 nTextLevelCount = getTextLevelCount();
         for( sal_Int32 nTextLevel=0; nTextLevel<nTextLevelCount; nTextLevel++ )
         {
+            SAL_WNODEPRECATED_DECLARATIONS_PUSH
             ::std::auto_ptr< TickIter > apTickIter = createMaximumLabelTickIterator( nTextLevel );
+            SAL_WNODEPRECATED_DECLARATIONS_POP
             if(apTickIter.get())
             {
                 while( !createTextShapes( m_xTextTarget, *apTickIter.get(), aAxisLabelProperties, pTickFactory2D, -1 ) )
@@ -1472,7 +1487,9 @@ void VCartesianAxis::updatePositions()
     //update positions of labels
     if( m_aAxisProperties.m_bDisplayLabels )
     {
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         std::auto_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() );
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
         if( !pTickFactory2D )
             return;
@@ -1569,7 +1586,9 @@ void VCartesianAxis::createShapes()
     if( !prepareShapeCreation() )
         return;
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     std::auto_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
     if( !pTickFactory2D )
         return;
@@ -1593,7 +1612,9 @@ void VCartesianAxis::createShapes()
             sal_Int32 nTextLevelCount = getTextLevelCount();
             for( sal_Int32 nTextLevel=0; nTextLevel<nTextLevelCount; nTextLevel++ )
             {
+                SAL_WNODEPRECATED_DECLARATIONS_PUSH
                 ::std::auto_ptr< TickIter > apTickIter = createLabelTickIterator( nTextLevel );
+                SAL_WNODEPRECATED_DECLARATIONS_POP
                 if( apTickIter.get() )
                 {
                     double fRotationAngleDegree = m_aAxisLabelProperties.fRotationAngleDegree;
diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx
index 4f811a6d8667..a7738e7f54f4 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -234,6 +234,7 @@ private: //member
     sal_Int32               m_nGlobalSeriesIndex;
 
     //some cached values for data labels as they are very expensive
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     mutable ::std::auto_ptr< ::com::sun::star::chart2::DataPointLabel >
                                                     m_apLabel_Series;
     mutable ::std::auto_ptr< tNameSequence >        m_apLabelPropNames_Series;
@@ -249,6 +250,7 @@ private: //member
                                                     m_apSymbolProperties_AttributedPoint;
     mutable ::std::auto_ptr< ::com::sun::star::chart2::Symbol >
                                                     m_apSymbolProperties_InvisibleSymbolForSelection;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     mutable sal_Int32                               m_nCurrentAttributedPoint;
     ::com::sun::star::awt::Size                     m_aReferenceSize;
 
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 779c57498f90..72f1a4a8655b 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2127,6 +2127,7 @@ void changePositionOfAxisTitle( VTitle* pVTitle, TitleAlignment eAlignment
     pVTitle->changePosition( aNewPosition );
 }
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 std::auto_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType
                 , const uno::Reference< drawing::XShapes>& xPageShapes
                 , const uno::Reference< lang::XMultiServiceFactory>& xShapeFactory
@@ -2269,6 +2270,7 @@ std::auto_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType
     }
     return apVTitle;
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 bool lcl_createLegend( const uno::Reference< XLegend > & xLegend
                    , const uno::Reference< drawing::XShapes>& xPageShapes
@@ -2477,7 +2479,9 @@ void ChartView::createShapes()
         uno::Reference< drawing::XShapes > xDiagramPlusAxes_Shapes( ShapeFactory(m_xShapeFactory).createGroup2D(xDiagramPlusAxesPlusMarkHandlesGroup_Shapes ) );
 
         //------------ create some titles
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         std::auto_ptr<VTitle> apVTitle(0);
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         bool bAutoPositionDummy = true;
 
         //------------ create main title shape
@@ -2509,7 +2513,9 @@ void ChartView::createShapes()
 
         //------------ create x axis title
         bool bAutoPosition_XTitle = true;
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         std::auto_ptr<VTitle> apVTitle_X;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         if( ChartTypeHelper::isSupportingMainAxis( xChartType, nDimension, 0 ) )
             apVTitle_X = lcl_createTitle( TitleHelper::TITLE_AT_STANDARD_X_AXIS_POSITION, xPageShapes, m_xShapeFactory, m_xChartModel
                     , aRemainingSpace, aPageSize, ALIGN_BOTTOM, bAutoPosition_XTitle );
@@ -2518,7 +2524,9 @@ void ChartView::createShapes()
 
         //------------ create y axis title
         bool bAutoPosition_YTitle = true;
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         std::auto_ptr<VTitle> apVTitle_Y;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         if( ChartTypeHelper::isSupportingMainAxis( xChartType, nDimension, 1 ) )
             apVTitle_Y = lcl_createTitle( TitleHelper::TITLE_AT_STANDARD_Y_AXIS_POSITION, xPageShapes, m_xShapeFactory, m_xChartModel
                     , aRemainingSpace, aPageSize, ALIGN_LEFT, bAutoPosition_YTitle );
@@ -2527,7 +2535,9 @@ void ChartView::createShapes()
 
         //------------ create z axis title
         bool bAutoPosition_ZTitle = true;
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         std::auto_ptr<VTitle> apVTitle_Z;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         if( ChartTypeHelper::isSupportingMainAxis( xChartType, nDimension, 2 ) )
             apVTitle_Z = lcl_createTitle( TitleHelper::Z_AXIS_TITLE, xPageShapes, m_xShapeFactory, m_xChartModel
                     , aRemainingSpace, aPageSize, ALIGN_RIGHT, bAutoPosition_ZTitle );
@@ -2539,7 +2549,9 @@ void ChartView::createShapes()
 
         //------------ create secondary x axis title
         bool bAutoPosition_SecondXTitle = true;
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         std::auto_ptr<VTitle> apVTitle_SecondX;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         if( ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimension, 0 ) )
             apVTitle_SecondX = lcl_createTitle( TitleHelper::SECONDARY_X_AXIS_TITLE, xPageShapes, m_xShapeFactory, m_xChartModel
                     , aRemainingSpace, aPageSize, bIsVertical? ALIGN_RIGHT : ALIGN_TOP, bAutoPosition_SecondXTitle );
@@ -2548,7 +2560,9 @@ void ChartView::createShapes()
 
         //------------ create secondary y axis title
         bool bAutoPosition_SecondYTitle = true;
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         std::auto_ptr<VTitle> apVTitle_SecondY;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         if( ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimension, 1 ) )
             apVTitle_SecondY = lcl_createTitle( TitleHelper::SECONDARY_Y_AXIS_TITLE, xPageShapes, m_xShapeFactory, m_xChartModel
                     , aRemainingSpace, aPageSize, bIsVertical? ALIGN_TOP : ALIGN_RIGHT, bAutoPosition_SecondYTitle );
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index e63dba596ed0..4748eff81255 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -742,6 +742,7 @@ double VDataSeries::getYMeanValue() const
     return m_fYMeanValue;
 }
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr< Symbol > getSymbolPropertiesFromPropertySet(
         const uno::Reference< beans::XPropertySet >& xProp )
 {
@@ -764,6 +765,7 @@ double VDataSeries::getYMeanValue() const
     }
     return apSymbolProps;
 }
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 
 Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const
 {
@@ -784,7 +786,9 @@ Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const
             {
                 if(!m_apSymbolProperties_InvisibleSymbolForSelection.get())
                 {
+                    SAL_WNODEPRECATED_DECLARATIONS_PUSH
                     m_apSymbolProperties_InvisibleSymbolForSelection = ::std::auto_ptr< Symbol >( new Symbol() );
+                    SAL_WNODEPRECATED_DECLARATIONS_POP
                     m_apSymbolProperties_InvisibleSymbolForSelection->Style = SymbolStyle_STANDARD;
                     m_apSymbolProperties_InvisibleSymbolForSelection->StandardSymbol = 0;//square
                     m_apSymbolProperties_InvisibleSymbolForSelection->Size = m_apSymbolProperties_Series->Size;
@@ -876,6 +880,7 @@ uno::Reference< beans::XPropertySet > VDataSeries::getPropertiesOfSeries() const
     return  uno::Reference<beans::XPropertySet>(m_xDataSeries, uno::UNO_QUERY );
 }
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr< DataPointLabel > getDataPointLabelFromPropertySet(
         const uno::Reference< beans::XPropertySet >& xProp )
 {
@@ -891,6 +896,7 @@ uno::Reference< beans::XPropertySet > VDataSeries::getPropertiesOfSeries() const
     }
     return apLabel;
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 void VDataSeries::adaptPointCache( sal_Int32 nNewPointIndex ) const
 {
@@ -953,8 +959,10 @@ bool VDataSeries::getTextLabelMultiPropertyLists( sal_Int32 index
             pPropValues = new tAnySequence();
             xTextProp.set( this->getPropertiesOfPoint( index ));
             PropertyMapper::getTextLabelMultiPropertyLists( xTextProp, *pPropNames, *pPropValues );
+            SAL_WNODEPRECATED_DECLARATIONS_PUSH
             m_apLabelPropNames_AttributedPoint = ::std::auto_ptr< tNameSequence >(pPropNames);
             m_apLabelPropValues_AttributedPoint = ::std::auto_ptr< tAnySequence >(pPropValues);
+            SAL_WNODEPRECATED_DECLARATIONS_POP
             bDoDynamicFontResize = true;
         }
         pPropNames = m_apLabelPropNames_AttributedPoint.get();
@@ -968,8 +976,10 @@ bool VDataSeries::getTextLabelMultiPropertyLists( sal_Int32 index
             pPropValues = new tAnySequence();
             xTextProp.set( this->getPropertiesOfPoint( index ));
             PropertyMapper::getTextLabelMultiPropertyLists( xTextProp, *pPropNames, *pPropValues );
+            SAL_WNODEPRECATED_DECLARATIONS_PUSH
             m_apLabelPropNames_Series = ::std::auto_ptr< tNameSequence >(pPropNames);
             m_apLabelPropValues_Series = ::std::auto_ptr< tAnySequence >(pPropValues);
+            SAL_WNODEPRECATED_DECLARATIONS_POP
             bDoDynamicFontResize = true;
         }
         pPropNames = m_apLabelPropNames_Series.get();