diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 81a72e94f076..69599d9b7fa7 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -60,7 +60,6 @@ #include "FactoryIds.hxx" #include "sdabstdlg.hxx" #include -#include #include "slideshow.hxx" #include diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index c2f302ced4e3..0b7273a23abd 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -29,7 +29,6 @@ #include #include #include -#include class ScrollBar; class ScrollBarBox; @@ -215,9 +214,9 @@ protected: private: bool mbIsValid; - ::boost::scoped_ptr mpSlideSorterController; - ::boost::scoped_ptr mpSlideSorterModel; - ::boost::scoped_ptr mpSlideSorterView; + std::unique_ptr mpSlideSorterController; + std::unique_ptr mpSlideSorterModel; + std::unique_ptr mpSlideSorterView; ::com::sun::star::uno::WeakReference mxControllerWeak; ViewShell* mpViewShell; ViewShellBase* mpViewShellBase; diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx index d3501c450871..fa681d682fd7 100644 --- a/sd/source/ui/inc/ToolBarManager.hxx +++ b/sd/source/ui/inc/ToolBarManager.hxx @@ -253,7 +253,7 @@ public: private: class Implementation; - ::boost::scoped_ptr mpImpl; + std::unique_ptr mpImpl; /** The ViewShellBase is used to get the XLayoutManager and to determine the plug in mode. diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 3c0215ffd977..bba5c73176a0 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -34,7 +34,6 @@ #include #include -#include class SdPage; class SvxRuler; diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 9975cbeb766e..8f7a0b2ef7bf 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -27,6 +27,7 @@ #include "glob.hxx" #include #include +#include #include class SdDrawDocument; diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 612d585d3e4f..24bff878d70c 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -66,7 +66,6 @@ #include "slideshow.hxx" #include -#include namespace sd { @@ -889,7 +888,7 @@ bool View::GetExchangeList (std::vector &rExchangeList, OUString aDesc(SD_RESSTR(STR_DESC_NAMEGROUP)); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - boost::scoped_ptr pDlg; + std::unique_ptr pDlg; if (pFact) pDlg.reset(pFact->CreateSvxNameDialog( mpViewSh->GetActiveWindow(), aNewName, aDesc ));