summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2014-02-25 10:59:16 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2014-02-25 11:15:06 +0900
commit523fcec55d3a1a1282d94fdc9ecd9aecedcebf56 (patch)
tree05d46a9f0504a67d42894ab61ce9e50a7d252faa /sfx2
parent295bc8703ff5d5133f18ae2b25dc3d88cdfffa93 (diff)
Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: I72b0e8b07bd7309a23d5635b7e0b7dbdc9c2c721
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/macroloader.cxx4
-rw-r--r--sfx2/source/control/thumbnailview.cxx4
-rw-r--r--sfx2/source/doc/objmisc.cxx4
3 files changed, 9 insertions, 3 deletions
diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx
index 333983531442..cdef54c4de66 100644
--- a/sfx2/source/appl/macroloader.cxx
+++ b/sfx2/source/appl/macroloader.cxx
@@ -38,6 +38,8 @@
#include <tools/urlobj.hxx>
#include <vcl/svapp.hxx>
+#include <boost/scoped_ptr.hpp>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::lang;
@@ -292,7 +294,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
- ::std::auto_ptr< ::framework::DocumentUndoGuard > pUndoGuard;
+ boost::scoped_ptr< ::framework::DocumentUndoGuard > pUndoGuard;
if ( bIsDocBasic )
pUndoGuard.reset( new ::framework::DocumentUndoGuard( pDoc->GetModel() ) );
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 12a458f8c338..2b71d7a84719 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -38,6 +38,8 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <boost/scoped_ptr.hpp>
+
using namespace basegfx;
using namespace basegfx::tools;
using namespace drawinglayer::attribute;
@@ -1382,7 +1384,7 @@ BitmapEx ThumbnailView::readThumbnail(const OUString &msURL)
BitmapEx aThumbnail;
if (xIStream.is())
{
- ::std::auto_ptr<SvStream> pStream (
+ boost::scoped_ptr<SvStream> pStream (
::utl::UcbStreamHelper::CreateStream (xIStream));
::vcl::PNGReader aReader (*pStream);
aThumbnail = aReader.Read ();
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 255260c3c1b0..09d40c9be26e 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -131,6 +131,8 @@ using namespace ::com::sun::star::container;
#include "appbaslib.hxx"
#include <openflag.hxx>
+#include <boost/scoped_ptr.hpp>
+
// class SfxHeaderAttributes_Impl ----------------------------------------
class SfxHeaderAttributes_Impl : public SvKeyValueIterator
@@ -1561,7 +1563,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon
if ( bCaughtException && bRaiseError )
{
- ::std::auto_ptr< VclAbstractDialog > pScriptErrDlg;
+ boost::scoped_ptr< VclAbstractDialog > pScriptErrDlg;
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
if ( pFact )
pScriptErrDlg.reset( pFact->CreateScriptErrorDialog( NULL, aException ) );