Kaydet (Commit) 4266cd19 authored tarafından Caolán McNamara's avatar Caolán McNamara

sd/source/filter boost::scoped_ptr->std::unique_ptr

Change-Id: I335ff685def480933d846657df81f28242059c18
Reviewed-on: https://gerrit.libreoffice.org/18823Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 835dacd2
...@@ -48,7 +48,6 @@ using namespace com::sun::star::ui::dialogs; ...@@ -48,7 +48,6 @@ using namespace com::sun::star::ui::dialogs;
#include "pres.hxx" #include "pres.hxx"
#include "sdabstdlg.hxx" #include "sdabstdlg.hxx"
#include <memory> #include <memory>
#include <boost/scoped_ptr.hpp>
class SdHtmlOptionsDialog : public cppu::WeakImplHelper class SdHtmlOptionsDialog : public cppu::WeakImplHelper
< <
...@@ -199,7 +198,7 @@ sal_Int16 SdHtmlOptionsDialog::execute() ...@@ -199,7 +198,7 @@ sal_Int16 SdHtmlOptionsDialog::execute()
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
if( pFact ) 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 )
{ {
if( pDlg->Execute() ) if( pDlg->Execute() )
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#include "htmlpublishmode.hxx" #include "htmlpublishmode.hxx"
#include <memory> #include <memory>
#include <boost/scoped_ptr.hpp>
#include <vector> #include <vector>
#define PUB_LOWRES_WIDTH 640 #define PUB_LOWRES_WIDTH 640
...@@ -143,7 +142,7 @@ class HtmlExport ...@@ -143,7 +142,7 @@ class HtmlExport
const OUString maHTMLHeader; const OUString maHTMLHeader;
boost::scoped_ptr< ButtonSet > mpButtonSet; std::unique_ptr< ButtonSet > mpButtonSet;
static SdrTextObj* GetLayoutTextObject(SdrPage* pPage); static SdrTextObj* GetLayoutTextObject(SdrPage* pPage);
......
...@@ -68,7 +68,6 @@ ...@@ -68,7 +68,6 @@
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
#include <boost/scoped_ptr.hpp>
using ::std::map; using ::std::map;
using ::com::sun::star::beans::NamedValue; using ::com::sun::star::beans::NamedValue;
...@@ -223,7 +222,7 @@ int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRec ...@@ -223,7 +222,7 @@ int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRec
{ {
Reference< XAnimationNode > xParent; Reference< XAnimationNode > xParent;
boost::scoped_ptr<Atom> pAtom(Atom::import( rProgTagContentHd, mrStCtrl )); std::unique_ptr<Atom> pAtom(Atom::import( rProgTagContentHd, mrStCtrl ));
if( pAtom ) if( pAtom )
{ {
nNodes = importAnimationContainer( pAtom.get(), xParent ); nNodes = importAnimationContainer( pAtom.get(), xParent );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment