boost->std

Change-Id: Idfbcfa1e5ba7bff92e98693c33c4b33a6beda08f

58 files changed, 155 insertions, 181 deletions

diff --git a/dbaccess/inc/pch/precompiled_dba.hxx b/dbaccess/inc/pch/precompiled_dba.hxx
index 0e5c763eb7b0..bbc390942661 100644
--- a/dbaccess/inc/pch/precompiled_dba.hxx
+++ b/dbaccess/inc/pch/precompiled_dba.hxx
@@ -24,7 +24,6 @@
 #include <boost/bind.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/awt/DialogProvider.hpp>
 #include <com/sun/star/awt/FontEmphasisMark.hpp>
 #include <com/sun/star/awt/FontRelief.hpp>
diff --git a/dbaccess/inc/pch/precompiled_dbaxml.hxx b/dbaccess/inc/pch/precompiled_dbaxml.hxx
index d4d225811ed7..fa57699870b0 100644
--- a/dbaccess/inc/pch/precompiled_dbaxml.hxx
+++ b/dbaccess/inc/pch/precompiled_dbaxml.hxx
@@ -17,7 +17,6 @@
 #include "sal/config.h"
 #include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/awt/TextAlign.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx
index 9a4fa62e8577..4f57dfabb79f 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -31,8 +31,6 @@
 #include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
 #include <cassert>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
diff --git a/dbaccess/inc/pch/precompiled_sdbt.hxx b/dbaccess/inc/pch/precompiled_sdbt.hxx
index effddd5afe15..3adffcbe32ba 100644
--- a/dbaccess/inc/pch/precompiled_sdbt.hxx
+++ b/dbaccess/inc/pch/precompiled_sdbt.hxx
@@ -16,7 +16,6 @@
 
 #include <algorithm>
 #include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
 #include <com/sun/star/lang/NullPointerException.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/ErrorCondition.hpp>
diff --git a/dbaccess/qa/unit/embeddeddb_performancetest.cxx b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
index a639d72e9b2c..1af38cf70772 100644
--- a/dbaccess/qa/unit/embeddeddb_performancetest.cxx
+++ b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
@@ -9,7 +9,7 @@
 
 #include "dbtest_base.cxx"
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <osl/file.hxx>
 #include <osl/process.h>
 #include <osl/time.h>
