summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/browser
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2014-02-22 21:51:27 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2014-02-22 21:51:27 +0900
commit3b06e5e646878c751c02f395dce9002822895f07 (patch)
treed6c010835546334c376b3c42af66cc2b62994a68 /dbaccess/source/ui/browser
parentd41c58164f8e743b9bf7a8983174f71771872472 (diff)
Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: I1ebfb33063d39f64dc59623df0f942501870c4e7
Diffstat (limited to 'dbaccess/source/ui/browser')
-rw-r--r--dbaccess/source/ui/browser/brwview.cxx5
-rw-r--r--dbaccess/source/ui/browser/dbtreeview.cxx3
-rw-r--r--dbaccess/source/ui/browser/dsEntriesNoExp.cxx3
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx3
4 files changed, 9 insertions, 5 deletions
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 <com/sun/star/awt/XControlContainer.hpp>
#include "UITools.hxx"
#include <osl/diagnose.h>
+#include <boost/scoped_ptr.hpp>
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<Splitter> aTemp(m_pSplitter);
+ boost::scoped_ptr<Splitter> aTemp(m_pSplitter);
m_pSplitter = NULL;
}
setTreeView(NULL);
@@ -160,7 +161,7 @@ void UnoDataBrowserView::setTreeView(DBTreeView* _pTreeView)
{
if (m_pTreeView)
{
- ::std::auto_ptr<Window> aTemp(m_pTreeView);
+ boost::scoped_ptr<Window> 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 <boost/scoped_ptr.hpp>
namespace dbaui
{
@@ -52,7 +53,7 @@ DBTreeView::~DBTreeView()
m_pTreeListBox->GetModel()->RemoveView(m_pTreeListBox);
m_pTreeListBox->DisconnectFromModel();
}
- ::std::auto_ptr<Window> aTemp(m_pTreeListBox);
+ boost::scoped_ptr<Window> 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 <boost/scoped_ptr.hpp>
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 <rtl/ustring.hxx>
#include <algorithm>
#include <o3tl/compat_functional.hxx>
+#include <boost/scoped_ptr.hpp>
#include <boost/unordered_map.hpp>
#include <cppuhelper/implbase1.hxx>
#include <limits>
@@ -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<Window> aTemp(m_pView);
+ boost::scoped_ptr<Window> aTemp(m_pView);
m_pView = NULL;
throw;
}