summaryrefslogtreecommitdiff
path: root/sw/source/uibase/utlui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-17 11:30:13 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-17 14:12:07 +0100
commitddc280920282ff3e2801e9a79f9dfa8a6c6f5699 (patch)
tree4b477c76374f2f36659ba674c2e5d6796629d45b /sw/source/uibase/utlui
parent63e7b7afa75252298606c84e8ec82adaee5fa28a (diff)
boost->std
Change-Id: Idfbcfa1e5ba7bff92e98693c33c4b33a6beda08f
Diffstat (limited to 'sw/source/uibase/utlui')
-rw-r--r--sw/source/uibase/utlui/content.cxx4
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx16
-rw-r--r--sw/source/uibase/utlui/navipi.cxx6
-rw-r--r--sw/source/uibase/utlui/numfmtlb.cxx4
4 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index b830fdbc5d8d..195771a9d08a 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -93,7 +93,7 @@
#include "navmgr.hxx"
#include "SidebarWin.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#define CTYPE_CNT 0
#define CTYPE_CTT 1
@@ -3279,7 +3279,7 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, EditEntryMode nMode)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<AbstractSwRenameXNamedDlg> pDlg(pFact->CreateSwRenameXNamedDlg(this, xNamed, xNameAccess));
+ std::unique_ptr<AbstractSwRenameXNamedDlg> pDlg(pFact->CreateSwRenameXNamedDlg(this, xNamed, xNameAccess));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if(xSecond.is())
pDlg->SetAlternativeAccess( xSecond, xThird);
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 422687f6efbb..a92682177d3e 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -57,7 +57,7 @@
#include <comcore.hrc>
#include <globals.hrc>
#include "swabstdlg.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star::uno;
@@ -226,7 +226,7 @@ sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt )
if( aData.HasFormat( SotClipboardFormatId::FILE_LIST ))
{
nRet = rEvt.mnAction;
- boost::scoped_ptr<SwGlblDocContents> pTempContents(new SwGlblDocContents);
+ std::unique_ptr<SwGlblDocContents> pTempContents(new SwGlblDocContents);
int nAbsContPos = pDropEntry ?
(int) GetModel()->GetAbsPos(pDropEntry):
- 1;
@@ -395,7 +395,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox)
const sal_uInt16 nEnableFlags = GetEnableFlags();
if(FN_GLOBAL_OPEN == nTbxId)
{
- boost::scoped_ptr<PopupMenu> pMenu(new PopupMenu);
+ std::unique_ptr<PopupMenu> pMenu(new PopupMenu);
for (sal_uInt16 i = CTX_INSERT_ANY_INDEX; i <= CTX_INSERT_TEXT; i++)
{
pMenu->InsertItem( i, aContextStrings[ST_INDEX - ST_GLOBAL_CONTEXT_FIRST - CTX_INSERT_ANY_INDEX + i] );
@@ -413,7 +413,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox)
}
else if(FN_GLOBAL_UPDATE == nTbxId)
{
- boost::scoped_ptr<PopupMenu> pMenu(new PopupMenu);
+ std::unique_ptr<PopupMenu> pMenu(new PopupMenu);
for (sal_uInt16 i = CTX_UPDATE_SEL; i <= CTX_UPDATE_ALL; i++)
{
pMenu->InsertItem( i, aContextStrings[ST_UPDATE_SEL - ST_GLOBAL_CONTEXT_FIRST - CTX_UPDATE_SEL+ i] );
@@ -858,7 +858,7 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
// must be refilled. So you do not have to remember anything,
// deleting begins at the end.
SvTreeListEntry* pSelEntry = LastSelected();
- boost::scoped_ptr<SwGlblDocContents> pTempContents;
+ std::unique_ptr<SwGlblDocContents> pTempContents;
pActiveShell->StartAction();
while(pSelEntry)
{
@@ -892,7 +892,7 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact && "Dialog creation failed!");
- boost::scoped_ptr<AbstractMultiTOXTabDialog> pDlg(pFact->CreateMultiTOXTabDialog(
+ std::unique_ptr<AbstractMultiTOXTabDialog> pDlg(pFact->CreateMultiTOXTabDialog(
this, aSet,
*pActiveShell,
0,
@@ -1113,7 +1113,7 @@ bool SwGlobalTree::Update(bool bHard)
else
{
bool bCopy = false;
- boost::scoped_ptr<SwGlblDocContents> pTempContents(new SwGlblDocContents);
+ std::unique_ptr<SwGlblDocContents> pTempContents(new SwGlblDocContents);
pActiveShell->GetGlobalDocContent(*pTempContents);
if(pTempContents->size() != pSwGlblDocContents->size() ||
pTempContents->size() != GetEntryCount())
@@ -1366,7 +1366,7 @@ IMPL_LINK_TYPED( SwGlobalTree, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileD
if ( ERRCODE_NONE != _pFileDlg->GetError() )
return;
- boost::scoped_ptr<SfxMediumList> pMedList(pDocInserter->CreateMediumList());
+ std::unique_ptr<SfxMediumList> pMedList(pDocInserter->CreateMediumList());
if ( pMedList )
{
Sequence< OUString >aFileNames( pMedList->size() );
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 075c3bda1441..d20b7e95dfb9 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -54,7 +54,7 @@
#include "access.hrc"
#include <unomid.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
@@ -367,7 +367,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox, void )
HID_NAVI_DRAG_LINK,
HID_NAVI_DRAG_COPY,
};
- boost::scoped_ptr<PopupMenu> pMenu(new PopupMenu);
+ std::unique_ptr<PopupMenu> pMenu(new PopupMenu);
for (sal_uInt16 i = 0; i <= static_cast<sal_uInt16>(RegionMode::EMBEDDED); i++)
{
pMenu->InsertItem( i + 1, aContextArr[i] );
@@ -387,7 +387,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox, void )
break;
case FN_OUTLINE_LEVEL:
{
- boost::scoped_ptr<PopupMenu> pMenu(new PopupMenu);
+ std::unique_ptr<PopupMenu> pMenu(new PopupMenu);
for (sal_uInt16 i = 101; i <= 100 + MAXLEVEL; i++)
{
pMenu->InsertItem( i, OUString::number(i - 100) );
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index c5d3b8baa2c7..f0e86d3a4dd3 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -42,7 +42,7 @@
#include "dialog.hrc"
#include <unomid.h>
#include <sfx2/viewfrm.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -403,7 +403,7 @@ IMPL_LINK( NumFormatListBox, SelectHdl, ListBox *, pBox )
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( this, aCoreSet,
+ std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( this, aCoreSet,
GetView()->GetViewFrame()->GetFrame().GetFrameInterface(),
RC_DLG_SWNUMFMTDLG ));
OSL_ENSURE(pDlg, "Dialog creation failed!");