summaryrefslogtreecommitdiff
path: root/include/toolkit/controls
diff options
context:
space:
mode:
Diffstat (limited to 'include/toolkit/controls')
-rw-r--r--include/toolkit/controls/animatedimages.hxx9
-rw-r--r--include/toolkit/controls/unocontrols.hxx6
2 files changed, 5 insertions, 10 deletions
diff --git a/include/toolkit/controls/animatedimages.hxx b/include/toolkit/controls/animatedimages.hxx
index 813f1919abd7..1a31b2aaa80c 100644
--- a/include/toolkit/controls/animatedimages.hxx
+++ b/include/toolkit/controls/animatedimages.hxx
@@ -22,15 +22,11 @@
#include <toolkit/controls/unocontrolbase.hxx>
#include <toolkit/controls/unocontrolmodel.hxx>
-
#include <com/sun/star/awt/XAnimatedImages.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-
#include <cppuhelper/implbase1.hxx>
-
-#include <boost/scoped_ptr.hpp>
-
+#include <memory>
namespace toolkit
{
@@ -83,8 +79,7 @@ namespace toolkit
void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE;
private:
- ::boost::scoped_ptr< AnimatedImagesControlModel_Data >
- m_pData;
+ std::unique_ptr< AnimatedImagesControlModel_Data > m_xData;
};
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 079f70671565..e87800bef0b4 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -55,9 +55,9 @@
#include <comphelper/uno3.hxx>
#include <list>
+#include <memory>
#include <vector>
-#include <boost/scoped_ptr.hpp>
#include <boost/optional.hpp>
#define UNO_NAME_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
@@ -825,8 +825,8 @@ private:
void impl_setStringItemList_nolck( const ::std::vector< OUString >& i_rStringItems );
protected:
- ::boost::scoped_ptr< UnoControlListBoxModel_Data > m_pData;
- ::cppu::OInterfaceContainerHelper m_aItemListListeners;
+ std::unique_ptr<UnoControlListBoxModel_Data> m_xData;
+ ::cppu::OInterfaceContainerHelper m_aItemListListeners;
};