just silence the auto_ptr deprecations in isolation

9 files changed, 26 insertions, 0 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;