just silence the auto_ptr deprecations in isolation

4 files changed, 24 insertions, 0 deletions

diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index 397bb804c829..ab5a8927bad2 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -75,9 +75,13 @@ OJoinDesignView::OJoinDesignView(Window* _pParent, OJoinController& _rController
 // -----------------------------------------------------------------------------
 OJoinDesignView::~OJoinDesignView()
 {
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<Window> aT3(m_pScrollWindow);
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     m_pScrollWindow = NULL;
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<Window> aT2(m_pTableView);
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     m_pTableView = NULL;
 }
 // -------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index f2d906e5017a..6d5c6944f711 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -103,7 +103,9 @@ OScrollWindowHelper::OScrollWindowHelper( Window* pParent) : Window( pParent)
 OScrollWindowHelper::~OScrollWindowHelper()
 {
     DBG_DTOR(OScrollWindowHelper,NULL);
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<Window> aTemp(m_pCornerWindow);
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     m_pCornerWindow = NULL;
     m_pTableView = NULL;
 }
@@ -1632,7 +1634,9 @@ void OJoinTableView::clearLayoutInformation()
     {
         if ( aIter->second )
             aIter->second->clearListBox();
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr<Window> aTemp(aIter->second);
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         aIter->second = NULL;
     }
 
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 27912e355d69..8fc9e70e313b 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -789,7 +789,9 @@ namespace
                             ::rtl::OUString aTmp = aCriteria;
                             ::rtl::OUString aErrorMsg;
                             Reference<XPropertySet> xColumn;
+                            SAL_WNODEPRECATED_DECLARATIONS_PUSH
                             ::std::auto_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
+                            SAL_WNODEPRECATED_DECLARATIONS_POP
                             if (pParseNode.get())
                             {
                                 if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*')))
@@ -820,7 +822,9 @@ namespace
                             ::rtl::OUString aTmp = aCriteria;
                             ::rtl::OUString aErrorMsg;
                             Reference<XPropertySet> xColumn;
+                            SAL_WNODEPRECATED_DECLARATIONS_PUSH
                             ::std::auto_ptr< ::connectivity::OSQLParseNode> pParseNode( _pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
+                            SAL_WNODEPRECATED_DECLARATIONS_POP
                             if (pParseNode.get())
                             {
                                 if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*')))
@@ -1182,7 +1186,9 @@ namespace
                         ::rtl::OUString aTmp = pEntryField->GetField();
                         ::rtl::OUString aErrorMsg;
                         Reference<XPropertySet> xColumn;
+                        SAL_WNODEPRECATED_DECLARATIONS_PUSH
                         ::std::auto_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
+                        SAL_WNODEPRECATED_DECLARATIONS_POP
                         if (pParseNode.get())
                         {
                             ::rtl::OUString sGroupBy;
@@ -2549,7 +2555,9 @@ OQueryDesignView::~OQueryDesignView()
 {
     if ( m_pTableView )
         ::dbaui::notifySystemWindow(this,m_pTableView,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<Window> aTemp(m_pSelectionBox);
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     m_pSelectionBox = NULL;
 
     DBG_DTOR(OQueryDesignView,NULL);
@@ -2952,7 +2960,9 @@ sal_Bool OQueryDesignView::checkStatement()
     {
         ::connectivity::OSQLParser& rParser( rController.getParser() );
         ::rtl::OUString sErrorMessage;
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr<OSQLParseNode> pParseNode( rParser.parseTree( sErrorMessage, sSQL, sal_True ) );
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         if ( pParseNode.get() )
         {
             OSQLParseNode* pNode = pParseNode->getChild(3)->getChild(1);
@@ -3066,7 +3076,9 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
             sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM x WHERE "));
             sSql += pEntry->GetField();
             sSql += _sCriteria;
+            SAL_WNODEPRECATED_DECLARATIONS_PUSH
             ::std::auto_ptr<OSQLParseNode> pParseNode( rParser.parseTree( _rsErrorMessage, sSql, sal_True ) );
+            SAL_WNODEPRECATED_DECLARATIONS_POP
             nType = DataType::DOUBLE;
             if ( pParseNode.get() )
             {
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index 0ad058656489..e79bed250f34 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -57,11 +57,15 @@ OQueryViewSwitch::~OQueryViewSwitch()
 {
     DBG_DTOR(OQueryViewSwitch,NULL);
     {
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr<Window> aTemp(m_pTextView);
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         m_pTextView = NULL;
     }
     {
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr<Window> aTemp(m_pDesignView);
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         m_pDesignView = NULL;
     }
 }