just silence the auto_ptr deprecations in isolation

10 files changed, 44 insertions, 2 deletions

diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index 2cb6e87e1ec9..72dd4e132451 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -284,8 +284,10 @@ namespace accessibility
         if( mrObj.GetModel() )
             EndListening( *mrObj.GetModel() );
 
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr< SvxEditSource > pProxySource( new AccessibleProxyEditSource_Impl(mrObj, mrView, mrViewWindow) );
         ::std::auto_ptr< SvxEditSource > tmp = mpEditSource;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         mpEditSource = pProxySource;
         pProxySource = tmp;
 
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 6de9d83f1a0f..13bedfa86339 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -185,13 +185,17 @@ void AccessibleShape::Init (void)
                 if( !pOutlinerParaObject )
                 {
                     // empty text -> use proxy edit source to delay creation of EditEngine
+                    SAL_WNODEPRECATED_DECLARATIONS_PUSH
                     ::std::auto_ptr<SvxEditSource> pEditSource( new AccessibleEmptyEditSource ( *pSdrObject, *pView, *pWindow) );
+                    SAL_WNODEPRECATED_DECLARATIONS_POP
                     mpText = new AccessibleTextHelper( pEditSource );
                 }
                 else
                 {
                     // non-empty text -> use full-fledged edit source right away
+                    SAL_WNODEPRECATED_DECLARATIONS_PUSH
                     ::std::auto_ptr<SvxEditSource> pEditSource( new SvxTextEditSource ( *pSdrObject, 0, *pView, *pWindow) );
+                    SAL_WNODEPRECATED_DECLARATIONS_POP
                     mpText = new AccessibleTextHelper( pEditSource );
                 }
 
diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx
index b051b8bf468f..3b49a060c0b0 100644
--- a/svx/source/accessibility/AccessibleTextEventQueue.cxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx
@@ -78,12 +78,14 @@ namespace accessibility
         maEventQueue.push_back( new SvxEditSourceHint( rHint ) );
     }
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< SfxHint > AccessibleTextEventQueue::PopFront()
     {
         ::std::auto_ptr< SfxHint > aRes( *(maEventQueue.begin()) );
         maEventQueue.pop_front();
         return aRes;
     }
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     bool AccessibleTextEventQueue::IsEmpty() const
     {
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 11288f37823f..b780f9f4706f 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -123,7 +123,9 @@ namespace accessibility
         uno::Reference< XAccessible > SAL_CALL getAccessibleAtPoint( const awt::Point& aPoint ) SAL_THROW((uno::RuntimeException));
 
         SvxEditSourceAdapter& GetEditSource() const SAL_THROW((uno::RuntimeException));
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException));
+        SAL_WNODEPRECATED_DECLARATIONS_POP
 
         void SetEventSource( const uno::Reference< XAccessible >& rInterface )
         {
@@ -762,9 +764,12 @@ namespace accessibility
         if( maEditSource.IsValid() )
             EndListening( maEditSource.GetBroadcaster() );
 
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         maEditSource.SetEditSource( ::std::auto_ptr< SvxEditSource >(NULL) );
+        SAL_WNODEPRECATED_DECLARATIONS_POP
     }
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     void AccessibleTextHelper_Impl::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException))
     {
         DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
@@ -788,6 +793,7 @@ namespace accessibility
             UpdateVisibleChildren();
         }
     }
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     void AccessibleTextHelper_Impl::SetOffset( const Point& rPoint )
     {
@@ -1244,7 +1250,9 @@ namespace accessibility
 
         while( !maEventQueue.IsEmpty() )
         {
+            SAL_WNODEPRECATED_DECLARATIONS_PUSH
             ::std::auto_ptr< SfxHint > pHint( maEventQueue.PopFront() );
+            SAL_WNODEPRECATED_DECLARATIONS_POP
             if( pHint.get() )
             {
                 const SfxHint& rHint = *(pHint.get());
@@ -1575,7 +1583,9 @@ namespace accessibility
             EndListening( maEditSource.GetBroadcaster() );
 
         // clear references
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         maEditSource.SetEditSource( ::std::auto_ptr< SvxEditSource >(NULL) );
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         mxFrontEnd = NULL;
     }
 
@@ -1714,6 +1724,7 @@ namespace accessibility
     //
     //------------------------------------------------------------------------
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     AccessibleTextHelper::AccessibleTextHelper( ::std::auto_ptr< SvxEditSource > pEditSource ) :
         mpImpl( new AccessibleTextHelper_Impl() )
     {
@@ -1721,6 +1732,7 @@ namespace accessibility
 
         SetEditSource( pEditSource );
     }
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
 
     AccessibleTextHelper::~AccessibleTextHelper()
     {
@@ -1741,6 +1753,7 @@ namespace accessibility
 #endif
     }
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     void AccessibleTextHelper::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException))
     {
 #ifdef DBG_UTIL
@@ -1756,6 +1769,7 @@ namespace accessibility
         mpImpl->CheckInvariants();
 #endif
     }
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     void AccessibleTextHelper::SetEventSource( const uno::Reference< XAccessible >& rInterface )
     {
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index a713dc83a650..5b43b6210e99 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1840,7 +1840,9 @@ String DbPatternField::impl_formatText( const String& _rText )
 String DbPatternField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/)
 {
     bool bIsForPaint = _rxField != m_rColumn.GetField();
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ::dbtools::FormattedColumnValue >& rpFormatter = bIsForPaint ? m_pPaintFormatter : m_pValueFormatter;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     if ( !rpFormatter.get() )
     {
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index bc4310c7357c..d5bd1a431c90 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -320,6 +320,7 @@ namespace svxform
     }
 
     //----------------------------------------------------------------
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ::dbtools::FormattedColumnValue > DBToolsObjectFactory::createFormattedColumnValue(
         const ::comphelper::ComponentContext& _rContext, const Reference< XRowSet >& _rxRowSet, const Reference< XPropertySet >& _rxColumn )
     {
@@ -328,6 +329,7 @@ namespace svxform
             pValue = getFactory()->createFormattedColumnValue( _rContext, _rxRowSet, _rxColumn );
         return pValue;
     }
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
 //........................................................................
 }   // namespace svxform
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index df6aa255cc62..6602b1846acf 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -102,6 +102,8 @@
 #include <comphelper/property.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
