From 3a00aaef2a51d7a1a87475a316dc9ae232fac60c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 17 Sep 2015 17:10:47 +0100 Subject: boost->std MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie490bf2c6921f393bdeed96b1a8815996b701bf0 Reviewed-on: https://gerrit.libreoffice.org/18670 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- basctl/source/basicide/basdoc.hxx | 2 +- basctl/source/basicide/basobj2.cxx | 4 ++-- basctl/source/basicide/documentenumeration.hxx | 5 ++--- basctl/source/basicide/iderdll2.hxx | 4 ++-- basctl/source/basicide/layout.cxx | 2 -- basctl/source/basicide/scriptdocument.cxx | 2 +- basctl/source/dlged/propbrw.cxx | 4 ++-- basctl/source/inc/baside3.hxx | 6 +++--- basctl/source/inc/dlged.hxx | 10 +++++----- basctl/source/inc/docsignature.hxx | 4 ++-- 10 files changed, 20 insertions(+), 23 deletions(-) (limited to 'basctl/source') diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx index 083049ce073d..d507b468bd12 100644 --- a/basctl/source/basicide/basdoc.hxx +++ b/basctl/source/basicide/basdoc.hxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include namespace basctl { diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 94f4952919c0..e2a9fb781c0b 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -217,13 +217,13 @@ namespace MacroExecutionData* i_pData = static_cast(p); ENSURE_OR_RETURN_VOID( i_pData, "wrong MacroExecutionData" ); // take ownership of the data - boost::scoped_ptr< MacroExecutionData > pData( i_pData ); + std::unique_ptr< MacroExecutionData > pData( i_pData ); SAL_WARN_IF( (pData->xMethod->GetParent()->GetFlags() & SbxFlagBits::ExtSearch) == SbxFlagBits::NONE, "basctl.basicide","No EXTSEARCH!" ); // in case this is a document-local macro, try to protect the document's Undo Manager from // flawed scripts - boost::scoped_ptr< ::framework::DocumentUndoGuard > pUndoGuard; + std::unique_ptr< ::framework::DocumentUndoGuard > pUndoGuard; if ( pData->aDocument.isDocument() ) pUndoGuard.reset( new ::framework::DocumentUndoGuard( pData->aDocument.getDocument() ) ); diff --git a/basctl/source/basicide/documentenumeration.hxx b/basctl/source/basicide/documentenumeration.hxx index 642fa2d33e83..c6b464ab0e01 100644 --- a/basctl/source/basicide/documentenumeration.hxx +++ b/basctl/source/basicide/documentenumeration.hxx @@ -20,9 +20,8 @@ #ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_DOCUMENTENUMERATION_HXX #define INCLUDED_BASCTL_SOURCE_BASICIDE_DOCUMENTENUMERATION_HXX -#include #include - +#include #include namespace com { namespace sun { namespace star { namespace uno { @@ -85,7 +84,7 @@ namespace basctl { namespace docs { ) const; private: - boost::scoped_ptr< DocumentEnumeration_Data > m_pData; + std::unique_ptr< DocumentEnumeration_Data > m_pData; }; diff --git a/basctl/source/basicide/iderdll2.hxx b/basctl/source/basicide/iderdll2.hxx index 02b8e6667354..d1f5d157682a 100644 --- a/basctl/source/basicide/iderdll2.hxx +++ b/basctl/source/basicide/iderdll2.hxx @@ -27,7 +27,7 @@ class SvxSearchItem; #include #include -#include +#include namespace basctl { @@ -35,7 +35,7 @@ namespace basctl class ExtraData { private: - boost::scoped_ptr pSearchItem; + std::unique_ptr pSearchItem; LibInfos aLibInfos; diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx index fb29deeb2747..e9b1356c107e 100644 --- a/basctl/source/basicide/layout.cxx +++ b/basctl/source/basicide/layout.cxx @@ -22,8 +22,6 @@ #include "bastypes.hxx" #include -#include - namespace basctl { diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index 7fdb066834d3..e728186d91e5 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -192,7 +192,7 @@ namespace basctl Reference< XModel > m_xDocument; Reference< XModifiable > m_xDocModify; Reference< XEmbeddedScripts > m_xScriptAccess; - boost::scoped_ptr< DocumentEventNotifier > m_pDocListener; + std::unique_ptr< DocumentEventNotifier > m_pDocListener; public: Impl (); diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index c6ac3fe9b1d7..b121294dfdf3 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -39,7 +39,7 @@ #include #include -#include +#include namespace basctl { @@ -247,7 +247,7 @@ Sequence< Reference< XInterface > > { SdrObject* pCurrent = _rMarkList.GetMark(i)->GetMarkedSdrObj(); - boost::scoped_ptr pGroupIterator; + std::unique_ptr pGroupIterator; if (pCurrent->IsGroupObject()) { pGroupIterator.reset(new SdrObjListIter(*pCurrent->GetSubList())); diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index fe8dabba58e3..c374e5d00c9c 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -32,7 +32,7 @@ #include -#include +#include class Printer; class StarBASIC; @@ -57,8 +57,8 @@ class DialogWindow: public BaseWindow { private: DialogWindowLayout& rLayout; - boost::scoped_ptr pEditor; // never nullptr - boost::scoped_ptr pUndoMgr; // never nullptr + std::unique_ptr pEditor; // never nullptr + std::unique_ptr pUndoMgr; // never nullptr OUString aCurPath; protected: diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index aec6543a7a4d..edad9fd90799 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -33,7 +33,7 @@ #include #include -#include +#include class ScrollBar; class Printer; @@ -110,18 +110,18 @@ private: private: VclPtr pHScroll; VclPtr pVScroll; - boost::scoped_ptr pDlgEdModel; // never nullptr + std::unique_ptr pDlgEdModel; // never nullptr DlgEdPage* pDlgEdPage; // never nullptr - boost::scoped_ptr pDlgEdView; // never nullptr + std::unique_ptr pDlgEdView; // never nullptr DlgEdForm* pDlgEdForm; // never nullptr css::uno::Reference< css::container::XNameContainer > m_xUnoControlDialogModel; css::uno::Reference< css::awt::XControlContainer > m_xControlContainer; css::uno::Sequence< css::datatransfer::DataFlavor > m_ClipboardDataFlavors; css::uno::Sequence< css::datatransfer::DataFlavor > m_ClipboardDataFlavorsResource; css::uno::Reference< css::util::XNumberFormatsSupplier > m_xSupplier; - boost::scoped_ptr pObjFac; // never nullptr + std::unique_ptr pObjFac; // never nullptr vcl::Window& rWindow; // DialogWindow - boost::scoped_ptr pFunc; + std::unique_ptr pFunc; DialogWindowLayout& rLayout; Mode eMode; sal_uInt16 eActObj; diff --git a/basctl/source/inc/docsignature.hxx b/basctl/source/inc/docsignature.hxx index fb506aa6c776..546b1fb46d4f 100644 --- a/basctl/source/inc/docsignature.hxx +++ b/basctl/source/inc/docsignature.hxx @@ -20,8 +20,8 @@ #define INCLUDED_BASCTL_SOURCE_INC_DOCSIGNATURE_HXX #include -#include #include +#include namespace basctl @@ -67,7 +67,7 @@ namespace basctl private: struct Impl; - boost::scoped_ptr m_pImpl; + std::unique_ptr m_pImpl; }; -- cgit