summaryrefslogtreecommitdiff
path: root/sw/source/ui/shells
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2014-01-18 05:54:58 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2014-01-18 08:08:52 +0900
commit5e6d1e3332ea4cd31d2c5e739dc27bb37b34b4dc (patch)
tree256c9d1d3d644d66e3e19beffe5418ea9c445fe2 /sw/source/ui/shells
parent8e826c7ff7c597e9f585377b2117f4dc24239dcc (diff)
Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: Ib05c6d509a71e01b50b2e23588da607f29036711
Diffstat (limited to 'sw/source/ui/shells')
-rw-r--r--sw/source/ui/shells/tabsh.cxx4
-rw-r--r--sw/source/ui/shells/textsh2.cxx5
-rw-r--r--sw/source/ui/shells/txtcrsr.cxx4
3 files changed, 9 insertions, 4 deletions
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 9df537263f51..4152393812ab 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -84,6 +84,8 @@
#include "swabstdlg.hxx"
#include <table.hrc>
+#include <boost/scoped_ptr.hpp>
+
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
@@ -879,7 +881,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
if ( FN_TABLE_INSERT_ROW_DLG != nSlot || !rSh.IsInRepeatedHeadline())
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- ::std::auto_ptr<SvxAbstractInsRowColDlg> pDlg( pFact ? pFact->CreateSvxInsRowColDlg( GetView().GetWindow(), nSlot == FN_TABLE_INSERT_COL_DLG, pSlot->GetCommand() ) : 0);
+ boost::scoped_ptr<SvxAbstractInsRowColDlg> pDlg( pFact ? pFact->CreateSvxInsRowColDlg( GetView().GetWindow(), nSlot == FN_TABLE_INSERT_COL_DLG, pSlot->GetCommand() ) : 0);
if( pDlg.get() && (pDlg->Execute() == 1) )
{
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx
index 8bda1565b497..65dd2e07a1aa 100644
--- a/sw/source/ui/shells/textsh2.cxx
+++ b/sw/source/ui/shells/textsh2.cxx
@@ -47,7 +47,6 @@
#include "dbmgr.hxx"
#include <comphelper/uno3.hxx>
#include <svx/dataaccessdescriptor.hxx>
-#include <memory>
#include <vcl/svapp.hxx>
@@ -63,6 +62,8 @@
#include <unomid.h>
+#include <boost/scoped_ptr.hpp>
+
using namespace ::svx;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -263,7 +264,7 @@ IMPL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl*, pDBStruct )
SwDBData aDBData = pDBStruct->aDBData;
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- ::std::auto_ptr<AbstractSwInsertDBColAutoPilot>pDlg (pFact->CreateSwInsertDBColAutoPilot(pThis->GetView(),
+ boost::scoped_ptr<AbstractSwInsertDBColAutoPilot>pDlg (pFact->CreateSwInsertDBColAutoPilot(pThis->GetView(),
xSource,
xColSupp,
aDBData));
diff --git a/sw/source/ui/shells/txtcrsr.cxx b/sw/source/ui/shells/txtcrsr.cxx
index d686012479b0..926424f3dc2c 100644
--- a/sw/source/ui/shells/txtcrsr.cxx
+++ b/sw/source/ui/shells/txtcrsr.cxx
@@ -40,6 +40,8 @@
#include <svx/fmshell.hxx>
#include <svx/sdrobjectfilter.hxx>
+#include <boost/scoped_ptr.hpp>
+
using namespace ::com::sun::star;
void SwTextShell::ExecBasicMove(SfxRequest &rReq)
@@ -241,7 +243,7 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
if ( !pFormShell || !pDrawView || !pWindow )
break;
- ::std::auto_ptr< ::svx::ISdrObjectFilter > pFilter( pFormShell->CreateFocusableControlFilter(
+ boost::scoped_ptr< ::svx::ISdrObjectFilter > pFilter( pFormShell->CreateFocusableControlFilter(
*pDrawView, *pWindow ) );
if ( !pFilter.get() )
break;