summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/browser
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-09-24 18:50:37 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-09-25 08:40:12 +0200
commitd54a72a40852e206d78ab4c57a6898cfae39b8d0 (patch)
tree93967bdbbe5b48e4645b912cf921b244634088af /dbaccess/source/ui/browser
parent43c47c610556b0bbd4f22c317d6e58c543109c12 (diff)
dbaccess: std::auto_ptr -> std::unique_ptr
Change-Id: I2b27aaf589fcbe4da1680f624a57be7ae62b0dc5
Diffstat (limited to 'dbaccess/source/ui/browser')
-rw-r--r--dbaccess/source/ui/browser/dsEntriesNoExp.cxx7
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx15
2 files changed, 9 insertions, 13 deletions
diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index 39943907d534..5ccaa1118f64 100644
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <memory>
+
#include "unodatbr.hxx"
#include "browserids.hxx"
#include "listviewitems.hxx"
@@ -27,7 +31,6 @@
#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;
@@ -203,7 +206,7 @@ void SbaTableQueryBrowser::notifyHiContrastChanged()
}
// the connection to which this entry belongs, if any
- boost::scoped_ptr< ImageProvider > pImageProvider( getImageProviderFor( pEntryLoop ) );
+ std::unique_ptr< ImageProvider > pImageProvider( getImageProviderFor( pEntryLoop ) );
// the images for this entry
Image aImage;
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 6d59880cf35b..b18678a763d4 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -298,9 +298,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing()
clearTreeModel();
// clear the tree model
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<SvTreeList> aTemp(m_pTreeModel);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr<SvTreeList> aTemp(m_pTreeModel);
m_pTreeModel = NULL;
}
@@ -2147,9 +2145,7 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce
SvTreeListEntry* SbaTableQueryBrowser::implAppendEntry( SvTreeListEntry* _pParent, const OUString& _rName, void* _pUserData, EntryType _eEntryType )
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< ImageProvider > pImageProvider( getImageProviderFor( _pParent ) );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr< ImageProvider > pImageProvider( getImageProviderFor( _pParent ) );
Image aImage;
pImageProvider->getImages( _rName, getDatabaseObjectType( _eEntryType ), aImage );
@@ -3298,18 +3294,15 @@ bool SbaTableQueryBrowser::ensureConnection(SvTreeListEntry* _pAnyEntry, SharedC
return ensureConnection( pDSEntry, pDSData, _rConnection );
}
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-::std::auto_ptr< ImageProvider > SbaTableQueryBrowser::getImageProviderFor( SvTreeListEntry* _pAnyEntry )
+::std::unique_ptr< ImageProvider > SbaTableQueryBrowser::getImageProviderFor( SvTreeListEntry* _pAnyEntry )
{
- ::std::auto_ptr< ImageProvider > pImageProvider( new ImageProvider );
+ ::std::unique_ptr< ImageProvider > pImageProvider( new ImageProvider );
SharedConnection xConnection;
if ( getExistentConnectionFor( _pAnyEntry, xConnection ) )
pImageProvider.reset( new ImageProvider( xConnection ) );
return pImageProvider;
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
-
bool SbaTableQueryBrowser::getExistentConnectionFor( SvTreeListEntry* _pAnyEntry, SharedConnection& _rConnection )
{
SvTreeListEntry* pDSEntry = m_pTreeView->getListBox().GetRootLevelParent( _pAnyEntry );