diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-08-19 15:45:57 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-08-19 19:36:18 +0000 |
| commit | b5ae7dbc871df57686a603dfa99e8179a0e3a4b8 (patch) | |
| tree | 23970f3c875bf1c2244e4dc7f37a86c74ed40cbb /sc/source/ui/dbgui/dbnamdlg.cxx | |
| parent | 013efe75eba3d209a7bd072d608126dac6fa191c (diff) | |
sc: replace boost::ptr_set with std::set<std::unique_ptr>
Change-Id: I93bdb33a442a358b0067d57499b11d73bfbaa2d9
Reviewed-on: https://gerrit.libreoffice.org/17860
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sc/source/ui/dbgui/dbnamdlg.cxx')
| -rw-r--r-- | sc/source/ui/dbgui/dbnamdlg.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index df1beb0e18e6..8854ecdd082c 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -341,7 +341,7 @@ void ScDbNameDlg::UpdateNames() { DBsType::const_iterator itr = rDBs.begin(), itrEnd = rDBs.end(); for (; itr != itrEnd; ++itr) - m_pEdName->InsertEntry(itr->GetName()); + m_pEdName->InsertEntry((*itr)->GetName()); } else { @@ -504,14 +504,14 @@ IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl) namespace { -class FindByName : public ::std::unary_function<ScDBData, bool> +class FindByName : public ::std::unary_function<std::unique_ptr<ScDBData>, bool> { const OUString& mrName; public: FindByName(const OUString& rName) : mrName(rName) {} - bool operator() (const ScDBData& r) const + bool operator() (std::unique_ptr<ScDBData> const& p) const { - return r.GetName().equals(mrName); + return p->GetName().equals(mrName); } }; @@ -539,7 +539,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl) SCTAB nTab; SCCOL nColStart, nColEnd; SCROW nRowStart, nRowEnd; - itr->GetArea( nTab, nColStart, nRowStart, nColEnd, nRowEnd ); + (*itr)->GetArea( nTab, nColStart, nRowStart, nColEnd, nRowEnd ); aRemoveList.push_back( ScRange( ScAddress( nColStart, nRowStart, nTab ), ScAddress( nColEnd, nRowEnd, nTab ) ) ); |