diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2019-10-01 18:58:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-02 13:57:54 +0200 |
| commit | d50eea97b3d2e1e1e47f7cdad4cb0c24fb0ed26d (patch) | |
| tree | dba3fc40c62871aa6ae4092b65d5e7ae3ecd6cd9 | |
| parent | caaa8fe7c4bb88185b5b11591ee8a619cff0eced (diff) | |
Avoid std::vector inheritance for SfxAllEnumValueArr
No need to inherit, just create a typedef
Change-Id: Ifeabb90e640e10e590f793716c022f91850ae8b9
Reviewed-on: https://gerrit.libreoffice.org/79991
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/svl/aeitem.hxx | 4 | ||||
| -rw-r--r-- | svl/source/items/aeitem.cxx | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx index 621468f32988..648986825bcf 100644 --- a/include/svl/aeitem.hxx +++ b/include/svl/aeitem.hxx @@ -24,8 +24,10 @@ #include <cstddef> #include <memory> +#include <vector> -class SfxAllEnumValueArr; +struct SfxAllEnumValue_Impl; +typedef std::vector<SfxAllEnumValue_Impl> SfxAllEnumValueArr; // MSVC hack: class SAL_DLLPUBLIC_RTTI SfxAllEnumItem_Base: public SfxEnumItem<sal_uInt16> { diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index 37962147e70c..03431b91594a 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -22,7 +22,6 @@ #include <climits> #include <cstddef> -#include <vector> struct SfxAllEnumValue_Impl { @@ -30,8 +29,6 @@ struct SfxAllEnumValue_Impl OUString aText; }; -class SfxAllEnumValueArr : public std::vector<SfxAllEnumValue_Impl> {}; - SfxAllEnumItem::SfxAllEnumItem(sal_uInt16 which, sal_uInt16 nVal): SfxAllEnumItem_Base(which, nVal) |