@@ -261,7 +261,7 @@ void EmbeddedDBPerformanceTest::performPreparedStatementInsertTest(
 
     uno::Reference< XParameters > xParameters(xPreparedStatement, UNO_QUERY_THROW);
 
-    ::boost::scoped_ptr< SvFileStream > pFile(getWordListStream());
+    std::unique_ptr< SvFileStream > pFile(getWordListStream());
 
     OUString aWord;
     sal_Int32 aID = 0;
@@ -297,7 +297,7 @@ void EmbeddedDBPerformanceTest::performStatementInsertTest(
     uno::Reference< XStatement > xStatement =
         xConnection->createStatement();
 
-    ::boost::scoped_ptr< SvFileStream > pFile(getWordListStream());
+    std::unique_ptr< SvFileStream > pFile(getWordListStream());
 
     OUString aWord;
     sal_Int32 aID = 0;
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index b1cddd865c5a..9504d74670ac 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -57,7 +57,7 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/sharedunocomponent.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::dbaccess;
 using namespace ::dbtools;
@@ -657,7 +657,7 @@ void OSingleSelectQueryComposer::setSingleAdditiveClause( SQLPart _ePart, const
         aClauses.push_back( getSQLPart( eLoopParts, m_aSqlIterator, true ) );
 
     // overwrite the one part in question here
-    boost::scoped_ptr< TokenComposer > pComposer;
+    std::unique_ptr< TokenComposer > pComposer;
     if ( ( _ePart == Where ) || ( _ePart == Having ) )
         pComposer.reset( new FilterCreator );
     else
@@ -789,7 +789,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  ) thr
         OUString sSQL( aSQL.makeStringAndClear() );
         // normalize the statement so that it doesn't contain any application-level features anymore
         OUString sError;
-        const boost::scoped_ptr< OSQLParseNode > pStatementTree( m_aSqlParser.parseTree( sError, sSQL ) );
+        const std::unique_ptr< OSQLParseNode > pStatementTree( m_aSqlParser.parseTree( sError, sSQL ) );
         OSL_ENSURE( pStatementTree.get(), "OSingleSelectQueryComposer::getColumns: could not parse the column retrieval statement!" );
         if ( pStatementTree.get() )
             if ( !pStatementTree->parseNodeToExecutableStatement( sSQL, m_xConnection, m_aSqlParser, NULL ) )
@@ -1737,7 +1737,7 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC
         const OSQLParseNode* pTempNode = m_aAdditiveIterator.getParseTree();
 
         OUString aErrorMsg;
-        boost::scoped_ptr<OSQLParseNode> pSqlParseNode( m_aSqlParser.parseTree(aErrorMsg,aSql));
+        std::unique_ptr<OSQLParseNode> pSqlParseNode( m_aSqlParser.parseTree(aErrorMsg,aSql));
         if ( pSqlParseNode.get() )
         {
             m_aAdditiveIterator.setParseTree(pSqlParseNode.get());
diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx
index b5e18ba10696..f190dea10f1d 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.hxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.hxx
@@ -45,8 +45,6 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 
-#include <boost/shared_ptr.hpp>
-
 // needed for registration
 namespace com { namespace sun { namespace star {
     namespace lang
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 8d23ad3f080c..0b5a75d90399 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -59,7 +59,6 @@
 #include <cppuhelper/implbase3.hxx>
 #include <rtl/ref.hxx>
 
-#include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 
 namespace comphelper {
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index 07d14d5957f7..45133916f836 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -30,7 +30,7 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace dbaccess
 {
@@ -179,7 +179,7 @@ void SAL_CALL OInterceptor::dispatch( const URL& _URL,const Sequence<PropertyVal
 
 IMPL_LINK_TYPED( OInterceptor, OnDispatch, void*, _pDispatcher, void )
 {
-    boost::scoped_ptr<DispatchHelper> pHelper( static_cast< DispatchHelper* >( _pDispatcher ) );
+    std::unique_ptr<DispatchHelper> pHelper( static_cast< DispatchHelper* >( _pDispatcher ) );
     try
     {
         if ( m_pContentHolder && m_pContentHolder->prepareClose() && m_xSlaveDispatchProvider.is() )
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx
index 3534bd1fb8c2..f40579bba437 100644
--- a/dbaccess/source/core/inc/ContentHelper.hxx
+++ b/dbaccess/source/core/inc/ContentHelper.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/sdbcx/XRename.hpp>
 #include <connectivity/sqlerror.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace com { namespace sun { namespace star { namespace beans {
     struct PropertyValue;
@@ -75,7 +75,7 @@ namespace dbaccess
         ODatabaseModelImpl* m_pDataSource; // this will stay alive as long as the content exists
     };
 
-    typedef ::boost::shared_ptr<OContentHelper_Impl> TContentPtr;
+    typedef std::shared_ptr<OContentHelper_Impl> TContentPtr;
 
     typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
         PropertyChangeListenerContainer;
diff --git a/dbaccess/source/core/inc/containerapprove.hxx b/dbaccess/source/core/inc/containerapprove.hxx
index 1bc051d99b16..8c81e97da515 100644
--- a/dbaccess/source/core/inc/containerapprove.hxx
+++ b/dbaccess/source/core/inc/containerapprove.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/uno/XInterface.hpp>
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace dbaccess
 {
@@ -56,7 +56,7 @@ namespace dbaccess
         ) = 0;
     };
 
-    typedef ::boost::shared_ptr< IContainerApprove >    PContainerApprove;
+    typedef std::shared_ptr< IContainerApprove >    PContainerApprove;
 
 } // namespace dbaccess
 
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 62b2900724e9..1e7ed78e7d99 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -53,7 +53,7 @@
 #include <connectivity/dbtools.hxx>
 
 #include <boost/optional.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace dbaxml
 {
@@ -833,7 +833,7 @@ void ODBExport::exportCollection(const Reference< XNameAccess >& _xCollection
 {
     if ( _xCollection.is() )
     {
-        boost::scoped_ptr<SvXMLElementExport> pComponents;
+        std::unique_ptr<SvXMLElementExport> pComponents;
         if ( _bExportContext )
             pComponents.reset( new SvXMLElementExport(*this,XML_NAMESPACE_DB, _eComponents, true, true));
         Sequence< OUString> aSeq = _xCollection->getElementNames();
@@ -1113,7 +1113,7 @@ void ODBExport::exportQueries(bool _bExportContext)
             Reference< XNameAccess > xCollection = xSup->getQueryDefinitions();
             if ( xCollection.is() && xCollection->hasElements() )
             {
-                boost::scoped_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc;
+                std::unique_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc;
                 if ( _bExportContext )
                     pMemFunc.reset( new ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >(&ODBExport::exportQuery) );
                 else
@@ -1133,7 +1133,7 @@ void ODBExport::exportTables(bool _bExportContext)
         Reference< XNameAccess > xCollection = xSup->getTables();
         if ( xCollection.is() && xCollection->hasElements() )
         {
-            boost::scoped_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc;
+            std::unique_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc;
             if ( _bExportContext )
                 pMemFunc.reset( new ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >(&ODBExport::exportTable) );
             else
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index 500a6037a717..91b406547f19 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -35,7 +35,7 @@
 #include <rtl/ustrbuf.hxx>
 
 #include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace sdbtools
 {
@@ -69,7 +69,7 @@ namespace sdbtools
 
         virtual ~INameValidation() { }
     };
-    typedef ::boost::shared_ptr< INameValidation >   PNameValidation;
+    typedef std::shared_ptr< INameValidation >   PNameValidation;
 
     // PlainExistenceCheck
     class PlainExistenceCheck : public INameValidation
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index c3e68284d7f6..0228f6b9c17f 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -67,7 +67,7 @@
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::dbaui;
 using namespace ::com::sun::star::container;
@@ -1118,7 +1118,7 @@ void OAppDetailPageHelper::showPreview( const OUString& _sDataSourceName,
         }
 
         Reference< XDatabaseDocumentUI > xApplication( getBorderWin().getView()->getAppController().getXController(), UNO_QUERY );
-        boost::scoped_ptr< DatabaseObjectView > pDispatcher( new ResultSetBrowser(
+        std::unique_ptr< DatabaseObjectView > pDispatcher( new ResultSetBrowser(
             getBorderWin().getView()->getORB(),
             xApplication, NULL, _bTable
         ) );
@@ -1164,7 +1164,7 @@ IMPL_LINK_NOARG_TYPED(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, void)
     m_aTBPreview->Update();
 
     // execute the menu
-    boost::scoped_ptr<PopupMenu> aMenu(new PopupMenu( ModuleRes( RID_MENU_APP_PREVIEW ) ));
+    std::unique_ptr<PopupMenu> 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/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index d37b0a1cadf8..a78910f3854b 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -25,7 +25,7 @@
 #include <vcl/image.hxx>
 #include "callbacks.hxx"
 #include "AppElementType.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::dbaui;
 // class OApplicationIconControl
@@ -73,7 +73,7 @@ void OApplicationIconControl::dispose()
         SvxIconChoiceCtrlEntry* pEntry = GetEntry( i );
         if ( pEntry )
         {
-            boost::scoped_ptr<ElementType> aType(static_cast<ElementType*>(pEntry->GetUserData()));
+            std::unique_ptr<ElementType> aType(static_cast<ElementType*>(pEntry->GetUserData()));
             pEntry->SetUserData(NULL);
         }
     }
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index 19da267be749..764656c7f5b8 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -22,7 +22,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <tools/debug.hxx>
-#include <boost/scoped_ptr.hpp>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 1ce3a3f0e8e5..363d11176f4b 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -44,7 +44,6 @@
 #include "browserids.hxx"
 #include <unotools/pathoptions.hxx>
 #include "IApplicationController.hxx"
-#include <boost/scoped_ptr.hpp>
 
 using namespace ::dbaui;
 using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index aad77d2e31d8..7a93fe301d7b 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -30,7 +30,6 @@
 #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;
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index 8f252fb0d691..19d25d17f4cb 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -22,7 +22,6 @@
 #include "dbtreelistbox.hxx"
 #include "dbtreemodel.hxx"
 #include "dbaccess_helpid.hrc"
-#include <boost/scoped_ptr.hpp>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 8811b5b71e7f..2c375e8b3c92 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -58,7 +58,6 @@
 #include <com/sun/star/util/XModifiable.hpp>
 #include <rtl/ustring.hxx>
 #include <o3tl/functional.hxx>
-#include <boost/scoped_ptr.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <limits>
 #include <unordered_map>
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index a1f1b707d75a..deb636a6eded 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -691,9 +691,9 @@ void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM
 
                 if(!xField.is())
                     break;
-                ::std::vector< ::boost::shared_ptr<OTableRow> > vClipboardList;
+                ::std::vector< std::shared_ptr<OTableRow> > vClipboardList;
                 // send it to the clipboard
-                vClipboardList.push_back(::boost::shared_ptr<OTableRow>(new OTableRow(xField)));
+                vClipboardList.push_back(std::shared_ptr<OTableRow>(new OTableRow(xField)));
                 OTableRowExchange* pData = new OTableRowExchange(vClipboardList);
                 Reference< css::datatransfer::XTransferable> xRef = pData;
                 pData->CopyToClipboard(GetParent());
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 92cde5ca0261..92a4dc55ea6a 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -50,7 +50,6 @@
 #include <comphelper/numbers.hxx>
 #include <comphelper/string.hxx>
 #include "UITools.hxx"
-#include <boost/scoped_ptr.hpp>
 #include "dbu_control.hrc"
 #include "dbu_tbl.hrc"
 #include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 994fd81eb30b..ab0a577085de 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -111,21 +111,21 @@ namespace
     class ProviderFactory
     {
     private:
-        mutable ::boost::shared_ptr< IImageProvider >   m_pErrorImage;
-        mutable ::boost::shared_ptr< IImageProvider >   m_pWarningsImage;
-        mutable ::boost::shared_ptr< IImageProvider >   m_pInfoImage;
-        mutable ::boost::shared_ptr< ILabelProvider >   m_pErrorLabel;
-        mutable ::boost::shared_ptr< ILabelProvider >   m_pWarningsLabel;
-        mutable ::boost::shared_ptr< ILabelProvider >   m_pInfoLabel;
+        mutable std::shared_ptr< IImageProvider >   m_pErrorImage;
+        mutable std::shared_ptr< IImageProvider >   m_pWarningsImage;
+        mutable std::shared_ptr< IImageProvider >   m_pInfoImage;
+        mutable std::shared_ptr< ILabelProvider >   m_pErrorLabel;
+        mutable std::shared_ptr< ILabelProvider >   m_pWarningsLabel;
+        mutable std::shared_ptr< ILabelProvider >   m_pInfoLabel;
 
     public:
         ProviderFactory()
         {
         }
 
-        ::boost::shared_ptr< IImageProvider >   getImageProvider( SQLExceptionInfo::TYPE _eType ) const
+        std::shared_ptr< IImageProvider >   getImageProvider( SQLExceptionInfo::TYPE _eType ) const
         {
-            ::boost::shared_ptr< IImageProvider >* ppProvider( &m_pErrorImage );
+            std::shared_ptr< IImageProvider >* ppProvider( &m_pErrorImage );
             sal_uInt16 nNormalImageID( BMP_EXCEPTION_ERROR );
 
             switch ( _eType )
@@ -149,9 +149,9 @@ namespace
             return *ppProvider;
         }
 
-        ::boost::shared_ptr< ILabelProvider >   getLabelProvider( SQLExceptionInfo::TYPE _eType, bool _bSubLabel ) const
+        std::shared_ptr< ILabelProvider >   getLabelProvider( SQLExceptionInfo::TYPE _eType, bool _bSubLabel ) const
         {
-            ::boost::shared_ptr< ILabelProvider >* ppProvider( &m_pErrorLabel );
+            std::shared_ptr< ILabelProvider >* ppProvider( &m_pErrorLabel );
             sal_uInt16 nLabelID( STR_EXCEPTION_ERROR );
 
             switch ( _eType )
@@ -181,8 +181,8 @@ namespace
     {
         SQLExceptionInfo::TYPE                  eType;
 
-        ::boost::shared_ptr< IImageProvider >   pImageProvider;
-        ::boost::shared_ptr< ILabelProvider >   pLabelProvider;
+        std::shared_ptr< IImageProvider >   pImageProvider;
+        std::shared_ptr< ILabelProvider >   pLabelProvider;
 
         bool                                    bSubEntry;
 
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx
index 55a08e929e34..4d3f18e8d14d 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -74,7 +74,7 @@ namespace dbaui
         css::uno::Reference< css::container::XNameAccess>     m_xTables;      ///< container
         SharedConnection                                      m_xConnection;  ///< dest conn
 
-        ::boost::shared_ptr<IUpdateHelper>                    m_pUpdateHelper;
+        std::shared_ptr<IUpdateHelper>                    m_pUpdateHelper;
         css::uno::Reference< css::sdbc::XResultSet >          m_xResultSet;
         css::uno::Reference< css::util::XNumberFormatter >    m_xFormatter;   ///< a number formatter working with the connection's NumberFormatsSupplier
         css::uno::Reference< css::uno::XComponentContext>     m_xContext;
diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx
index 91ce6c80bb3e..2869d14cddc6 100644
--- a/dbaccess/source/ui/inc/RelationDlg.hxx
+++ b/dbaccess/source/ui/inc/RelationDlg.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDLG_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDLG_HXX
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
@@ -36,7 +36,7 @@ namespace dbaui
                             ,public IRelationControlInterface
     {
         OModuleClient                           m_aModuleClient;
-        boost::scoped_ptr<OTableListBoxControl> m_xTableControl;
+        std::unique_ptr<OTableListBoxControl> m_xTableControl;
         OJoinTableView::OTableWindowMap*        m_pTableMap;
 
         VclPtr<RadioButton> m_pRB_NoCascUpd;
diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx
index ddeea389a1e3..ab25f3514d7e 100644
--- a/dbaccess/source/ui/inc/TableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/TableConnectionData.hxx
@@ -23,7 +23,7 @@
 #include "TableWindowData.hxx"
 #include <vector>
 #include <tools/rtti.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace dbaui
 {
@@ -103,7 +103,7 @@ namespace dbaui
         virtual bool Update(){ return true; }
     };
 
-    typedef ::std::vector< ::boost::shared_ptr<OTableConnectionData> >  TTableConnectionData;
+    typedef ::std::vector< ::std::shared_ptr<OTableConnectionData> >  TTableConnectionData;
 
 }
 #endif
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index 931c4d058a1a..b8820b37d3ca 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -39,7 +39,7 @@ namespace dbaui
     {
     private:
         OModuleClient                                   m_aModuleClient;
-        ::std::vector< ::boost::shared_ptr<OTableRow> > m_vRowList;
+        ::std::vector< std::shared_ptr<OTableRow> > m_vRowList;
         OTypeInfoMap                                    m_aTypeInfo;
         ::std::vector<OTypeInfoMap::iterator>           m_aTypeInfoIndex;
 
@@ -102,7 +102,7 @@ namespace dbaui
 
         virtual void impl_onModifyChanged() SAL_OVERRIDE;
 
-        inline ::std::vector< ::boost::shared_ptr<OTableRow> >& getRows() { return m_vRowList; }
+        inline ::std::vector< std::shared_ptr<OTableRow> >& getRows() { return m_vRowList; }
 
         /// returns the position of the first empty row
         sal_Int32                           getFirstEmptyRowPosition();
diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx
index 45fa74b79688..764a1822d806 100644
--- a/dbaccess/source/ui/inc/TableRowExchange.hxx
+++ b/dbaccess/source/ui/inc/TableRowExchange.hxx
@@ -22,16 +22,16 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <cppuhelper/implbase2.hxx>
 #include <svtools/transfer.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace dbaui
 {
     class OTableRow;
     class OTableRowExchange : public TransferableHelper
     {
-        ::std::vector< ::boost::shared_ptr<OTableRow> > m_vTableRow;
+        ::std::vector< std::shared_ptr<OTableRow> > m_vTableRow;
     public:
-        OTableRowExchange(const ::std::vector< ::boost::shared_ptr<OTableRow> >& _rvTableRow);
+        OTableRowExchange(const ::std::vector< std::shared_ptr<OTableRow> >& _rvTableRow);
     protected:
         virtual void        AddSupportedFormats() SAL_OVERRIDE;
         virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx
index ce121a26030c..776d85147065 100644
--- a/dbaccess/source/ui/inc/TableWindowData.hxx
+++ b/dbaccess/source/ui/inc/TableWindowData.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <unotools/eventlisteneradapter.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <vector>
 
 namespace dbaui
@@ -90,7 +90,7 @@ namespace dbaui
         virtual void _disposing( const css::lang::EventObject& _rSource ) SAL_OVERRIDE;
     };
 
-    typedef ::std::vector< ::boost::shared_ptr<OTableWindowData> >      TTableWindowData;
+    typedef ::std::vector< std::shared_ptr<OTableWindowData> >      TTableWindowData;
 }
 #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWDATA_HXX
 
diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx
index dd7e41efffb3..9d36403269ad 100644
--- a/dbaccess/source/ui/inc/TypeInfo.hxx
+++ b/dbaccess/source/ui/inc/TypeInfo.hxx
@@ -23,8 +23,8 @@
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ColumnSearch.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
-#include <boost/shared_ptr.hpp>
 #include <map>
+#include <memory>
 
 namespace dbaui
 {
@@ -106,7 +106,7 @@ const sal_uInt16 TYPE_BIT       = 31;
 
     };
 
-    typedef ::boost::shared_ptr<OTypeInfo>          TOTypeInfoSP;
+    typedef std::shared_ptr<OTypeInfo>          TOTypeInfoSP;
     typedef ::std::multimap<sal_Int32,TOTypeInfoSP> OTypeInfoMap;
     /** return the most suitable typeinfo for a requested type
         @param  _rTypeInfo      contains a map of type to typeinfo
diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx
index bd14dee9756d..0903fbff2b8a 100644
--- a/dbaccess/source/ui/inc/adtabdlg.hxx
+++ b/dbaccess/source/ui/inc/adtabdlg.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_ADTABDLG_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_ADTABDLG_HXX
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
@@ -63,7 +63,7 @@ namespace dbaui
 
         VclPtr<OTableTreeListBox>  m_pTableList;
         VclPtr<SvTreeListBox>      m_pQueryList;
-        boost::scoped_ptr< TableObjectListFacade > m_xCurrentList;
+        std::unique_ptr< TableObjectListFacade > m_xCurrentList;
 
         VclPtr<PushButton>         m_pAddButton;
         VclPtr<PushButton>         m_pCloseButton;
diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx
index c22062ad7670..a14d8c096694 100644
--- a/dbaccess/source/ui/inc/databaseobjectview.hxx
+++ b/dbaccess/source/ui/inc/databaseobjectview.hxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <comphelper/namedvaluecollection.hxx>
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx
index 63ef28671e5e..d7e62e5345bb 100644
--- a/dbaccess/source/ui/inc/dsmeta.hxx
+++ b/dbaccess/source/ui/inc/dsmeta.hxx
@@ -27,7 +27,7 @@
 #include "dsntypes.hxx"
 #include "dsitems.hxx"
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace dbaui
 {
@@ -65,7 +65,7 @@ namespace dbaui
         static  AuthenticationMode  getAuthentication( const OUString& _sURL );
 
     private:
-        ::boost::shared_ptr< DataSourceMetaData_Impl >  m_pImpl;
+        std::shared_ptr< DataSourceMetaData_Impl >  m_pImpl;
     };
 
     // FeatureSet
diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx
index 4a74946bfba2..0d779f01aa95 100644
--- a/dbaccess/source/ui/inc/imageprovider.hxx
+++ b/dbaccess/source/ui/inc/imageprovider.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdb/application/DatabaseObject.hpp>
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace dbaui
 {
@@ -40,7 +40,7 @@ namespace dbaui
     class ImageProvider
     {
     private:
-        ::boost::shared_ptr< ImageProvider_Data >   m_pData;
+        std::shared_ptr< ImageProvider_Data >   m_pData;
 
     public:
         /** creates a semi-functional ImageProvider instance
diff --git a/dbaccess/source/ui/inc/propertystorage.hxx b/dbaccess/source/ui/inc/propertystorage.hxx
index 0d54f7a083ed..2432064a6ea0 100644
--- a/dbaccess/source/ui/inc/propertystorage.hxx
+++ b/dbaccess/source/ui/inc/propertystorage.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_PROPERTYSTORAGE_HXX
 
 #include <com/sun/star/uno/Any.hxx>
-#include <boost/shared_ptr.hpp>
 #include <map>
+#include <memory>
 
 class SfxItemSet;
 
@@ -39,7 +39,7 @@ namespace dbaui
         virtual ~PropertyStorage();
     };
 
-    typedef ::boost::shared_ptr< PropertyStorage >      PPropertyStorage;
+    typedef std::shared_ptr< PropertyStorage >      PPropertyStorage;
     typedef ::std::map< sal_Int32, PPropertyStorage >   PropertyValues;
 
     // SetItemPropertyStorage
diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx
index ea35a8609167..fdd64f5c0dd4 100644
--- a/dbaccess/source/ui/inc/tabletree.hxx
+++ b/dbaccess/source/ui/inc/tabletree.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/XDriver.hpp>
 #include <com/sun/star/sdb/application/NamedDatabaseObject.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace dbaui
 {
@@ -40,7 +40,7 @@ class OTableTreeListBox : public OMarkableTreeListBox
 protected:
     css::uno::Reference< css::sdbc::XConnection >
                     m_xConnection;      // the connection we're working for, set in implOnNewConnection, called by UpdateTableList
-    boost::scoped_ptr< ImageProvider >
+    std::unique_ptr< ImageProvider >
                     m_xImageProvider;   // provider for our images
     bool            m_bVirtualRoot;     // should the first entry be visible
     bool            m_bNoEmptyFolders;  // should empty catalogs/schematas be prevented from being displayed?
diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
index a6fcd562f4cf..b89f56e41cb0 100644
--- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
+++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
@@ -37,8 +37,8 @@
 #include <tools/diagnose_ex.h>
 #include <cppuhelper/exc_hlp.hxx>
 
+#include <memory>
 #include <vector>
-#include <boost/shared_ptr.hpp>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx
index 7fb7c99c3a27..ba9be1ca0df9 100644
--- a/dbaccess/source/ui/misc/propertystorage.cxx
+++ b/dbaccess/source/ui/misc/propertystorage.cxx
@@ -26,7 +26,7 @@
 #include <osl/diagnose.h>
 
 #include <cassert>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace dbaui
 {
@@ -69,7 +69,7 @@ namespace dbaui
                 {
                     return false;
                 }
-                boost::scoped_ptr< ITEMTYPE > pClone( pCloneItem);
+                std::unique_ptr< ITEMTYPE > pClone( pCloneItem);
                 assert(pClone.get());
                 pClone->SetValue( aValue );
                 _rSet.Put( *pClone );
diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx
index ed6180b2937f..45b439063c80 100644
--- a/dbaccess/source/ui/misc/singledoccontroller.cxx
+++ b/dbaccess/source/ui/misc/singledoccontroller.cxx
@@ -29,8 +29,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <osl/diagnose.h>
 
-#include <boost/scoped_ptr.hpp>
-
 namespace dbaui
 {
 
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index e57be72feb8e..312750b5c09f 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -56,9 +56,6 @@
 #include "UITools.hxx"
 #include <osl/diagnose.h>
 
-#include <boost/optional.hpp>
-#include <boost/scoped_ptr.hpp>
-
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::beans;
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 51e837419ebc..9cfe84f2f4d4 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -44,8 +44,6 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/processfactory.hxx>
 #include <tools/diagnose_ex.h>
-#include <boost/bind.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <algorithm>
 #include <functional>
 
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 764643d7f011..4082adb1ed3e 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -55,7 +55,7 @@
 #include "querycontainerwindow.hxx"
 #include "sqlmessage.hxx"
 #include <unotools/syslocale.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::dbaui;
 using namespace ::utl;
@@ -791,7 +791,7 @@ namespace
                             OUString aTmp = aCriteria;
                             OUString aErrorMsg;
                             Reference<XPropertySet> xColumn;
-                            boost::scoped_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
+                            std::unique_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
                             if (pParseNode.get())
                             {
                                 if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*')))
@@ -822,7 +822,7 @@ namespace
                             OUString aTmp = aCriteria;
                             OUString aErrorMsg;
                             Reference<XPropertySet> xColumn;
-                            boost::scoped_ptr< ::connectivity::OSQLParseNode> pParseNode( _pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
+                            std::unique_ptr< ::connectivity::OSQLParseNode> pParseNode( _pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
                             if (pParseNode.get())
                             {
                                 if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*')))
@@ -1165,7 +1165,7 @@ namespace
                         OUString aTmp = pEntryField->GetField();
                         OUString aErrorMsg;
                         Reference<XPropertySet> xColumn;
-                        boost::scoped_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
+                        std::unique_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
                         if (pParseNode.get())
                         {
                             OUString sGroupBy;
@@ -2925,7 +2925,7 @@ OUString OQueryDesignView::getStatement()
     {
         ::connectivity::OSQLParser& rParser( rController.getParser() );
         OUString sErrorMessage;
-        boost::scoped_ptr<OSQLParseNode> pParseNode( rParser.parseTree( sErrorMessage, sSQL, true ) );
+        std::unique_ptr<OSQLParseNode> pParseNode( rParser.parseTree( sErrorMessage, sSQL, true ) );
         if ( pParseNode.get() )
         {
             OSQLParseNode* pNode = pParseNode->getChild(3)->getChild(1);
@@ -3037,7 +3037,7 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
             sSql += " FROM x WHERE ";
             sSql += pEntry->GetField();
             sSql += _sCriteria;
-            boost::scoped_ptr<OSQLParseNode> pParseNode( rParser.parseTree( _rsErrorMessage, sSql, true ) );
+            std::unique_ptr<OSQLParseNode> pParseNode( rParser.parseTree( _rsErrorMessage, sSql, true ) );
             nType = DataType::DOUBLE;
             if ( pParseNode.get() )
             {
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index 9c3e7412cc6a..ff58450ff0ba 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -31,7 +31,6 @@
 #include <vcl/svapp.hxx>
 #include <comphelper/types.hxx>
 #include "QueryDesignView.hxx"
-#include <boost/scoped_ptr.hpp>
 
 using namespace dbaui;
 using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index a527afd2c1fa..be066e36512a 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -26,7 +26,6 @@
 #include "adtabdlg.hxx"
 #include "querycontroller.hxx"
 #include "sqledit.hxx"
-#include <boost/scoped_ptr.hpp>
 
 using namespace dbaui;
 using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 1ca50329c091..e922ebf7c85d 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -45,8 +45,6 @@
 #include <connectivity/dbtools.hxx>
 #include "svtools/treelistentry.hxx"
 
-#include <boost/scoped_ptr.hpp>
-
 using namespace dbaui;
 using namespace ::utl;
 using namespace ::com::sun::star;
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index a3fffc9b179a..0c6bec9d688e 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/Frame.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace dbaui
 {
@@ -61,7 +61,7 @@ namespace dbaui
     void OQueryContainerWindow::dispose()
     {
         {
-            boost::scoped_ptr<OQueryViewSwitch> aTemp(m_pViewSwitch);
+            std::unique_ptr<OQueryViewSwitch> aTemp(m_pViewSwitch);
             m_pViewSwitch = NULL;
         }
         if ( m_pBeamer )
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 3cb529731169..f86d61bf5198 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -274,7 +274,7 @@ namespace
 {
     class RelationLoader : public ::osl::Thread
     {
-        typedef std::map<OUString, ::boost::shared_ptr<OTableWindowData>, ::comphelper::UStringMixLess> TTableDataHelper;
+        typedef std::map<OUString, ::std::shared_ptr<OTableWindowData>, ::comphelper::UStringMixLess> TTableDataHelper;
         TTableDataHelper                    m_aTableData;
         TTableConnectionData                m_vTableConnectionData;
         const Sequence< OUString>    m_aTableList;
@@ -356,7 +356,7 @@ namespace
         TTableDataHelper::iterator aFind = m_aTableData.find(sSourceName);
         if ( aFind == m_aTableData.end() )
         {
-            aFind = m_aTableData.insert(TTableDataHelper::value_type(sSourceName,::boost::shared_ptr<OTableWindowData>(new OTableWindowData(xTableProp,sSourceName, sSourceName)))).first;
+            aFind = m_aTableData.insert(TTableDataHelper::value_type(sSourceName,::std::shared_ptr<OTableWindowData>(new OTableWindowData(xTableProp,sSourceName, sSourceName)))).first;
             aFind->second->ShowAll(false);
         }
         TTableWindowData::value_type pReferencingTable = aFind->second;
@@ -389,7 +389,7 @@ namespace
                         if ( m_xTables->hasByName(sReferencedTable) )
                         {
                             Reference<XPropertySet>  xReferencedTable(m_xTables->getByName(sReferencedTable),UNO_QUERY);
-                            aRefFind = m_aTableData.insert(TTableDataHelper::value_type(sReferencedTable,::boost::shared_ptr<OTableWindowData>(new OTableWindowData(xReferencedTable,sReferencedTable, sReferencedTable)))).first;
+                            aRefFind = m_aTableData.insert(TTableDataHelper::value_type(sReferencedTable,::std::shared_ptr<OTableWindowData>(new OTableWindowData(xReferencedTable,sReferencedTable, sReferencedTable)))).first;
                             aRefFind->second->ShowAll(false);
                         }
                         else
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
index f9413ce3a338..87c44834ae8b 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
@@ -24,7 +24,7 @@
 #include "TableFieldControl.hxx"
 #include "TableDesignView.hxx"
 #include "TEditControl.hxx"
-#include <boost/scoped_ptr.hpp>
+
 using namespace dbaui;
 
 // class OFieldDescGenWin
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 3cc5fd5e1130..6744812fe4d5 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -489,8 +489,8 @@ sal_Int32 OTableEditorCtrl::HasFieldName( const OUString& rFieldName )
 
     ::comphelper::UStringMixEqual bCase(!xMetaData.is() || xMetaData->supportsMixedCaseQuotedIdentifiers());
 
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_pRowList->begin();
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_pRowList->end();
+    ::std::vector< std::shared_ptr<OTableRow> >::iterator aIter = m_pRowList->begin();
+    ::std::vector< std::shared_ptr<OTableRow> >::iterator aEnd = m_pRowList->end();
     sal_Int32 nCount(0);
     for(;aIter != aEnd;++aIter)
     {
@@ -724,9 +724,9 @@ void OTableEditorCtrl::CopyRows()
         pDescrWin->SaveData( pActRow->GetActFieldDescr() );
 
     // Copy selected rows to the ClipboardList
-     ::boost::shared_ptr<OTableRow>  pClipboardRow;
-     ::boost::shared_ptr<OTableRow>  pRow;
-    ::std::vector< ::boost::shared_ptr<OTableRow> > vClipboardList;
+     std::shared_ptr<OTableRow>  pClipboardRow;
+     std::shared_ptr<OTableRow>  pRow;
+    ::std::vector< std::shared_ptr<OTableRow> > vClipboardList;
     vClipboardList.reserve(GetSelectRowCount());
 
     for( long nIndex=FirstSelectedRow(); nIndex >= 0 && nIndex < static_cast<long>(m_pRowList->size()); nIndex=NextSelectedRow() )
@@ -776,7 +776,7 @@ OUString OTableEditorCtrl::GenerateName( const OUString& rName )
 void OTableEditorCtrl::InsertRows( long nRow )
 {
 
-    ::std::vector<  ::boost::shared_ptr<OTableRow> > vInsertedUndoRedoRows; // need for undo/redo handling
+    ::std::vector<  std::shared_ptr<OTableRow> > vInsertedUndoRedoRows; // need for undo/redo handling
     // get rows from clipboard
     TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent()));
     if(aTransferData.HasFormat(SotClipboardFormatId::SBA_TABED))
@@ -789,7 +789,7 @@ void OTableEditorCtrl::InsertRows( long nRow )
             aStreamRef->ResetError();
             long nInsertRow = nRow;
             OUString aFieldName;
-             ::boost::shared_ptr<OTableRow>  pRow;
+             std::shared_ptr<OTableRow>  pRow;
             sal_Int32 nSize = 0;
             (*aStreamRef).ReadInt32( nSize );
             vInsertedUndoRedoRows.reserve(nSize);
@@ -806,7 +806,7 @@ void OTableEditorCtrl::InsertRows( long nRow )
                 pRow->GetActFieldDescr()->SetName( aFieldName );
                 pRow->SetPos(nInsertRow);
                 m_pRowList->insert( m_pRowList->begin()+nInsertRow,pRow );
-                vInsertedUndoRedoRows.push_back(::boost::shared_ptr<OTableRow>(new OTableRow(*pRow)));
+                vInsertedUndoRedoRows.push_back(std::shared_ptr<OTableRow>(new OTableRow(*pRow)));
                 nInsertRow++;
             }
         }
@@ -841,7 +841,7 @@ void OTableEditorCtrl::DeleteRows()
         RowRemoved( nIndex, 1 );
 
         // Insert the empty row at the end
-        m_pRowList->push_back( ::boost::shared_ptr<OTableRow>(new OTableRow()));
+        m_pRowList->push_back( std::shared_ptr<OTableRow>(new OTableRow()));
         RowInserted( GetRowCount()-1, 1, true );
 
         nIndex = FirstSelectedRow();
@@ -870,7 +870,7 @@ void OTableEditorCtrl::InsertNewRows( long nRow )
     GetUndoManager().AddUndoAction( new OTableEditorInsNewUndoAct(this, nRow, nInsertRows) );
     // Insert the number of selected rows
     for( long i=nRow; i<(nRow+nInsertRows); i++ )
-        m_pRowList->insert( m_pRowList->begin()+i ,::boost::shared_ptr<OTableRow>(new OTableRow()));
+        m_pRowList->insert( m_pRowList->begin()+i ,std::shared_ptr<OTableRow>(new OTableRow()));
     RowInserted( nRow, nInsertRows, true );
 
     GetView()->getController().setModified( sal_True );
@@ -1101,14 +1101,14 @@ sal_uInt32 OTableEditorCtrl::GetTotalCellWidth(long nRow, sal_uInt16 nColId)
 
 OFieldDescription* OTableEditorCtrl::GetFieldDescr( long nRow )
 {
-    std::vector< ::boost::shared_ptr<OTableRow> >::size_type nListCount(
+    std::vector< std::shared_ptr<OTableRow> >::size_type nListCount(
         m_pRowList->size());
     if( (nRow<0) || (sal::static_int_cast< unsigned long >(nRow)>=nListCount) )
     {
         OSL_FAIL("(nRow<0) || (nRow>=nListCount)");
         return NULL;
     }
-     ::boost::shared_ptr<OTableRow>  pRow = (*m_pRowList)[ nRow ];
+     std::shared_ptr<OTableRow>  pRow = (*m_pRowList)[ nRow ];
     if( !pRow )
         return NULL;
     return pRow->GetActFieldDescr();
@@ -1160,7 +1160,7 @@ bool OTableEditorCtrl::IsCopyAllowed( long /*nRow*/ )
             return false;
 
         // If one of the selected rows is empty, Copy is not possible
-         ::boost::shared_ptr<OTableRow>  pRow;
+         std::shared_ptr<OTableRow>  pRow;
         long nIndex = FirstSelectedRow();
         while( nIndex >= 0 && nIndex < static_cast<long>(m_pRowList->size()) )
         {
@@ -1319,7 +1319,7 @@ bool OTableEditorCtrl::IsPrimaryKeyAllowed( long /*nRow*/ )
     // - No Memo or Image entries
     // - DROP is not permitted (see above) and the column is not Required (not null flag is not set).
     long nIndex = FirstSelectedRow();
-     ::boost::shared_ptr<OTableRow>  pRow;
+     std::shared_ptr<OTableRow>  pRow;
     while( nIndex >= 0 && nIndex < static_cast<long>(m_pRowList->size()) )
     {
         pRow = (*m_pRowList)[nIndex];
@@ -1478,7 +1478,7 @@ IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedPaste, void*, void )
     {   // Insertion is not allowed, only appending, so test if there are full cells after the PastePosition
 
         sal_Int32 nFreeFromPos; // from here on there are only empty rows
-        ::std::vector< ::boost::shared_ptr<OTableRow> >::reverse_iterator aIter = m_pRowList->rbegin();
+        ::std::vector< std::shared_ptr<OTableRow> >::reverse_iterator aIter = m_pRowList->rbegin();
         for(nFreeFromPos = m_pRowList->size();
             aIter != m_pRowList->rend() && (!(*aIter) || !(*aIter)->GetActFieldDescr() || (*aIter)->GetActFieldDescr()->GetName().isEmpty());
             --nFreeFromPos, ++aIter)
@@ -1543,8 +1543,8 @@ void OTableEditorCtrl::SetPrimaryKey( bool bSet )
     MultiSelection aDeletedPrimKeys;
     aDeletedPrimKeys.SetTotalRange( Range(0,GetRowCount()) );
 
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = m_pRowList->begin();
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = m_pRowList->end();
+    ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_pRowList->begin();
+    ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_pRowList->end();
     for(sal_Int32 nRow = 0;aIter != aEnd;++aIter,++nRow)
     {
         OFieldDescription* pFieldDescr = (*aIter)->GetActFieldDescr();
@@ -1563,7 +1563,7 @@ void OTableEditorCtrl::SetPrimaryKey( bool bSet )
         while( nIndex >= 0 && nIndex < static_cast<long>(m_pRowList->size()) )
         {
             // Set the key
-             ::boost::shared_ptr<OTableRow>  pRow = (*m_pRowList)[nIndex];
+             std::shared_ptr<OTableRow>  pRow = (*m_pRowList)[nIndex];
             OFieldDescription* pFieldDescr = pRow->GetActFieldDescr();
             if(pFieldDescr)
                 AdjustFieldDescription(pFieldDescr,aInsertedPrimKeys,nIndex,false,true);
@@ -1586,8 +1586,8 @@ bool OTableEditorCtrl::IsPrimaryKey()
 {
     // Are all marked fields part of the Primary Key ?
     long nPrimaryKeys = 0;
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = m_pRowList->begin();
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = m_pRowList->end();
+    ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_pRowList->begin();
+    ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_pRowList->end();
     for(sal_Int32 nRow=0;aIter != aEnd;++aIter,++nRow)
     {
         if( IsRowSelected(nRow) && !(*aIter)->IsPrimaryKey() )
@@ -1612,7 +1612,7 @@ void OTableEditorCtrl::SwitchType( const TOTypeInfoSP& _pType )
     if ( nRow < 0 || nRow > static_cast<long>(m_pRowList->size()) )
         return;
     // Show the new description
-     ::boost::shared_ptr<OTableRow>  pRow = (*m_pRowList)[nRow];
+     std::shared_ptr<OTableRow>  pRow = (*m_pRowList)[nRow];
     pRow->SetFieldType( _pType, true );
     if ( _pType.get() )
     {
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 686270e1ad3c..20f3614bf99e 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -43,8 +43,8 @@ namespace dbaui
             NONE
         };
 
-        ::std::vector< ::boost::shared_ptr<OTableRow> > m_aUndoList;
-        ::std::vector< ::boost::shared_ptr<OTableRow> >*    m_pRowList;
+        ::std::vector< ::std::shared_ptr<OTableRow> > m_aUndoList;
+        ::std::vector< ::std::shared_ptr<OTableRow> >*    m_pRowList;
 
         VclPtr<OSQLNameEdit>               pNameCell;
         VclPtr< ::svt::ListBoxControl>      pTypeCell;
@@ -52,7 +52,7 @@ namespace dbaui
         VclPtr<Edit>                       pDescrCell;
         VclPtr<OTableFieldDescWin>         pDescrWin;          // properties of one column
 
-         ::boost::shared_ptr<OTableRow> pActRow;
+         ::std::shared_ptr<OTableRow> pActRow;
 
         ImplSVEvent *               nCutEvent;
         ImplSVEvent *               nPasteEvent;
@@ -147,9 +147,9 @@ namespace dbaui
 
         virtual OTableDesignView* GetView() const SAL_OVERRIDE;
 
-        ::std::vector< ::boost::shared_ptr<OTableRow> >* GetRowList(){ return m_pRowList; }
+        ::std::vector< ::std::shared_ptr<OTableRow> >* GetRowList(){ return m_pRowList; }
 
-        ::boost::shared_ptr<OTableRow>         GetActRow(){ return pActRow; }
+        ::std::shared_ptr<OTableRow>         GetActRow(){ return pActRow; }
         void CellModified( long nRow, sal_uInt16 nColId );
         void SetReadOnly( bool bRead=true );
 
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index ffa0228c8270..252ba4b1f29c 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -682,8 +682,8 @@ void OTableController::appendColumns(Reference<XColumnsSupplier>& _rxColSup, boo
         Reference<XAppend> xAppend(xColumns,UNO_QUERY);
         OSL_ENSURE(xAppend.is(),"No XAppend Interface!");
 
-        ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin();
-        ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_vRowList.end();
+        ::std::vector< std::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin();
+        ::std::vector< std::shared_ptr<OTableRow> >::iterator aEnd = m_vRowList.end();
         for(;aIter != aEnd;++aIter)
         {
             OSL_ENSURE(*aIter,"OTableRow is null!");
@@ -775,7 +775,7 @@ void OTableController::loadData()
     // if the data structure already exists, empty it
     m_vRowList.clear();
 
-    ::boost::shared_ptr<OTableRow>  pTabEdRow;
+    std::shared_ptr<OTableRow>  pTabEdRow;
     Reference< XDatabaseMetaData> xMetaData = getMetaData( );
     // fill data structure with data from DataDefinitionObject
     if(m_xTable.is() && xMetaData.is())
@@ -869,8 +869,8 @@ void OTableController::loadData()
 
             for(;pKeyBegin != pKeyEnd;++pKeyBegin)
             {
-                ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator rowIter = m_vRowList.begin();
-                ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator rowEnd = m_vRowList.end();
+                ::std::vector< std::shared_ptr<OTableRow> >::iterator rowIter = m_vRowList.begin();
+                ::std::vector< std::shared_ptr<OTableRow> >::iterator rowEnd = m_vRowList.end();
                 for(;rowIter != rowEnd;++rowIter)
                 {
                     if((*rowIter)->GetActFieldDescr()->GetName() == *pKeyBegin)
@@ -915,8 +915,8 @@ bool OTableController::checkColumns(bool _bNew)
     DatabaseMetaData aMetaData( getConnection() );
 
     ::comphelper::UStringMixEqual bCase(!xMetaData.is() || xMetaData->supportsMixedCaseQuotedIdentifiers());
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin();
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end();
+    ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin();
+    ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end();
     for(;aIter != aEnd;++aIter)
     {
         OFieldDescription* pFieldDesc = (*aIter)->GetActFieldDescr();
@@ -924,7 +924,7 @@ bool OTableController::checkColumns(bool _bNew)
         {
             bFoundPKey |=  (*aIter)->IsPrimaryKey();
             // first check for duplicate names
-            ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter2 = aIter+1;
+            ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter2 = aIter+1;
             for(;aIter2 != aEnd;++aIter2)
             {
                 OFieldDescription* pCompareDesc = (*aIter2)->GetActFieldDescr();
@@ -948,7 +948,7 @@ bool OTableController::checkColumns(bool _bNew)
         {
         case RET_YES:
         {
-            ::boost::shared_ptr<OTableRow>  pNewRow(new OTableRow());
+            std::shared_ptr<OTableRow>  pNewRow(new OTableRow());
             TOTypeInfoSP pTypeInfo = ::dbaui::queryPrimaryKeyType(m_aTypeInfo);
             if ( !pTypeInfo.get() )
                 break;
@@ -998,8 +998,8 @@ void OTableController::alterColumns()
     Reference< XDatabaseMetaData> xMetaData = getMetaData( );
 
     ::std::map< OUString,sal_Bool,::comphelper::UStringMixLess> aColumns(!xMetaData.is() || xMetaData->supportsMixedCaseQuotedIdentifiers());
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin();
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_vRowList.end();
+    ::std::vector< std::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin();
+    ::std::vector< std::shared_ptr<OTableRow> >::iterator aEnd = m_vRowList.end();
     // first look for columns where something other than the name changed
     sal_Int32 nPos = 0;
     for(;aIter != aEnd;++aIter,++nPos)
@@ -1441,8 +1441,8 @@ void OTableController::reSyncRows()
 {
     bool bAlterAllowed  = isAlterAllowed();
     bool bAddAllowed    = isAddAllowed();
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin();
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_vRowList.end();
+    ::std::vector< std::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin();
+    ::std::vector< std::shared_ptr<OTableRow> >::iterator aEnd = m_vRowList.end();
     for(;aIter != aEnd;++aIter)
     {
         OSL_ENSURE(*aIter,"OTableRow is null!");
@@ -1466,8 +1466,8 @@ OUString OTableController::createUniqueName(const OUString& _rName)
 
     ::comphelper::UStringMixEqual bCase(!xMetaData.is() || xMetaData->supportsMixedCaseQuotedIdentifiers());
 
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin();
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end();
+    ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin();
+    ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end();
     for(sal_Int32 i=0;aIter != aEnd;++aIter)
     {
         OFieldDescription* pFieldDesc = (*aIter)->GetActFieldDescr();
@@ -1519,8 +1519,8 @@ void OTableController::reload()
 sal_Int32 OTableController::getFirstEmptyRowPosition()
 {
     sal_Int32 nRet = -1;
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin();
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end();
+    ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin();
+    ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end();
     for(;aIter != aEnd;++aIter)
     {
         if ( !*aIter || !(*aIter)->GetActFieldDescr() || (*aIter)->GetActFieldDescr()->GetName().isEmpty() )
@@ -1532,7 +1532,7 @@ sal_Int32 OTableController::getFirstEmptyRowPosition()
     if ( nRet == -1 )
     {
         bool bReadRow = !isAddAllowed();
-        ::boost::shared_ptr<OTableRow> pTabEdRow(new OTableRow());
+        std::shared_ptr<OTableRow> pTabEdRow(new OTableRow());
         pTabEdRow->SetReadOnly(bReadRow);
         nRet = m_vRowList.size();
         m_vRowList.push_back( pTabEdRow);
diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
index 5c1fcc11f340..80d35b1e2de8 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
@@ -22,7 +22,7 @@
 #include <svtools/svmedit.hxx>
 #include <vcl/settings.hxx>
 #include "dbaccess_helpid.hrc"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 using namespace dbaui;
 #define STANDARD_MARGIN                 6
 // class OTableDesignHelpBar
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 2c0259037d10..5029b3b5a544 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -31,7 +31,7 @@
 #include <unotools/syslocale.hxx>
 #include <vcl/settings.hxx>
 #include "UITools.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::dbaui;
 using namespace ::utl;
@@ -303,7 +303,7 @@ void OTableDesignView::setReadOnly(bool _bReadOnly)
 void OTableDesignView::reSync()
 {
     GetEditorCtrl()->DeactivateCell();
-     ::boost::shared_ptr<OTableRow>  pRow = (*GetEditorCtrl()->GetRowList())[GetEditorCtrl()->GetCurRow()];
+     std::shared_ptr<OTableRow>  pRow = (*GetEditorCtrl()->GetRowList())[GetEditorCtrl()->GetCurRow()];
     OFieldDescription* pFieldDescr = pRow ? pRow->GetActFieldDescr() : NULL;
     if ( pFieldDescr )
         GetDescWin()->DisplayData(pFieldDescr);
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
index 87596e7b9405..be3d5a18f751 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
@@ -62,7 +62,7 @@ bool OTableFieldControl::IsReadOnly()
             bRead = true;
         else
         {
-             ::boost::shared_ptr<OTableRow>  pCurRow = GetCtrl()->GetActRow();
+             std::shared_ptr<OTableRow>  pCurRow = GetCtrl()->GetActRow();
             if( pCurRow )
                 bRead = pCurRow->IsReadOnly();
         }
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index 4506ce5e9894..cf07ff4dae6b 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -26,7 +26,6 @@
 #include <vcl/settings.hxx>
 #include "dbaccess_helpid.hrc"
 #include "moduledbu.hxx"
-#include <boost/scoped_ptr.hpp>
 
 #define STANDARD_MARGIN                  6
 #define DETAILS_HEADER_HEIGHT           25
diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
index ee3e88022259..9a8c15fc2c91 100644
--- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
@@ -26,7 +26,7 @@ namespace dbaui
 {
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::beans;
-    OTableRowExchange::OTableRowExchange(const ::std::vector< ::boost::shared_ptr<OTableRow> >& _rvTableRow)
+    OTableRowExchange::OTableRowExchange(const ::std::vector< std::shared_ptr<OTableRow> >& _rvTableRow)
         : m_vTableRow(_rvTableRow)
     {
     }
@@ -34,12 +34,12 @@ namespace dbaui
     {
         if(nUserObjectId == SotClipboardFormatId::SBA_TABED)
         {
-            ::std::vector< ::boost::shared_ptr<OTableRow> >* pRows = static_cast< ::std::vector< ::boost::shared_ptr<OTableRow> >* >(pUserObject);
+            ::std::vector< std::shared_ptr<OTableRow> >* pRows = static_cast< ::std::vector< std::shared_ptr<OTableRow> >* >(pUserObject);
             if(pRows)
             {
                 (*rxOStm).WriteInt32( pRows->size() ); // first stream the size
-                ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = pRows->begin();
-                ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = pRows->end();
+                ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = pRows->begin();
+                ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = pRows->end();
                 for(;aIter != aEnd;++aIter)
                     WriteOTableRow(*rxOStm, **aIter);
                 return true;
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx
index ec495aa75d7d..0c5d901bc52e 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.cxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx
@@ -169,10 +169,10 @@ OTableEditorDelUndoAct::OTableEditorDelUndoAct( OTableEditorCtrl* pOwner) :
      OTableEditorUndoAct( pOwner ,STR_TABED_UNDO_ROWDELETED)
 {
     // fill DeletedRowList
-    ::std::vector< ::boost::shared_ptr<OTableRow> >* pOriginalRows = pOwner->GetRowList();
+    ::std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pOwner->GetRowList();
     long nIndex = pOwner->FirstSelectedRow();
-     ::boost::shared_ptr<OTableRow>  pOriginalRow;
-     ::boost::shared_ptr<OTableRow>  pNewRow;
+     std::shared_ptr<OTableRow>  pOriginalRow;
+     std::shared_ptr<OTableRow>  pNewRow;
 
     while( nIndex >= 0 )
     {
@@ -193,11 +193,11 @@ void OTableEditorDelUndoAct::Undo()
 {
     // Insert the deleted line
     sal_uLong nPos;
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_aDeletedRows.begin();
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_aDeletedRows.end();
+    ::std::vector< std::shared_ptr<OTableRow> >::iterator aIter = m_aDeletedRows.begin();
+    ::std::vector< std::shared_ptr<OTableRow> >::iterator aEnd = m_aDeletedRows.end();
 
-     ::boost::shared_ptr<OTableRow>  pNewOrigRow;
-    ::std::vector< ::boost::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
+     std::shared_ptr<OTableRow>  pNewOrigRow;
+    ::std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
 
     for(;aIter != aEnd;++aIter)
     {
@@ -215,9 +215,9 @@ void OTableEditorDelUndoAct::Redo()
 {
     // delete line again
     sal_uLong nPos;
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_aDeletedRows.begin();
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_aDeletedRows.end();
-    ::std::vector< ::boost::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
+    ::std::vector< std::shared_ptr<OTableRow> >::iterator aIter = m_aDeletedRows.begin();
+    ::std::vector< std::shared_ptr<OTableRow> >::iterator aEnd = m_aDeletedRows.end();
+    ::std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
 
     for(;aIter != aEnd;++aIter)
     {
@@ -233,7 +233,7 @@ void OTableEditorDelUndoAct::Redo()
 // class OTableEditorInsUndoAct
 OTableEditorInsUndoAct::OTableEditorInsUndoAct( OTableEditorCtrl* pOwner,
                                                long nInsertPosition ,
-                                               const ::std::vector<  ::boost::shared_ptr<OTableRow> >& _vInsertedRows)
+                                               const ::std::vector<  std::shared_ptr<OTableRow> >& _vInsertedRows)
     :OTableEditorUndoAct( pOwner,STR_TABED_UNDO_ROWINSERTED )
     ,m_vInsertedRows(_vInsertedRows)
     ,m_nInsPos( nInsertPosition )
@@ -248,7 +248,7 @@ OTableEditorInsUndoAct::~OTableEditorInsUndoAct()
 void OTableEditorInsUndoAct::Undo()
 {
     // delete lines again
-    ::std::vector< ::boost::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
+    ::std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
     for( long i=(m_nInsPos+m_vInsertedRows.size()-1); i>(m_nInsPos-1); i-- )
     {
         pOriginalRows->erase(pOriginalRows->begin()+i);
@@ -264,10 +264,10 @@ void OTableEditorInsUndoAct::Redo()
 {
     // insert lines again
     long nInsertRow = m_nInsPos;
-     ::boost::shared_ptr<OTableRow>  pRow;
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_vInsertedRows.begin();
-    ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_vInsertedRows.end();
-    ::std::vector< ::boost::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList();
+     std::shared_ptr<OTableRow>  pRow;
+    ::std::vector< std::shared_ptr<OTableRow> >::iterator aIter = m_vInsertedRows.begin();
+    ::std::vector< std::shared_ptr<OTableRow> >::iterator aEnd = m_vInsertedRows.end();
+    ::std::vector< std::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList();
     for(;aIter != aEnd;++aIter)
     {
         pRow.reset(new OTableRow( **aIter ));
@@ -296,7 +296,7 @@ OTableEditorInsNewUndoAct::~OTableEditorInsNewUndoAct()
 void OTableEditorInsNewUndoAct::Undo()
 {
     // delete inserted lines
-    ::std::vector< ::boost::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
+    ::std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
 
     for( long i=(m_nInsPos+m_nInsRows-1); i>(m_nInsPos-1); i-- )
     {
@@ -312,10 +312,10 @@ void OTableEditorInsNewUndoAct::Undo()
 void OTableEditorInsNewUndoAct::Redo()
 {
     // insert lines again
-    ::std::vector< ::boost::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList();
+    ::std::vector< std::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList();
 
     for( long i=m_nInsPos; i<(m_nInsPos+m_nInsRows); i++ )
-        pRowList->insert( pRowList->begin()+i,::boost::shared_ptr<OTableRow>(new OTableRow()) );
+        pRowList->insert( pRowList->begin()+i,std::shared_ptr<OTableRow>(new OTableRow()) );
 
     pTabEdCtrl->RowInserted( m_nInsPos, m_nInsRows, true );
     pTabEdCtrl->InvalidateHandleColumn();
@@ -338,8 +338,8 @@ OPrimKeyUndoAct::~OPrimKeyUndoAct()
 
 void OPrimKeyUndoAct::Undo()
 {
-    ::std::vector< ::boost::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList();
-    ::boost::shared_ptr<OTableRow>  pRow;
+    ::std::vector< std::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList();
+    std::shared_ptr<OTableRow>  pRow;
     long nIndex;
 
     // delete inserted keys
@@ -364,7 +364,7 @@ void OPrimKeyUndoAct::Undo()
 
 void OPrimKeyUndoAct::Redo()
 {
-    ::std::vector< ::boost::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList();
+    ::std::vector< std::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList();
     long nIndex;
 
     // delete the deleted keys
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx
index 420a23079fab..d8b0905ecd21 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.hxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx
@@ -92,7 +92,7 @@ namespace dbaui
     class OTableEditorDelUndoAct : public OTableEditorUndoAct
     {
     protected:
-        ::std::vector< ::boost::shared_ptr<OTableRow> > m_aDeletedRows;
+        ::std::vector< std::shared_ptr<OTableRow> > m_aDeletedRows;
 
         virtual void    Undo() SAL_OVERRIDE;
         virtual void    Redo() SAL_OVERRIDE;
@@ -105,7 +105,7 @@ namespace dbaui
     class OTableEditorInsUndoAct : public OTableEditorUndoAct
     {
     protected:
-        ::std::vector< ::boost::shared_ptr<OTableRow> > m_vInsertedRows;
+        ::std::vector< std::shared_ptr<OTableRow> > m_vInsertedRows;
         long                        m_nInsPos;
 
         virtual void    Undo() SAL_OVERRIDE;
@@ -114,7 +114,7 @@ namespace dbaui
         TYPEINFO_OVERRIDE();
         OTableEditorInsUndoAct( OTableEditorCtrl* pOwner,
                                 long nInsertPosition,
-                                const ::std::vector<  ::boost::shared_ptr<OTableRow> >& _vInsertedRows);
+                                const ::std::vector<  std::shared_ptr<OTableRow> >& _vInsertedRows);
         virtual ~OTableEditorInsUndoAct();
     };