summaryrefslogtreecommitdiff
path: root/sw/source/uibase/uiview
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/uiview')
-rw-r--r--sw/source/uibase/uiview/pview.cxx4
-rw-r--r--sw/source/uibase/uiview/view0.cxx8
-rw-r--r--sw/source/uibase/uiview/view2.cxx12
-rw-r--r--sw/source/uibase/uiview/viewdlg2.cxx6
-rw-r--r--sw/source/uibase/uiview/viewling.cxx6
-rw-r--r--sw/source/uibase/uiview/viewsrch.cxx4
6 files changed, 20 insertions, 20 deletions
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 06e059c24392..21c69c6e892e 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -79,7 +79,7 @@
#include <svx/dialogs.hrc>
#include <osl/mutex.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
SFX_IMPL_NAMED_VIEWFACTORY(SwPagePreview, "PrintPreview")
@@ -758,7 +758,7 @@ void SwPagePreview::Execute( SfxRequest &rReq )
{
const SfxItemSet *pArgs = rReq.GetArgs();
const SfxPoolItem* pItem;
- boost::scoped_ptr<AbstractSvxZoomDialog> pDlg;
+ std::unique_ptr<AbstractSvxZoomDialog> pDlg;
if(!pArgs)
{
SfxItemSet aCoreSet(GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 6173af8596af..01b1759926a8 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -77,7 +77,7 @@ using namespace ::com::sun::star;
#include <IDocumentSettingAccess.hxx>
#include <unomid.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include "swabstdlg.hxx"
#include "misc.hrc"
@@ -361,7 +361,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
void SwView::ExecViewOptions(SfxRequest &rReq)
{
- boost::scoped_ptr<SwViewOption> pOpt(new SwViewOption( *GetWrtShell().GetViewOptions() ));
+ std::unique_ptr<SwViewOption> pOpt(new SwViewOption( *GetWrtShell().GetViewOptions() ));
bool bModified = GetWrtShell().IsModified();
int eState = STATE_TOGGLE;
@@ -616,7 +616,7 @@ void SwView::ExecFormatFootnote()
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwFootNoteOptionDlg(GetWindow(), GetWrtShell()));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateSwFootNoteOptionDlg(GetWindow(), GetWrtShell()));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
}
@@ -626,7 +626,7 @@ void SwView::ExecNumberingOutline(SfxItemPool & rPool)
SfxItemSet aTmp(rPool, FN_PARAM_1, FN_PARAM_1);
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTabDialog( DLG_TAB_OUTLINE,
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTabDialog( DLG_TAB_OUTLINE,
GetWindow(), &aTmp, GetWrtShell()));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 1006837cb787..61b560cdef32 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -146,7 +146,7 @@
#include <vcl/GraphicNativeMetadata.hxx>
#include <vcl/settings.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
const char sStatusDelim[] = " : ";
const char sStatusComma[] = " , ";
@@ -298,7 +298,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
SwDocShell* pDocShell = GetDocShell();
const sal_uInt16 nHtmlMode = ::GetHtmlMode(pDocShell);
// when in HTML mode insert only as a link
- boost::scoped_ptr<FileDialogHelper> pFileDlg(new FileDialogHelper(
+ std::unique_ptr<FileDialogHelper> pFileDlg(new FileDialogHelper(
ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE,
SFXWB_GRAPHIC ));
pFileDlg->SetTitle(SW_RESSTR(STR_INSERT_GRAPHIC ));
@@ -539,7 +539,7 @@ void SwView::Execute(SfxRequest &rReq)
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateVclSwViewDialog(*this));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateVclSwViewDialog(*this));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
break;
@@ -1673,7 +1673,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
if ( ( GetDocShell()->GetCreateMode() != SfxObjectCreateMode::EMBEDDED ) || !GetDocShell()->IsInPlaceActive() )
{
const SfxItemSet *pSet = 0;
- boost::scoped_ptr<AbstractSvxZoomDialog> pDlg;
+ std::unique_ptr<AbstractSvxZoomDialog> pDlg;
if ( pArgs )
pSet = pArgs;
else
@@ -1906,7 +1906,7 @@ void SwView::EditLinkDlg()
{
bool bWeb = 0 != PTR_CAST(SwWebView, this);
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractLinksDialog> pDlg(pFact->CreateLinksDialog( &GetViewFrame()->GetWindow(), &GetWrtShell().GetLinkManager(), bWeb ));
+ std::unique_ptr<SfxAbstractLinksDialog> pDlg(pFact->CreateLinksDialog( &GetViewFrame()->GetWindow(), &GetWrtShell().GetLinkManager(), bWeb ));
if ( pDlg )
{
pDlg->Execute();
@@ -2372,7 +2372,7 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument)
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
if ( pFact )
{
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( NULL, SID_OPTIONS_DATABASES ));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( NULL, SID_OPTIONS_DATABASES ));
pDlg->Execute();
}
}
diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx
index 32e5f2be043b..785a00ea43af 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -41,7 +41,7 @@
#include "view.hrc"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
void SwView::ExecDlgExt(SfxRequest &rReq)
{
@@ -54,7 +54,7 @@ void SwView::ExecDlgExt(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact && "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<VclAbstractDialog> pDialog(pFact->CreateSwCaptionDialog( pMDI, *this, DLG_CAPTION ));
+ std::unique_ptr<VclAbstractDialog> pDialog(pFact->CreateSwCaptionDialog( pMDI, *this, DLG_CAPTION ));
assert(pDialog && "Dialog creation failed!");
if ( pDialog )
{
@@ -66,7 +66,7 @@ void SwView::ExecDlgExt(SfxRequest &rReq)
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact && "Dialog creation failed!");
- boost::scoped_ptr<AbstractInsFootNoteDlg> pDlg(pFact->CreateInsFootNoteDlg(
+ std::unique_ptr<AbstractInsFootNoteDlg> pDlg(pFact->CreateInsFootNoteDlg(
pMDI, *m_pWrtShell, true));
assert(pDlg && "Dialog creation failed!");
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index e48622ce3292..f2f6747fb1a3 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -86,7 +86,7 @@
#include <editeng/editerr.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace sw::mark;
using namespace ::com::sun::star;
@@ -575,7 +575,7 @@ void SwView::StartThesaurus()
SpellError( eLang );
else
{
- boost::scoped_ptr<AbstractThesaurusDialog> pDlg;
+ std::unique_ptr<AbstractThesaurusDialog> pDlg;
// create dialog
{ //Scope for SwWait-Object
SwWait aWait( *GetDocShell(), true );
@@ -702,7 +702,7 @@ bool SwView::ExecSpellPopup(const Point& rPt)
bRet = true;
m_pWrtShell->SttSelect();
- boost::scoped_ptr< SwSpellPopup > pPopup;
+ std::unique_ptr< SwSpellPopup > pPopup;
if (bUseGrammarContext)
{
sal_Int32 nPos = aPoint.nContent.GetIndex();
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index 2c90c4517b43..b9c54fcfccdf 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -21,7 +21,7 @@
#include <string>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <hintids.hxx>
@@ -490,7 +490,7 @@ bool SwView::SearchAndWrap(bool bApi)
if (!m_pSrchItem->GetSelection())
m_pWrtShell->KillSelection(0, false);
- boost::scoped_ptr<SwWait> pWait(new SwWait( *GetDocShell(), true ));
+ std::unique_ptr<SwWait> pWait(new SwWait( *GetDocShell(), true ));
if( FUNC_Search( aOpts ) )
{
m_bFound = true;