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

boost->std

Browse Source 
Change-Id: I17a517e5063aebd7d20864104b4b24a5fd05612b
Reviewed-on: https://gerrit.libreoffice.org/18883
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-26 11:32:17 +01:00
parent 82630bda21
commit 01b003c47b
6 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sd/source/ui/app/sdmod1.cxx
View File

@@ -60,7 +60,6 @@
#include "FactoryIds.hxx" #include "FactoryIds.hxx"
#include "sdabstdlg.hxx" #include "sdabstdlg.hxx"
#include <memory> #include <memory>
#include <boost/scoped_ptr.hpp>
#include "slideshow.hxx" #include "slideshow.hxx"
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>

7
sd/source/ui/inc/SlideSorter.hxx
View File

@@ -29,7 +29,6 @@
#include <boost/current_function.hpp> #include <boost/current_function.hpp>
#include <vcl/scrbar.hxx> #include <vcl/scrbar.hxx>
#include <memory> #include <memory>
#include <boost/scoped_ptr.hpp>
class ScrollBar; class ScrollBar;
class ScrollBarBox; class ScrollBarBox;
@@ -215,9 +214,9 @@ protected:
private: private:
bool mbIsValid; bool mbIsValid;
::boost::scoped_ptr<controller::SlideSorterController> mpSlideSorterController; std::unique_ptr<controller::SlideSorterController> mpSlideSorterController;
::boost::scoped_ptr<model::SlideSorterModel> mpSlideSorterModel; std::unique_ptr<model::SlideSorterModel> mpSlideSorterModel;
::boost::scoped_ptr<view::SlideSorterView> mpSlideSorterView; std::unique_ptr<view::SlideSorterView> mpSlideSorterView;
::com::sun::star::uno::WeakReference<com::sun::star::frame::XController> mxControllerWeak; ::com::sun::star::uno::WeakReference<com::sun::star::frame::XController> mxControllerWeak;
ViewShell* mpViewShell; ViewShell* mpViewShell;
ViewShellBase* mpViewShellBase; ViewShellBase* mpViewShellBase;

2
sd/source/ui/inc/ToolBarManager.hxx
View File

@@ -253,7 +253,7 @@ public:
private: private:
class Implementation; class Implementation;
::boost::scoped_ptr<Implementation> mpImpl; std::unique_ptr<Implementation> mpImpl;
/** The ViewShellBase is used to get the XLayoutManager and to determine /** The ViewShellBase is used to get the XLayoutManager and to determine
the plug in mode. the plug in mode.

1
sd/source/ui/inc/ViewShell.hxx
View File

@@ -34,7 +34,6 @@
#include <com/sun/star/drawing/XDrawSubController.hpp> #include <com/sun/star/drawing/XDrawSubController.hpp>
#include <memory> #include <memory>
#include <boost/scoped_ptr.hpp>
class SdPage; class SdPage;
class SvxRuler; class SvxRuler;

1
sd/source/ui/inc/ViewShellBase.hxx
View File

@@ -27,6 +27,7 @@
#include "glob.hxx" #include "glob.hxx"
#include <sfx2/viewsh.hxx> #include <sfx2/viewsh.hxx>
#include <sfx2/viewfac.hxx> #include <sfx2/viewfac.hxx>
#include <boost/scoped_ptr.hpp>
#include <memory> #include <memory>
class SdDrawDocument; class SdDrawDocument;

3
sd/source/ui/view/sdview2.cxx
View File

@@ -66,7 +66,6 @@
#include "slideshow.hxx" #include "slideshow.hxx"
#include <memory> #include <memory>
#include <boost/scoped_ptr.hpp>
namespace sd { namespace sd {
@@ -889,7 +888,7 @@ bool View::GetExchangeList (std::vector<OUString> &rExchangeList,
OUString aDesc(SD_RESSTR(STR_DESC_NAMEGROUP)); OUString aDesc(SD_RESSTR(STR_DESC_NAMEGROUP));
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
boost::scoped_ptr<AbstractSvxNameDialog> pDlg; std::unique_ptr<AbstractSvxNameDialog> pDlg;
if (pFact) if (pFact)
pDlg.reset(pFact->CreateSvxNameDialog( mpViewSh->GetActiveWindow(), aNewName, aDesc )); pDlg.reset(pFact->CreateSvxNameDialog( mpViewSh->GetActiveWindow(), aNewName, aDesc ));