summaryrefslogtreecommitdiff
path: root/sw/source/uibase/wrtsh
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-09-17 09:07:08 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-09-17 09:07:29 +0200
commit935c228cde00da58a38666b4358d560235eb10de (patch)
tree814e6dc9b5446732f9fe75e253576a8166b51006 /sw/source/uibase/wrtsh
parentcbf3fac0a5a1be34b2e1a58da959debd24ebc017 (diff)
sw: use std::unique_ptr<> in wrtsh
Change-Id: I3db550e0efa22eb4b497ad600e94ff77254bb62b
Diffstat (limited to 'sw/source/uibase/wrtsh')
-rw-r--r--sw/source/uibase/wrtsh/select.cxx6
-rw-r--r--sw/source/uibase/wrtsh/wrtsh1.cxx5
-rw-r--r--sw/source/uibase/wrtsh/wrtsh2.cxx8
3 files changed, 9 insertions, 10 deletions
diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx
index b5643323eac3..ccd7fec07932 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -39,7 +39,7 @@
#include <crsskip.hxx>
#include <doc.hxx>
#include <wordcountdialog.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace com { namespace sun { namespace star { namespace util {
struct SearchOptions;
@@ -129,8 +129,8 @@ long SwWrtShell::SelAll()
LeaveBlockMode();
SwMvContext aMvContext(this);
bool bMoveTable = false;
- boost::scoped_ptr<SwPosition> pStartPos;
- boost::scoped_ptr<SwPosition> pEndPos;
+ std::unique_ptr<SwPosition> pStartPos;
+ std::unique_ptr<SwPosition> pEndPos;
SwShellCrsr* pTmpCrsr = 0;
// Query these early, before we move the cursor.
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 2213d68b286e..c0cc481d6478 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -105,7 +105,7 @@
#include "FrameControlsManager.hxx"
#include <sfx2/msgpool.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace sw::mark;
using namespace com::sun::star;
@@ -375,8 +375,7 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName
OString aCmd(".uno:");
aCmd += pSlot->GetUnoName();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractInsertObjectDialog> pDlg(
- pFact->CreateInsertObjectDialog( GetWin(), OUString::fromUtf8( aCmd ), xStor, &aServerList ));
+ std::unique_ptr<SfxAbstractInsertObjectDialog> pDlg( pFact->CreateInsertObjectDialog( GetWin(), OUString::fromUtf8( aCmd ), xStor, &aServerList ));
if ( pDlg )
{
pDlg->Execute();
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 685fa8f04bbb..e303503520a6 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -64,7 +64,7 @@
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <xmloff/odffields.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
@@ -81,7 +81,7 @@ void SwWrtShell::Insert(SwField &rField)
StartUndo(UNDO_INSERT, &aRewriter);
bool bDeleted = false;
- boost::scoped_ptr<SwPaM> pAnnotationTextRange;
+ std::unique_ptr<SwPaM> pAnnotationTextRange;
if ( HasSelection() )
{
if ( rField.GetTyp()->Which() == RES_POSTITFLD )
@@ -234,7 +234,7 @@ bool SwWrtShell::StartInputFieldDlg( SwField* pField, bool bNextButton,
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractFieldInputDlg> pDlg(pFact->CreateFieldInputDlg(pParentWin, *this, pField, bNextButton));
+ std::unique_ptr<AbstractFieldInputDlg> pDlg(pFact->CreateFieldInputDlg(pParentWin, *this, pField, bNextButton));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if(pWindowState && !pWindowState->isEmpty())
pDlg->SetWindowState(*pWindowState);
@@ -259,7 +259,7 @@ bool SwWrtShell::StartDropDownFieldDlg(SwField* pField, bool bNextButton, OStrin
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<AbstractDropDownFieldDialog> pDlg(pFact->CreateDropDownFieldDialog(NULL, *this, pField, bNextButton));
+ std::unique_ptr<AbstractDropDownFieldDialog> pDlg(pFact->CreateDropDownFieldDialog(NULL, *this, pField, bNextButton));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if(pWindowState && !pWindowState->isEmpty())
pDlg->SetWindowState(*pWindowState);