From 3b06e5e646878c751c02f395dce9002822895f07 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Sat, 22 Feb 2014 21:51:27 +0900 Subject: Replace deprecated std::auto_ptr with boost::scoped_ptr Change-Id: I1ebfb33063d39f64dc59623df0f942501870c4e7 --- dbaccess/source/core/dataaccess/intercept.cxx | 3 ++- dbaccess/source/filter/xml/xmlExport.cxx | 13 ++++------- dbaccess/source/ui/app/AppDetailPageHelper.cxx | 14 +++++------- dbaccess/source/ui/app/AppTitleWindow.cxx | 4 ++-- dbaccess/source/ui/app/AppView.cxx | 13 ++++------- dbaccess/source/ui/browser/brwview.cxx | 5 +++-- dbaccess/source/ui/browser/dbtreeview.cxx | 3 ++- dbaccess/source/ui/browser/dsEntriesNoExp.cxx | 3 ++- dbaccess/source/ui/browser/genericcontroller.cxx | 3 ++- dbaccess/source/ui/querydesign/JoinController.cxx | 3 ++- dbaccess/source/ui/querydesign/JoinDesignView.cxx | 8 ++----- dbaccess/source/ui/querydesign/JoinTableView.cxx | 9 +++----- dbaccess/source/ui/querydesign/QueryDesignView.cxx | 25 ++++++---------------- dbaccess/source/ui/querydesign/QueryTextView.cxx | 3 ++- dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 9 +++----- dbaccess/source/ui/querydesign/TableWindow.cxx | 4 +++- .../source/ui/querydesign/querycontainerwindow.cxx | 5 +++-- dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 3 ++- dbaccess/source/ui/tabledesign/TableDesignView.cxx | 13 ++++------- 19 files changed, 57 insertions(+), 86 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index ac6faff1a11b..fb9eb92f8a60 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -30,6 +30,7 @@ #include #include +#include namespace dbaccess { @@ -182,7 +183,7 @@ void SAL_CALL OInterceptor::dispatch( const URL& _URL,const Sequence pHelper( reinterpret_cast< DispatchHelper* >( _pDispatcher ) ); + boost::scoped_ptr pHelper( reinterpret_cast< DispatchHelper* >( _pDispatcher ) ); try { if ( m_pContentHolder && m_pContentHolder->prepareClose() && m_xSlaveDispatchProvider.is() ) diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 866436ed21ef..5bd8dc5be669 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -52,6 +52,7 @@ #include #include +#include namespace dbaxml { @@ -837,9 +838,7 @@ void ODBExport::exportCollection(const Reference< XNameAccess >& _xCollection { if ( _xCollection.is() ) { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr pComponents; - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr pComponents; if ( _bExportContext ) pComponents.reset( new SvXMLElementExport(*this,XML_NAMESPACE_DB, _eComponents, sal_True, sal_True)); Sequence< OUString> aSeq = _xCollection->getElementNames(); @@ -1119,9 +1118,7 @@ void ODBExport::exportQueries(sal_Bool _bExportContext) Reference< XNameAccess > xCollection = xSup->getQueryDefinitions(); if ( xCollection.is() && xCollection->hasElements() ) { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::comphelper::mem_fun1_t > pMemFunc; - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr< ::comphelper::mem_fun1_t > pMemFunc; if ( _bExportContext ) pMemFunc.reset( new ::comphelper::mem_fun1_t(&ODBExport::exportQuery) ); else @@ -1141,9 +1138,7 @@ void ODBExport::exportTables(sal_Bool _bExportContext) Reference< XNameAccess > xCollection = xSup->getTables(); if ( xCollection.is() && xCollection->hasElements() ) { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::comphelper::mem_fun1_t > pMemFunc; - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr< ::comphelper::mem_fun1_t > pMemFunc; if ( _bExportContext ) pMemFunc.reset( new ::comphelper::mem_fun1_t(&ODBExport::exportTable) ); else diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 2e58d1ba6955..273e5530ca5b 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -67,6 +67,8 @@ #include +#include + using namespace ::dbaui; using namespace ::com::sun::star::container; using namespace ::com::sun::star::uno; @@ -242,9 +244,7 @@ OAppDetailPageHelper::~OAppDetailPageHelper() { m_pLists[i]->clearCurrentSelection(); m_pLists[i]->Hide(); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr aTemp(m_pLists[i]); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr aTemp(m_pLists[i]); m_pLists[i]->clearCurrentSelection(); // why a second time? m_pLists[i] = NULL; } @@ -1140,12 +1140,10 @@ void OAppDetailPageHelper::showPreview( const OUString& _sDataSourceName, } Reference< XDatabaseDocumentUI > xApplication( getBorderWin().getView()->getAppController().getXController(), UNO_QUERY ); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< DatabaseObjectView > pDispatcher( new ResultSetBrowser( + boost::scoped_ptr< DatabaseObjectView > pDispatcher( new ResultSetBrowser( getBorderWin().getView()->getORB(), xApplication, NULL, _bTable ) ); - SAL_WNODEPRECATED_DECLARATIONS_POP pDispatcher->setTargetFrame( Reference(m_xFrame,UNO_QUERY_THROW) ); ::comphelper::NamedValueCollection aArgs; @@ -1188,9 +1186,7 @@ IMPL_LINK(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, /*pToolBox*/) m_aTBPreview.Update(); // execute the menu - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr aMenu(new PopupMenu( ModuleRes( RID_MENU_APP_PREVIEW ) )); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr aMenu(new PopupMenu( ModuleRes( RID_MENU_APP_PREVIEW ) )); sal_uInt16 pActions[] = { SID_DB_APP_DISABLE_PREVIEW , SID_DB_APP_VIEW_DOC_PREVIEW diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index 3f794cfb3e72..0e66f97e02d4 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -19,10 +19,10 @@ #include "AppTitleWindow.hxx" #include "moduledbu.hxx" -#include "memory" #include #include #include +#include namespace dbaui { @@ -50,7 +50,7 @@ OTitleWindow::~OTitleWindow() if ( m_pChild ) { m_pChild->Hide(); - ::std::auto_ptr aTemp(m_pChild); + boost::scoped_ptr aTemp(m_pChild); m_pChild = NULL; } diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 056aa434e2a5..f4df7c5a4f3a 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -44,6 +44,7 @@ #include "browserids.hxx" #include #include "IApplicationController.hxx" +#include using namespace ::dbaui; using namespace ::com::sun::star::uno; @@ -89,17 +90,13 @@ OAppBorderWindow::~OAppBorderWindow() if ( m_pPanel ) { m_pPanel->Hide(); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr aTemp(m_pPanel); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr aTemp(m_pPanel); m_pPanel = NULL; } if ( m_pDetailView ) { m_pDetailView->Hide(); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr aTemp(m_pDetailView); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr aTemp(m_pDetailView); m_pDetailView = NULL; } @@ -219,9 +216,7 @@ OApplicationView::~OApplicationView() { stopComponentListening(m_xObject); m_pWin->Hide(); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr aTemp(m_pWin); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr aTemp(m_pWin); m_pWin = NULL; } } diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index b0dc4f88cc6d..ea2d4d6dadf3 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -30,6 +30,7 @@ #include #include "UITools.hxx" #include +#include using namespace dbaui; using namespace ::com::sun::star::uno; @@ -117,7 +118,7 @@ void UnoDataBrowserView::Construct(const Reference< ::com::sun::star::awt::XCont UnoDataBrowserView::~UnoDataBrowserView() { { - ::std::auto_ptr aTemp(m_pSplitter); + boost::scoped_ptr aTemp(m_pSplitter); m_pSplitter = NULL; } setTreeView(NULL); @@ -160,7 +161,7 @@ void UnoDataBrowserView::setTreeView(DBTreeView* _pTreeView) { if (m_pTreeView) { - ::std::auto_ptr aTemp(m_pTreeView); + boost::scoped_ptr aTemp(m_pTreeView); m_pTreeView = NULL; } m_pTreeView = _pTreeView; diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx index 74edd00a0504..e769f378ebd2 100644 --- a/dbaccess/source/ui/browser/dbtreeview.cxx +++ b/dbaccess/source/ui/browser/dbtreeview.cxx @@ -22,6 +22,7 @@ #include "dbtreelistbox.hxx" #include "dbtreemodel.hxx" #include "dbaccess_helpid.hrc" +#include namespace dbaui { @@ -52,7 +53,7 @@ DBTreeView::~DBTreeView() m_pTreeListBox->GetModel()->RemoveView(m_pTreeListBox); m_pTreeListBox->DisconnectFromModel(); } - ::std::auto_ptr aTemp(m_pTreeListBox); + boost::scoped_ptr aTemp(m_pTreeListBox); m_pTreeListBox = NULL; } } diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx index 6fe80d83f8c6..712613447aac 100644 --- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx +++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx @@ -27,6 +27,7 @@ #include "dbu_brw.hrc" #include "dbtreemodel.hxx" #include "svtools/treelistentry.hxx" +#include using namespace ::com::sun::star::frame; using namespace ::dbtools; @@ -202,7 +203,7 @@ void SbaTableQueryBrowser::notifyHiContrastChanged() } // the connection to which this entry belongs, if any - ::std::auto_ptr< ImageProvider > pImageProvider( getImageProviderFor( pEntryLoop ) ); + boost::scoped_ptr< ImageProvider > pImageProvider( getImageProviderFor( pEntryLoop ) ); // the images for this entry Image aImage; diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index f86f7fea660f..82e1b22ee648 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -317,7 +318,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen catch(Exception&) { // no one clears my view if I won't - ::std::auto_ptr aTemp(m_pView); + boost::scoped_ptr aTemp(m_pView); m_pView = NULL; throw; } diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 8fe635a1a312..75819b048ad5 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -58,6 +58,7 @@ #include #include +#include using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; @@ -171,7 +172,7 @@ OJoinDesignView* OJoinController::getJoinView() void OJoinController::disposing() { { - ::std::auto_ptr< Window > pEnsureDelete( m_pAddTableDialog ); + boost::scoped_ptr< Window > pEnsureDelete( m_pAddTableDialog ); m_pAddTableDialog = NULL; } diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index ce3a7cafce43..cfe2d696d8e4 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -61,13 +61,9 @@ OJoinDesignView::OJoinDesignView(Window* _pParent, OJoinController& _rController OJoinDesignView::~OJoinDesignView() { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr aT3(m_pScrollWindow); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr aT3(m_pScrollWindow); m_pScrollWindow = NULL; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr aT2(m_pTableView); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr aT2(m_pTableView); m_pTableView = NULL; } diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 203452c88915..3c04399e47c2 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -45,6 +45,7 @@ #include #include #include +#include #include #include @@ -88,9 +89,7 @@ OScrollWindowHelper::OScrollWindowHelper( Window* pParent) : Window( pParent) OScrollWindowHelper::~OScrollWindowHelper() { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr aTemp(m_pCornerWindow); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr aTemp(m_pCornerWindow); m_pCornerWindow = NULL; m_pTableView = NULL; } @@ -1522,9 +1521,7 @@ void OJoinTableView::clearLayoutInformation() { if ( aIter->second ) aIter->second->clearListBox(); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr aTemp(aIter->second); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr aTemp(aIter->second); aIter->second = NULL; } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index dec894f54095..a98fa31d7bb1 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -53,6 +53,7 @@ #include "querycontainerwindow.hxx" #include "sqlmessage.hxx" #include +#include using namespace ::dbaui; using namespace ::utl; @@ -790,9 +791,7 @@ namespace OUString aTmp = aCriteria; OUString aErrorMsg; Reference xColumn; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn)); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn)); if (pParseNode.get()) { if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*'))) @@ -823,9 +822,7 @@ namespace OUString aTmp = aCriteria; OUString aErrorMsg; Reference xColumn; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::connectivity::OSQLParseNode> pParseNode( _pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn)); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr< ::connectivity::OSQLParseNode> pParseNode( _pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn)); if (pParseNode.get()) { if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*'))) @@ -1168,9 +1165,7 @@ namespace OUString aTmp = pEntryField->GetField(); OUString aErrorMsg; Reference xColumn; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn)); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn)); if (pParseNode.get()) { OUString sGroupBy; @@ -2521,9 +2516,7 @@ OQueryDesignView::~OQueryDesignView() { if ( m_pTableView ) ::dbaui::notifySystemWindow(this,m_pTableView,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr aTemp(m_pSelectionBox); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr aTemp(m_pSelectionBox); m_pSelectionBox = NULL; } @@ -2929,9 +2922,7 @@ OUString OQueryDesignView::getStatement() { ::connectivity::OSQLParser& rParser( rController.getParser() ); OUString sErrorMessage; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr pParseNode( rParser.parseTree( sErrorMessage, sSQL, sal_True ) ); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr pParseNode( rParser.parseTree( sErrorMessage, sSQL, sal_True ) ); if ( pParseNode.get() ) { OSQLParseNode* pNode = pParseNode->getChild(3)->getChild(1); @@ -3043,9 +3034,7 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE sSql += " FROM x WHERE "; sSql += pEntry->GetField(); sSql += _sCriteria; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr pParseNode( rParser.parseTree( _rsErrorMessage, sSql, sal_True ) ); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr pParseNode( rParser.parseTree( _rsErrorMessage, sSql, sal_True ) ); nType = DataType::DOUBLE; if ( pParseNode.get() ) { diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index 4ebfebdd6d29..d550877e8e6e 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -31,6 +31,7 @@ #include #include #include "QueryDesignView.hxx" +#include using namespace dbaui; using namespace ::com::sun::star::uno; @@ -51,7 +52,7 @@ OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent) OQueryTextView::~OQueryTextView() { - ::std::auto_ptr aTemp(m_pEdit); + boost::scoped_ptr aTemp(m_pEdit); m_pEdit = NULL; } diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx index 21fbabb84256..fe4dc3f88fa0 100644 --- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx +++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx @@ -26,6 +26,7 @@ #include "adtabdlg.hxx" #include "querycontroller.hxx" #include "sqledit.hxx" +#include using namespace dbaui; using namespace ::com::sun::star::uno; @@ -42,15 +43,11 @@ OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryContro OQueryViewSwitch::~OQueryViewSwitch() { { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr aTemp(m_pTextView); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr aTemp(m_pTextView); m_pTextView = NULL; } { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr aTemp(m_pDesignView); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr aTemp(m_pDesignView); m_pDesignView = NULL; } } diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index f4e6a73a5e51..4b22d3755e6c 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -45,6 +45,8 @@ #include #include "svtools/treelistentry.hxx" +#include + using namespace dbaui; using namespace ::utl; using namespace ::com::sun::star; @@ -99,7 +101,7 @@ OTableWindow::~OTableWindow() if (m_pListBox) { OSL_ENSURE(m_pListBox->GetEntryCount()==0,"Forgot to call EmptyListbox()!"); - ::std::auto_ptr aTemp(m_pListBox); + boost::scoped_ptr aTemp(m_pListBox); m_pListBox = NULL; } if ( m_pContainerListener.is() ) diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 4bc0b92ea678..aeb31373b0e7 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -31,6 +31,7 @@ #include #include #include +#include namespace dbaui { @@ -56,7 +57,7 @@ namespace dbaui OQueryContainerWindow::~OQueryContainerWindow() { { - ::std::auto_ptr aTemp(m_pViewSwitch); + boost::scoped_ptr aTemp(m_pViewSwitch); m_pViewSwitch = NULL; } if ( m_pBeamer ) @@ -70,7 +71,7 @@ namespace dbaui xCloseable->close(sal_False); // false - holds the owner ship of this frame } - ::std::auto_ptr aTemp(m_pSplitter); + boost::scoped_ptr aTemp(m_pSplitter); m_pSplitter = NULL; } diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index 8ddece24afb3..980da26282f7 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -24,6 +24,7 @@ #include "TableFieldControl.hxx" #include "TableDesignView.hxx" #include "TEditControl.hxx" +#include using namespace dbaui; // class OFieldDescGenWin @@ -38,7 +39,7 @@ OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp OFieldDescGenWin::~OFieldDescGenWin() { - ::std::auto_ptr aTemp(m_pFieldControl); + boost::scoped_ptr aTemp(m_pFieldControl); m_pFieldControl = NULL; } diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 36302780cd0c..d243b2673f4e 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -31,6 +31,7 @@ #include #include #include "UITools.hxx" +#include using namespace ::dbaui; using namespace ::utl; @@ -67,15 +68,11 @@ OTableBorderWindow::~OTableBorderWindow() m_pFieldDescWin->Hide(); { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr aTemp(m_pEditorCtrl); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr aTemp(m_pEditorCtrl); m_pEditorCtrl = NULL; } { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr aTemp(m_pFieldDescWin); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr aTemp(m_pFieldDescWin); m_pFieldDescWin = NULL; } @@ -196,9 +193,7 @@ OTableDesignView::~OTableDesignView() m_pWin->Hide(); { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr aTemp(m_pWin); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr aTemp(m_pWin); m_pWin = NULL; } } -- cgit