diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-10 13:57:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-11 16:01:28 +0200 |
| commit | 673347af7d37f6789855c17732c9980d91ec6240 (patch) | |
| tree | 4447a73900c50db2f949755eca64a91ac2d9a385 /include | |
| parent | 0bc97adb82f14d6ec22f868422cbfe000afec402 (diff) | |
loplugin:useuniqueptr in scaddins..svx
Change-Id: I309f98f6b820103a926e9fe94d67d0aff6eb6476
Reviewed-on: https://gerrit.libreoffice.org/39754
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/unoevent.hxx | 8 | ||||
| -rw-r--r-- | include/svx/xpool.hxx | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx index 50044da03279..3d8b0936dfde 100644 --- a/include/svtools/unoevent.hxx +++ b/include/svtools/unoevent.hxx @@ -24,6 +24,8 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <cppuhelper/implbase.hxx> +#include <vector> +#include <memory> class SvxMacroTableDtor; class SvxMacroItem; @@ -202,13 +204,15 @@ protected: class SVT_DLLPUBLIC SvDetachedEventDescriptor : public SvBaseEventDescriptor { // the macros; aMacros[i] is the value for aSupportedMacroItemIDs[i] - SvxMacro** aMacros; + std::vector<std::unique_ptr<SvxMacro>> aMacros; const OUString sImplName; public: - SvDetachedEventDescriptor(const SvEventDescription* pSupportedMacroItems); + SvDetachedEventDescriptor(const SvEventDescription* pSupportedMacroItems); + SvDetachedEventDescriptor& operator=( SvDetachedEventDescriptor const & ) = delete; // MSVC2015 workaround + SvDetachedEventDescriptor( SvDetachedEventDescriptor const & ) = delete; // MSVC2015 workaround virtual ~SvDetachedEventDescriptor() override; diff --git a/include/svx/xpool.hxx b/include/svx/xpool.hxx index 5e6dd21efab3..6d3122153330 100644 --- a/include/svx/xpool.hxx +++ b/include/svx/xpool.hxx @@ -23,6 +23,7 @@ #include <svl/itempool.hxx> #include <svx/xdef.hxx> #include <svx/svxdllapi.h> +#include <memory> /************************************************************************* |* @@ -33,8 +34,8 @@ class SVX_DLLPUBLIC XOutdevItemPool : public SfxItemPool { protected: - std::vector<SfxPoolItem*>* mpLocalPoolDefaults; - SfxItemInfo* mpLocalItemInfos; + std::vector<SfxPoolItem*>* mpLocalPoolDefaults; + std::unique_ptr<SfxItemInfo[]> mpLocalItemInfos; public: XOutdevItemPool( SfxItemPool* pMaster, bool bLoadRefCounts = true); |