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/view/viewfun4.cxx | |
| 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/view/viewfun4.cxx')
| -rw-r--r-- | sc/source/ui/view/viewfun4.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index c071a8c2c0a1..31c17f968a61 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -70,8 +70,6 @@ #include <refupdatecontext.hxx> #include <gridwin.hxx> -#include <boost/scoped_ptr.hpp> - using namespace com::sun::star; // STATIC DATA ----------------------------------------------------------- @@ -93,7 +91,7 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, const bool bRecord (rDoc.IsUndoEnabled()); const ScPatternAttr* pPattern = rDoc.GetPattern( nStartCol, nStartRow, nTab ); - boost::scoped_ptr<ScTabEditEngine> pEngine(new ScTabEditEngine( *pPattern, rDoc.GetEnginePool() )); + std::unique_ptr<ScTabEditEngine> pEngine(new ScTabEditEngine( *pPattern, rDoc.GetEnginePool() )); pEngine->EnableUndo( false ); vcl::Window* pActWin = GetActiveWin(); @@ -131,7 +129,7 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, rDoc.EnableUndo( false ); for( sal_Int32 n = 0; n < nParCnt; n++ ) { - boost::scoped_ptr<EditTextObject> pObject(pEngine->CreateTextObject(n)); + std::unique_ptr<EditTextObject> pObject(pEngine->CreateTextObject(n)); EnterData(nStartCol, nRow, nTab, *pObject, true); if( ++nRow > MAXROW ) break; @@ -259,7 +257,7 @@ void ScViewFunc::DoRefConversion( bool bRecord ) OUString aNew = aFinder.GetText(); ScCompiler aComp( pDoc, aPos); aComp.SetGrammar(pDoc->GetGrammar()); - boost::scoped_ptr<ScTokenArray> pArr(aComp.CompileString(aNew)); + std::unique_ptr<ScTokenArray> pArr(aComp.CompileString(aNew)); ScFormulaCell* pNewCell = new ScFormulaCell( pDoc, aPos, *pArr, formula::FormulaGrammar::GRAM_DEFAULT, MM_NONE); @@ -313,8 +311,8 @@ void ScViewFunc::DoThesaurus( bool bRecord ) ScSplitPos eWhich = GetViewData().GetActivePart(); EESpellState eState; EditView* pEditView = NULL; - boost::scoped_ptr<ESelection> pEditSel; - boost::scoped_ptr<ScEditEngineDefaulter> pThesaurusEngine; + std::unique_ptr<ESelection> pEditSel; + std::unique_ptr<ScEditEngineDefaulter> pThesaurusEngine; bool bIsEditMode = GetViewData().HasEditView(eWhich); if (bRecord && !rDoc.IsUndoEnabled()) bRecord = false; @@ -356,7 +354,7 @@ void ScViewFunc::DoThesaurus( bool bRecord ) pThesaurusEngine->SetSpeller(xSpeller); MakeEditView(pThesaurusEngine.get(), nCol, nRow ); const ScPatternAttr* pPattern = NULL; - boost::scoped_ptr<SfxItemSet> pEditDefaults( + std::unique_ptr<SfxItemSet> pEditDefaults( new SfxItemSet(pThesaurusEngine->GetEmptyItemSet())); pPattern = rDoc.GetPattern(nCol, nRow, nTab); if (pPattern) @@ -496,7 +494,7 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, bool bR // *** create and init the edit engine *** -------------------------------- - boost::scoped_ptr<ScConversionEngineBase> pEngine; + std::unique_ptr<ScConversionEngineBase> pEngine; switch( rConvParam.GetType() ) { case SC_CONVERSION_SPELLCHECK: @@ -739,7 +737,7 @@ void ScViewFunc::InsertBookmark( const OUString& rDescription, const OUString& r aField.SetTargetFrame(*pTarget); aEngine.QuickInsertField( SvxFieldItem( aField, EE_FEATURE_FIELD ), aInsSel ); - boost::scoped_ptr<EditTextObject> pData(aEngine.CreateTextObject()); + std::unique_ptr<EditTextObject> pData(aEngine.CreateTextObject()); EnterData(nPosX, nPosY, nTab, *pData); } |