diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-13 15:47:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-13 20:08:35 +0100 |
| commit | 78a6ce17f06fbe13b806fd563e85a4fe60d3bcfc (patch) | |
| tree | 25e6d39e9f4d9bc3ffd703f752a35128f70de7b7 /include/toolkit/controls | |
| parent | 3f7fbae1bc38d528080552a715af187285f47028 (diff) | |
DELETEZ->std::unique_ptr in toolkit,unotools
Change-Id: I2263e233ae03575e53ab4e7894a7507423afd32e
Reviewed-on: https://gerrit.libreoffice.org/46397
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/toolkit/controls')
| -rw-r--r-- | include/toolkit/controls/unocontrol.hxx | 3 | ||||
| -rw-r--r-- | include/toolkit/controls/unocontrolcontainer.hxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx index 9080d918304e..29dd824f88bc 100644 --- a/include/toolkit/controls/unocontrol.hxx +++ b/include/toolkit/controls/unocontrol.hxx @@ -41,6 +41,7 @@ #include <cppuhelper/implbase9.hxx> #include <com/sun/star/util/XModeChangeBroadcaster.hpp> #include <com/sun/star/awt/XVclWindowPeer.hpp> +#include <memory> struct UnoControlComponentInfos @@ -108,7 +109,7 @@ protected: bool mbDesignMode; UnoControlComponentInfos maComponentInfos; - UnoControl_Data* mpData; + std::unique_ptr<UnoControl_Data> mpData; ::osl::Mutex& GetMutex() { return maMutex; } diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx index ca2a5a54555b..816632d418db 100644 --- a/include/toolkit/controls/unocontrolcontainer.hxx +++ b/include/toolkit/controls/unocontrolcontainer.hxx @@ -32,6 +32,7 @@ #include <toolkit/helper/servicenames.hxx> #include <cppuhelper/implbase4.hxx> +#include <memory> class UnoControlHolderList; @@ -48,7 +49,7 @@ typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase class UnoControlContainer : public UnoControlContainer_Base { private: - UnoControlHolderList* mpControls; + std::unique_ptr<UnoControlHolderList> mpControls; css::uno::Sequence< css::uno::Reference< css::awt::XTabController > > maTabControllers; ContainerListenerMultiplexer maCListeners; |