summaryrefslogtreecommitdiff
path: root/sfx2/source/appl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-17 09:21:43 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-17 11:00:51 +0100
commiteaf2c278888ebca0ac99055ee34df6f011da3596 (patch)
tree3177ca36a5eeac09b791ded9fc55d2d82e52c9cd /sfx2/source/appl
parent498cb0b3a372ce1ec0e66640eb0badddff3f2e90 (diff)
boost->std
Change-Id: Ifde84627578283bd057d7393eb7e5578ef5c029a
Diffstat (limited to 'sfx2/source/appl')
-rw-r--r--sfx2/source/appl/app.cxx4
-rw-r--r--sfx2/source/appl/appserv.cxx10
-rw-r--r--sfx2/source/appl/appuno.cxx6
-rw-r--r--sfx2/source/appl/childwin.cxx4
-rw-r--r--sfx2/source/appl/macroloader.cxx4
5 files changed, 14 insertions, 14 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index f77141fd1e8f..121bc98c1db5 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -117,7 +117,7 @@
#include <unotools/extendedsecurityoptions.hxx>
#include <rtl/instance.hxx>
#include <rtl/strbuf.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -564,7 +564,7 @@ SfxApplication::ChooseScript()
const SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetFrame() : NULL;
uno::Reference< frame::XFrame > xFrame( pFrame ? pFrame->GetFrameInterface() : uno::Reference< frame::XFrame >() );
- boost::scoped_ptr<AbstractScriptSelectorDialog> pDlg(
+ std::unique_ptr<AbstractScriptSelectorDialog> pDlg(
pFact->CreateScriptSelectorDialog( NULL, false, xFrame ));
SAL_INFO( "sfx.appl", "done, now exec it");
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 0021c8ed0a80..1d6798d90a52 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -121,7 +121,7 @@
#include <officecfg/Office/Common.hxx>
#include <officecfg/Setup.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
@@ -364,7 +364,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
if ( pFrameItem )
xFrame = pFrameItem->GetFrame();
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabDialog(
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabDialog(
RID_SVXDLG_CUSTOMIZE,
NULL, &aSet, xFrame ));
@@ -534,7 +534,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
if ( pFact )
{
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( 0, RID_DEFAULTABOUT ));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( 0, RID_DEFAULTABOUT ));
pDlg->Execute();
bDone = true;
}
@@ -1155,7 +1155,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
do // artificial loop for flow control
{
- boost::scoped_ptr<AbstractScriptSelectorDialog> pDlg(pFact->CreateScriptSelectorDialog(
+ std::unique_ptr<AbstractScriptSelectorDialog> pDlg(pFact->CreateScriptSelectorDialog(
lcl_getDialogParent( xFrame, GetTopWindow() ), false, xFrame ));
OSL_ENSURE( pDlg, "SfxApplication::OfaExec_Impl( SID_RUNMACRO ): no dialog!" );
if ( !pDlg )
@@ -1247,7 +1247,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
if ( pSet && pSet->GetItemState( pSetPool->GetWhich( SID_AUTO_CORRECT_DLG ), false, &pItem ) == SfxItemState::SET )
aSet.Put( *pItem );
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabDialog( RID_OFA_AUTOCORR_DLG, NULL, &aSet, NULL ));
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabDialog( RID_OFA_AUTOCORR_DLG, NULL, &aSet, NULL ));
pDlg->Execute();
}
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 69eead54a5f0..28f7f0af15e4 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -68,7 +68,7 @@
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/ucb/XContent.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::ucb;
@@ -193,7 +193,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
{
// slot is a property
const SfxType* pType = pSlot->GetType();
- boost::scoped_ptr<SfxPoolItem> pItem(pType->CreateItem());
+ std::unique_ptr<SfxPoolItem> pItem(pType->CreateItem());
if ( !pItem )
{
@@ -311,7 +311,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
for ( sal_uInt16 nArgs=0; nArgs<nMaxArgs; nArgs++ )
{
const SfxFormalArgument &rArg = bIsMediaDescriptor ? aFormalArgs[nArgs] : pSlot->GetFormalArgument( nArgs );
- boost::scoped_ptr<SfxPoolItem> pItem(rArg.CreateItem());
+ std::unique_ptr<SfxPoolItem> pItem(rArg.CreateItem());
if ( !pItem )
{
#ifdef DBG_UTIL
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 4ba7106c9678..988e28b38b23 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <vcl/toolbox.hxx>
#include <tools/rcid.h>
#include <unotools/moduleoptions.hxx>
@@ -377,7 +377,7 @@ void SfxChildWindow::InitializeChildWinFactory_Impl(sal_uInt16 nId, SfxChildWinI
{
// load configuration
- boost::scoped_ptr<SvtViewOptions> xWinOpt;
+ std::unique_ptr<SvtViewOptions> xWinOpt;
// first see if a module specific id exists
if (rInfo.aModule.getLength())
xWinOpt.reset(new SvtViewOptions(E_WINDOW, rInfo.aModule + "/" + OUString::number(nId)));
diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx
index f1634ca14274..c18accc6f11d 100644
--- a/sfx2/source/appl/macroloader.cxx
+++ b/sfx2/source/appl/macroloader.cxx
@@ -39,7 +39,7 @@
#include <tools/urlobj.hxx>
#include <vcl/svapp.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::frame;
@@ -285,7 +285,7 @@ ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, com::sun::star::uno::An
{
// attempt to protect the document against the script tampering with its Undo Context
- boost::scoped_ptr< ::framework::DocumentUndoGuard > pUndoGuard;
+ std::unique_ptr< ::framework::DocumentUndoGuard > pUndoGuard;
if ( bIsDocBasic )
pUndoGuard.reset( new ::framework::DocumentUndoGuard( pDoc->GetModel() ) );