diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-24 10:48:53 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-25 06:14:11 +0000 |
| commit | 4266cd19650269c94c63168d1e9cbc105ff297f9 (patch) | |
| tree | 3c748c119a7e9eb3441eb5c0689daf9c77943f4e /sd/source | |
| parent | 835dacd27d2c925f4af2d85125445ac7b7a3253d (diff) | |
sd/source/filter boost::scoped_ptr->std::unique_ptr
Change-Id: I335ff685def480933d846657df81f28242059c18
Reviewed-on: https://gerrit.libreoffice.org/18823
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/filter/html/HtmlOptionsDialog.cxx | 3 | ||||
| -rw-r--r-- | sd/source/filter/html/htmlex.hxx | 3 | ||||
| -rw-r--r-- | sd/source/filter/ppt/pptinanimations.cxx | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx index 12165da5042f..a094807c998b 100644 --- a/sd/source/filter/html/HtmlOptionsDialog.cxx +++ b/sd/source/filter/html/HtmlOptionsDialog.cxx @@ -48,7 +48,6 @@ using namespace com::sun::star::ui::dialogs; #include "pres.hxx" #include "sdabstdlg.hxx" #include <memory> -#include <boost/scoped_ptr.hpp> class SdHtmlOptionsDialog : public cppu::WeakImplHelper < @@ -199,7 +198,7 @@ sal_Int16 SdHtmlOptionsDialog::execute() SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); if( pFact ) { - boost::scoped_ptr<AbstractSdPublishingDlg> pDlg(pFact->CreateSdPublishingDlg( Application::GetDefDialogParent(), meDocType )); + std::unique_ptr<AbstractSdPublishingDlg> pDlg(pFact->CreateSdPublishingDlg( Application::GetDefDialogParent(), meDocType )); if( pDlg ) { if( pDlg->Execute() ) diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 34b6caa3dc80..72428c5261fd 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -38,7 +38,6 @@ #include "htmlpublishmode.hxx" #include <memory> -#include <boost/scoped_ptr.hpp> #include <vector> #define PUB_LOWRES_WIDTH 640 @@ -143,7 +142,7 @@ class HtmlExport const OUString maHTMLHeader; - boost::scoped_ptr< ButtonSet > mpButtonSet; + std::unique_ptr< ButtonSet > mpButtonSet; static SdrTextObj* GetLayoutTextObject(SdrPage* pPage); diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index c9a46c11251e..3b8199907edf 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -68,7 +68,6 @@ #include <algorithm> #include <memory> -#include <boost/scoped_ptr.hpp> using ::std::map; using ::com::sun::star::beans::NamedValue; @@ -223,7 +222,7 @@ int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRec { Reference< XAnimationNode > xParent; - boost::scoped_ptr<Atom> pAtom(Atom::import( rProgTagContentHd, mrStCtrl )); + std::unique_ptr<Atom> pAtom(Atom::import( rProgTagContentHd, mrStCtrl )); if( pAtom ) { nNodes = importAnimationContainer( pAtom.get(), xParent ); |