diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-15 15:35:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-16 15:34:23 +0100 |
| commit | 31ebd9f475f94fb4f05bbeaa8077122a2635d528 (patch) | |
| tree | 0f3eb9182102e613ee08706750e2b72fd1db239e /svx/source/fmcomp | |
| parent | 21b2cb540aaa308ea1911af34dc4862a24dcb545 (diff) | |
boost->std
Change-Id: Ic18be8b86727dd1179a7e39c70493d088ed00557
Diffstat (limited to 'svx/source/fmcomp')
| -rw-r--r-- | svx/source/fmcomp/fmgridcl.cxx | 4 | ||||
| -rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 7fba848455e5..946ea5d5641d 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -71,7 +71,7 @@ #include <vcl/settings.hxx> #include <math.h> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::view; @@ -866,7 +866,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - boost::scoped_ptr<AbstractFmShowColsDialog> pDlg(pFact->CreateFmShowColsDialog(NULL)); + std::unique_ptr<AbstractFmShowColsDialog> pDlg(pFact->CreateFmShowColsDialog(NULL)); DBG_ASSERT(pDlg, "Dialog creation failed!"); pDlg->SetColumns(xCols); pDlg->Execute(); diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 9900c4205089..f7a190fd47ee 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -57,11 +57,10 @@ #include <comphelper/property.hxx> #include <cppuhelper/implbase.hxx> -#include <boost/scoped_ptr.hpp> - #include <algorithm> #include <cstdlib> #include <map> +#include <memory> using namespace ::dbtools; using namespace ::dbtools::DBTypeConversion; @@ -3568,7 +3567,7 @@ void DbGridControl::FieldValueChanged(sal_uInt16 _nId, const PropertyChangeEvent DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; if (pColumn) { - boost::scoped_ptr<vcl::SolarMutexTryAndBuyGuard> pGuard; + std::unique_ptr<vcl::SolarMutexTryAndBuyGuard> pGuard; while (!m_bWantDestruction && (!pGuard || !pGuard->isAcquired())) pGuard.reset(new vcl::SolarMutexTryAndBuyGuard); |