diff options
| author | Noel Grandin <noel@peralex.com> | 2012-06-13 17:26:20 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-06-20 19:46:38 +0200 |
| commit | 7f91d56e078048e2e0bc8f3edf1e47ff0b7f0d5a (patch) | |
| tree | 34269e2a53522661ce5b7cf10894cdbf3549c8a8 /sfx2/inc/arrdecl.hxx | |
| parent | 1eb38e26bf283beac219ea829f5aa757a50bfd4d (diff) | |
Convert SV_DECL_PTRARR_DEL( SfxChildWinFactArr_Impl) to std::vector
I couldn't use ptr_vector because some of the code deletes
entries without deallocating them.
Change-Id: Iafbb19dc8ca9f8337169e116d47dcf0ccf78ed0e
Diffstat (limited to 'sfx2/inc/arrdecl.hxx')
| -rw-r--r-- | sfx2/inc/arrdecl.hxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx index 06daab4bbe85..f8e4eb478226 100644 --- a/sfx2/inc/arrdecl.hxx +++ b/sfx2/inc/arrdecl.hxx @@ -51,7 +51,12 @@ struct SfxMenuCtrlFactory; SV_DECL_PTRARR_DEL( SfxMenuCtrlFactArr_Impl, SfxMenuCtrlFactory*, 2 ) struct SfxChildWinFactory; -SV_DECL_PTRARR_DEL( SfxChildWinFactArr_Impl, SfxChildWinFactory*, 2 ) +class SfxChildWinFactArr_Impl : public std::vector<SfxChildWinFactory*> +{ +public: + // de-allocates child objects + ~SfxChildWinFactArr_Impl(); +}; class SfxModule; SV_DECL_PTRARR( SfxModuleArr_Impl, SfxModule*, 2 ) |