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/undo | |
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/undo')
-rw-r--r-- | sc/source/ui/undo/undoblk.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/undo/undoblk3.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/undo/undocell.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/undo/undotab.cxx | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index 8748a7b473c5..73346abf6ec2 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -55,8 +55,8 @@ #include <gridwin.hxx> #include <svl/listener.hxx> +#include <memory> #include <set> -#include <boost/scoped_ptr.hpp> // STATIC DATA ----------------------------------------------------------- @@ -1360,7 +1360,7 @@ void ScUndoDragDrop::Redo() BeginRedo(); ScDocument& rDoc = pDocShell->GetDocument(); - boost::scoped_ptr<ScDocument> pClipDoc(new ScDocument( SCDOCMODE_CLIP )); + std::unique_ptr<ScDocument> pClipDoc(new ScDocument( SCDOCMODE_CLIP )); EnableDrawAdjust( &rDoc, false ); //! include in ScBlockUndo? diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 3d84110e6ed1..b5cc16c67838 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -106,7 +106,7 @@ OUString ScUndoDeleteContents::GetComment() const return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); // "Delete" } -void ScUndoDeleteContents::SetDataSpans( const boost::shared_ptr<DataSpansType>& pSpans ) +void ScUndoDeleteContents::SetDataSpans( const std::shared_ptr<DataSpansType>& pSpans ) { mpDataSpans = pSpans; } diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 0f260972908c..e90875be756c 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -45,7 +45,7 @@ #include "docuno.hxx" #include "stringutil.hxx" -using ::boost::shared_ptr; +using std::shared_ptr; namespace HelperNotifyChanges { diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index f18acd2af3e8..64dd3dd75632 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -47,9 +47,9 @@ #include "drwlayer.hxx" #include "scresid.hxx" +#include <memory> #include <utility> #include <vector> -#include <boost/scoped_ptr.hpp> extern bool bDrawIsInUndo; // somewhere as member! @@ -57,7 +57,7 @@ using namespace com::sun::star; using ::com::sun::star::uno::Sequence; using ::std::unique_ptr; using ::std::vector; -using ::boost::shared_ptr; +using std::shared_ptr; TYPEINIT1(ScUndoInsertTab, SfxUndoAction); TYPEINIT1(ScUndoInsertTables, SfxUndoAction); @@ -514,7 +514,7 @@ void ScUndoMoveTab::DoChange( bool bUndo ) const if (bUndo) // UnDo { size_t i = mpNewTabs->size(); - boost::scoped_ptr<ScProgress> pProgress(new ScProgress(pDocShell , ScGlobal::GetRscString(STR_UNDO_MOVE_TAB), + std::unique_ptr<ScProgress> pProgress(new ScProgress(pDocShell , ScGlobal::GetRscString(STR_UNDO_MOVE_TAB), i * rDoc.GetCodeCount())); for (; i > 0; --i) { @@ -536,7 +536,7 @@ void ScUndoMoveTab::DoChange( bool bUndo ) const else { size_t n = mpNewTabs->size(); - boost::scoped_ptr<ScProgress> pProgress(new ScProgress(pDocShell , ScGlobal::GetRscString(STR_UNDO_MOVE_TAB), + std::unique_ptr<ScProgress> pProgress(new ScProgress(pDocShell , ScGlobal::GetRscString(STR_UNDO_MOVE_TAB), n * rDoc.GetCodeCount())); for (size_t i = 0; i < n; ++i) { |