diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-25 14:53:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-26 19:05:34 +0000 |
| commit | 6dbc69bdf44f1933687b93b4c1838b57804ecc17 (patch) | |
| tree | e13491e2fad7f833b4db0133cbe1eda8b05c306a /sd | |
| parent | boost->std (diff) | |
| download | core-6dbc69bdf44f1933687b93b4c1838b57804ecc17.tar.gz core-6dbc69bdf44f1933687b93b4c1838b57804ecc17.zip | |
boost->std
Change-Id: I329aabf1621b91756cd277bd0c56a2988c9ad1c0
Reviewed-on: https://gerrit.libreoffice.org/18872
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')
| -rw-r--r-- | sd/source/ui/inc/pubdlg.hxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewsa.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index 9d04829c6a75..9abdd7b27f7f 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -33,7 +33,6 @@ #include <memory> #include <boost/ptr_container/ptr_vector.hpp> -#include <boost/scoped_ptr.hpp> class FixedText; class RadioButton; @@ -146,7 +145,7 @@ private: VclPtr<RadioButton> pPage6_DocColors; VclPtr<SdHtmlAttrPreview> pPage6_Preview; - boost::scoped_ptr< ButtonSet > mpButtonSet; + std::unique_ptr< ButtonSet > mpButtonSet; // standard controls VclPtr<PushButton> pLastPageButton; diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index e1cbfd925b33..e2ff2092d92c 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -70,7 +70,6 @@ #include <boost/bind.hpp> #include <memory> -#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -554,7 +553,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) } else { - boost::scoped_ptr<SvxZoomItem> pZoomItem; + std::unique_ptr<SvxZoomItem> pZoomItem; sal_uInt16 nZoom = (sal_uInt16) GetActiveWindow()->GetZoom(); if( mbZoomOnPage ) |