just silence the auto_ptr deprecations in isolation

11 files changed, 50 insertions, 2 deletions

diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index e7cc2b664108..98909e81b18d 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -1496,7 +1496,9 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa
     UniReference< 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
     if ( _bAddParagraph )
         pParagraphContent.reset(new SvXMLElementExport(*this,XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False));
 
@@ -1507,7 +1509,9 @@ 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
             uno::Reference< frame::XModel> xModel(xShape->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model"))),uno::UNO_QUERY);
             if ( xModel.is() ) // special handling for chart object
             {
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index 73ba163f7b39..756d7661a50b 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -201,7 +201,9 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
     {
         const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
         static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr<SvXMLTokenMap> pMasterElemTokenMap( OXMLHelper::GetSubDocumentElemTokenMap());
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         try
         {
             ::rtl::OUString sMasterField,sDetailField;
@@ -247,7 +249,9 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
     {
         sal_Bool bHasCategories = sal_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
         for(sal_Int16 i = 0; i < nLength; ++i)
         {
             ::rtl::OUString sLocalName;
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
index 4ea40033edda..efed1a7f69f1 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
@@ -98,7 +98,9 @@ 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
 };
 // -----------------------------------------------------------------------------
 } // namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index 9e4970d97d3d..07bc1fc42f8e 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -84,6 +84,8 @@ private:
     TGroupFunctionMap                               m_aFunctions;
     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;
@@ -97,6 +99,7 @@ private:
     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
 
     UniReference < XMLPropertyHandlerFactory >      m_xPropHdlFactory;
     UniReference < XMLPropertySetMapper >           m_xCellStylesPropertySetMapper;
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 60e97c7257a5..5092c43265c2 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -42,6 +42,8 @@
 #include <formula/funcutl.hxx>
 #include <formula/tokenarray.hxx>
 
+#include <boost/scoped_ptr.hpp>
+
 #include "Formula.hxx"
 #include "AddField.hxx"
 #include "helpids.hrc"
@@ -103,7 +105,7 @@ FormulaDialog::~FormulaDialog()
         SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) );
         aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US));
 
-        ::std::auto_ptr<Window> aTemp2(m_pAddField);
+        boost::scoped_ptr<Window> aTemp2(m_pAddField);
         m_pAddField = NULL;
     }
 }
@@ -263,12 +265,14 @@ table::CellAddress FormulaDialog::getReferencePosition() const
     return table::CellAddress();
 }
 // -----------------------------------------------------------------------------
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr<formula::FormulaTokenArray> FormulaDialog::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >& _aTokenList)
 {
     ::std::auto_ptr<formula::FormulaTokenArray> pArray(new FormulaTokenArray());
     pArray->Fill(_aTokenList, NULL);
     return pArray;
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 // =============================================================================
 } // rptui
 // =============================================================================
diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx
index 458debb305b3..9fa7e61616a1 100644
--- a/reportdesign/source/ui/inc/DataProviderHandler.hxx
+++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx
@@ -121,7 +121,9 @@ 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
     };
 //........................................................................
 } // namespace rptui
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index 91504e7f1cb9..68053cd2c062 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -308,7 +308,9 @@ 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
         mutable ::rtl::OUString                                                             m_sDefaultFunction;
         mutable ::rtl::OUString                                                             m_sScope;
         sal_uInt32                                                                          m_nDataFieldType;
diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
index c2b1929e1612..b315743e50f1 100644
--- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx
+++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
@@ -107,7 +107,9 @@ 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
     };
 //........................................................................
 } // namespace rptui
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index abde2bced493..4904169a89ab 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -284,7 +284,9 @@ 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
                     pClone->PutValue(_xShape->getPropertyValue(aIt->sName), aIt->nMemberId);
                     _rItemSet.Put(*pClone, aIt->nWID);
                 }
@@ -656,8 +658,10 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
         { SID_ATTR_CHAR_CTL_WEIGHT, SFX_ITEM_POOLABLE }
     };
     Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow );
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<FontList> pFontList(new FontList( pParent ));
     ::std::auto_ptr<XColorList> pColorTable( new XColorList( SvtPathOptions().GetPalettePath() ));
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     SfxPoolItem* pDefaults[] =
     {
         new SvxFontItem(ITEMID_FONT),
@@ -718,7 +722,9 @@ 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
         lcl_CharPropertiesToItems( _rxReportControlFormat, *pDescriptor );
 
         {   // want the dialog to be destroyed before our set
@@ -761,13 +767,16 @@ 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
         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() ));
+            SAL_WNODEPRECATED_DECLARATIONS_POP
             // #i74099# by default, the dialog deletes the current color table if a different one is loaded
             // (see SwDrawShell::ExecDrawDlg)
             const SvxColorTableItem* pColorItem = static_cast<const SvxColorTableItem*>( pDescriptor->GetItem(SID_COLOR_TABLE) );
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 26aa98a447d1..c7940bae74a1 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -196,7 +196,9 @@ ODesignView::~ODesignView()
     if ( m_pPropWin )
     {
         notifySystemWindow(this,m_pPropWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr<Window> aTemp2(m_pPropWin);
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         m_pPropWin = NULL;
     }
     if ( m_pAddField )
@@ -204,7 +206,9 @@ ODesignView::~ODesignView()
         SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( UID_RPT_RPT_APP_VIEW ) );
         aDlgOpt.SetWindowState(::rtl::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<Window> aTemp2(m_pAddField);
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         m_pAddField = NULL;
     }
     if ( m_pReportExplorer )
@@ -212,11 +216,15 @@ ODesignView::~ODesignView()
         SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_NAVIGATOR ) );
         aDlgOpt.SetWindowState(::rtl::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<Window> aTemp2(m_pReportExplorer);
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         m_pReportExplorer = NULL;
     }
     {
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr<Window> aTemp2(m_pTaskPane);
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         m_pTaskPane = NULL;
     }
 }
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 781a78aec69b..d8aa5ebafd95 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -351,7 +351,9 @@ void OReportController::disposing()
     {
         SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_GROUPS_SORTING ) );
         aDlgOpt.SetWindowState(::rtl::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
         m_pGroupsFloater = NULL;
     }
 
@@ -2425,7 +2427,9 @@ 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
         // fill it
         if ( _xSection.is() )
             pDescriptor->Put(SvxBrushItem(::Color(_xSection->getBackColor()),ITEMID_BRUSH));
@@ -4232,13 +4236,17 @@ 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
             // 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
             pDlg->SetLimits( 20, 400 );
             bool bCancel = ( RET_CANCEL == pDlg->Execute() );