+#include <boost/scoped_ptr.hpp>
+
 // wird fuer Invalidate verwendet -> mitpflegen
 // aufsteigend sortieren !!!!!!
 sal_uInt16 ControllerSlotMap[] =    // slots des Controllers
@@ -773,7 +775,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
                 DBG_ASSERT( pFact, "no dialog factory!" );
                 if ( pFact )
                 {
-                    ::std::auto_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( NULL ) );
+                    boost::scoped_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( NULL ) );
                     DBG_ASSERT( dlg.get(), "Dialogdiet fail!" );
                     dlg->SetValue( rController->getCursor()->getRow() );
                     if ( dlg->Execute() == RET_OK )
@@ -1398,6 +1400,7 @@ namespace
 }
 
 //------------------------------------------------------------------------
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) const
 {
     ::std::auto_ptr< ::svx::ISdrObjectFilter > pFilter;
@@ -1407,6 +1410,7 @@ namespace
 
     return pFilter;
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 //------------------------------------------------------------------------
 SdrUnoObj* FmFormShell::GetFormControl( const Reference< XControlModel >& _rxModel, const SdrView& _rView, const OutputDevice& _rDevice, Reference< XControl >& _out_rxControl ) const
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 044335f0315a..37828f35c71f 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1559,7 +1559,9 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext&
     bool bNeedLabel = ( _nControlObjectID != OBJ_FM_CHECKBOX );
 
     // the label
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< SdrUnoObj > pLabel;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     Reference< XPropertySet > xLabelModel;
     if ( bNeedLabel )
     {
@@ -1591,8 +1593,10 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext&
     }
 
     // the control
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< SdrUnoObj > pControl( dynamic_cast< SdrUnoObj* >(
         SdrObjFactory::MakeNewObject( _nInventor, _nControlObjectID, _pControlPage, _pModel ) ) );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     OSL_ENSURE( pControl.get(), "FmXFormView::createControlLabelPair: could not create the control!" );
     if ( !pControl.get() )
         return false;
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 5cd19569344b..4de354192788 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -560,8 +560,10 @@ private:
     String  impl_formatText( const String& _rText );
 
 private:
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ::dbtools::FormattedColumnValue >  m_pValueFormatter;
     ::std::auto_ptr< ::dbtools::FormattedColumnValue >  m_pPaintFormatter;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     ::comphelper::ComponentContext                      m_aContext;
 };
 
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index db9dcd90e079..046804b4d35e 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -190,7 +190,9 @@ class SvxFontNameBox_Impl : public FontNameBox
     using Window::Update;
 private:
     const FontList*                pFontList;
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<FontList>      m_aOwnFontList;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     Font                           aCurFont;
     Size                           aLogicalSize;
     String                         aCurText;
@@ -221,7 +223,9 @@ public:
     virtual long    PreNotify( NotifyEvent& rNEvt );
     virtual long    Notify( NotifyEvent& rNEvt );
     virtual Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
-    inline void     SetOwnFontList(::std::auto_ptr<FontList> _aOwnFontList) { m_aOwnFontList = _aOwnFontList; }
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
+    void     SetOwnFontList(::std::auto_ptr<FontList> _aOwnFontList) { m_aOwnFontList = _aOwnFontList; }
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 };
 
 //========================================================================
@@ -555,7 +559,9 @@ sal_Bool GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl*
             (SvxFontListItem*)pDocSh->GetItem( SID_ATTR_CHAR_FONTLIST );
     else
     {
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr<FontList> aFontList(new FontList( pBox ));
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         *ppFontList = aFontList.get();
         pBox->SetOwnFontList(aFontList);
         bChanged = sal_True;