mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boost->std

Browse Source 
Change-Id: Ie490bf2c6921f393bdeed96b1a8815996b701bf0
Reviewed-on: https://gerrit.libreoffice.org/18670
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2015-09-17 17:10:47 +01:00
parent c8ee3be0e0
commit 3a00aaef2a
81 changed files with 177 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripting/source/protocolhandler/scripthandler.cxx
View File

@@ -52,7 +52,7 @@
#include "com/sun/star/uri/UriReferenceFactory.hpp"
#include "com/sun/star/uri/XVndSunStarScriptUrl.hpp"
#include <boost/scoped_ptr.hpp>
#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -213,7 +213,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
}
// 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 ( bIsDocumentScript )
pUndoGuard.reset( new ::framework::DocumentUndoGuard( m_xScriptInvocation ) );
@@ -273,7 +273,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
if ( pFact != NULL )
{
boost::scoped_ptr<VclAbstractDialog> pDlg(
std::unique_ptr<VclAbstractDialog> pDlg(
pFact->CreateScriptErrorDialog( NULL, aException ));
if ( pDlg )