just silence the auto_ptr deprecations in isolation

6 files changed, 16 insertions, 3 deletions

diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx
index 3e3a873b5482..9ceaa157e215 100644
--- a/extensions/source/propctrlr/defaultforminspection.hxx
+++ b/extensions/source/propctrlr/defaultforminspection.hxx
@@ -51,7 +51,9 @@ namespace pcr
         bool                                        m_bConstructed;
 
         /// access to property meta data
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr< OPropertyInfoService >     m_pInfoService;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
 
     protected:
         ~DefaultFormComponentInspectorModel();
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index 54f78e55a013..34b723c33c11 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -256,7 +256,9 @@ namespace pcr
     {
         if ( !_bDoListen )
         {
+            SAL_WNODEPRECATED_DECLARATIONS_PUSH
             ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator();
+            SAL_WNODEPRECATED_DECLARATIONS_POP
             while ( pListenerIterator->hasMoreElements() )
             {
                 PropertyEventTranslation* pTranslator = dynamic_cast< PropertyEventTranslation* >( pListenerIterator->next() );
@@ -290,7 +292,9 @@ namespace pcr
             }
             else
             {
+                SAL_WNODEPRECATED_DECLARATIONS_PUSH
                 ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator();
+                SAL_WNODEPRECATED_DECLARATIONS_POP
                 while ( pListenerIterator->hasMoreElements() )
                 {
                     Reference< XPropertyChangeListener > xListener( pListenerIterator->next(), UNO_QUERY );
diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx
index a660a569cd89..1aa488cdbcae 100644
--- a/extensions/source/propctrlr/formlinkdialog.hxx
+++ b/extensions/source/propctrlr/formlinkdialog.hxx
@@ -57,10 +57,12 @@ namespace pcr
         FixedText                       m_aExplanation;
         FixedText                       m_aDetailLabel;
         FixedText                       m_aMasterLabel;
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr< FieldLinkRow > m_aRow1;
         ::std::auto_ptr< FieldLinkRow > m_aRow2;
         ::std::auto_ptr< FieldLinkRow > m_aRow3;
         ::std::auto_ptr< FieldLinkRow > m_aRow4;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         OKButton                        m_aOK;
         CancelButton                    m_aCancel;
         HelpButton                      m_aHelp;
diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx
index b1d5cbedbe9c..cbfd8c820912 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -69,7 +69,9 @@ namespace pcr
 
     private:
         HandlerArray                                    m_aSlaveHandlers;
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr< ComposedPropertyUIUpdate >     m_pUIRequestComposer;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         PropertyChangeListeners                         m_aPropertyListeners;
         bool                                            m_bSupportedPropertiesAreKnown;
         PropertyBag                                     m_aSupportedProperties;
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index c3fe86810dba..68dfdf808134 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -102,8 +102,10 @@ namespace pcr
             return;
 
         // remove all old property change listeners
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > removeListener = m_aPropertyListeners.createIterator();
         ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > readdListener = m_aPropertyListeners.createIterator();  // will copy the container as needed
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         while ( removeListener->hasMoreElements() )
             removePropertyChangeListener( static_cast< XPropertyChangeListener* >( removeListener->next() ) );
         OSL_ENSURE( m_aPropertyListeners.empty(), "PropertyHandler::inspect: derived classes are expected to forward the removePropertyChangeListener call to their base class (me)!" );
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index b065ee6d899e..ee55c3d8845c 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -61,6 +61,7 @@
 #include <memory>
 #include <limits>
 #include <boost/bind.hpp>
+#include <boost/scoped_ptr.hpp>
 
 //............................................................................
 namespace pcr
@@ -1079,16 +1080,16 @@ namespace pcr
     DropDownEditControl::~DropDownEditControl()
     {
         {
-            ::std::auto_ptr<Window> aTemp(m_pFloatingEdit);
+            boost::scoped_ptr<Window> aTemp(m_pFloatingEdit);
             m_pFloatingEdit = NULL;
         }
         {
-            ::std::auto_ptr<Window> aTemp(m_pImplEdit);
+            boost::scoped_ptr<Window> aTemp(m_pImplEdit);
             SetSubEdit( NULL );
             m_pImplEdit = NULL;
         }
         {
-            ::std::auto_ptr<Window> aTemp(m_pDropdownButton);
+            boost::scoped_ptr<Window> aTemp(m_pDropdownButton);
             m_pDropdownButton = NULL;
         }
     }