diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-18 09:08:35 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-18 09:28:59 +0000 |
| commit | c8204ba5b86d080aa5ac3ec71dc6aaea1384b9a0 (patch) | |
| tree | c4ae951328f359fb4f6fdee62bb0f276a9034579 /sc/source/ui/pagedlg | |
| parent | c722e9e728ec6c9df0285f5dd2041aa58f66f686 (diff) | |
boost->std
Change-Id: I7f3bb094f116103c1146a7d60e3af94c0b37d9ea
Reviewed-on: https://gerrit.libreoffice.org/18677
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/pagedlg')
| -rw-r--r-- | sc/source/ui/pagedlg/scuitphfedit.cxx | 12 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/tphf.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/tphfedit.cxx | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index ccd9167799ad..b043dc4ba9cd 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -47,7 +47,7 @@ #include "AccessibleEditObject.hxx" #include "scuitphfedit.hxx" -#include <boost/scoped_ptr.hpp> +#include <memory> // STATIC DATA ----------------------------------------------------------- @@ -327,9 +327,9 @@ void ScHFEditPage::SetSelectDefinedList() // default to customized ScHFEntryId eSelectEntry = eEntryCount; - boost::scoped_ptr< EditTextObject > pLeftObj; - boost::scoped_ptr< EditTextObject > pCenterObj; - boost::scoped_ptr< EditTextObject > pRightObj; + std::unique_ptr< EditTextObject > pLeftObj; + std::unique_ptr< EditTextObject > pCenterObj; + std::unique_ptr< EditTextObject > pRightObj; OUString aLeftEntry; OUString aCenterEntry; @@ -524,7 +524,7 @@ bool ScHFEditPage::IsPageEntry(EditEngine*pEngine, EditTextObject* pTextObj) { aSel.nStartPos = aSel.nEndPos; aSel.nEndPos++; - boost::scoped_ptr< EditTextObject > pPageObj; + std::unique_ptr< EditTextObject > pPageObj; pPageObj.reset(pEngine->CreateTextObject(aSel)); if(pPageObj.get() && pPageObj->IsFieldObject() ) { @@ -582,7 +582,7 @@ bool ScHFEditPage::IsExtFileNameEntry(EditTextObject* pTextObj) void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling) { SvtUserOptions aUserOpt; - boost::scoped_ptr< EditTextObject > pTextObj; + std::unique_ptr< EditTextObject > pTextObj; switch(eSel) { diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index f629e8bc5bc9..b8bb332aeee4 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -36,7 +36,7 @@ #include "styledlg.hxx" #include "scresid.hxx" #include "scuitphfedit.hxx" -#include <boost/scoped_ptr.hpp> +#include <memory> // class ScHFPage @@ -186,7 +186,7 @@ IMPL_LINK_NOARG_TYPED(ScHFPage, HFEditHdl, void*, void) ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); - boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScHFEditDlg( + std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScHFEditDlg( pViewSh->GetViewFrame(), this, aDataSet, aStrPageStyle, nResId)); OSL_ENSURE(pDlg, "Dialog create fail!"); diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 4d907e0c2230..968886e1f1d7 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -45,7 +45,7 @@ #include "AccessibleEditObject.hxx" #include "scabstdlg.hxx" -#include <boost/scoped_ptr.hpp> +#include <memory> // STATIC DATA ----------------------------------------------------------- static VclPtr<ScEditWindow> pActiveEdWnd = NULL; @@ -205,7 +205,7 @@ void ScEditWindow::SetCharAttributes() ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); - boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScCharDlg( + std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScCharDlg( GetParent(), &aSet, pDocSh)); OSL_ENSURE(pDlg, "Dialog create fail!"); pDlg->SetText( ScGlobal::GetRscString( STR_TEXTATTRS ) ); |